summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWu, Ke <wuke@cs.umd.edu>2014-12-17 23:13:30 -0500
committerWu, Ke <wuke@cs.umd.edu>2014-12-17 23:13:30 -0500
commit126c54ec0026814e530f983fcb5184b2fce12319 (patch)
tree863f23817da4dd760aa252a8c29923e9f07af039
parent6829a0bc624b02ebefc79f8cf9ec89d7d64a7c30 (diff)
parentc6840551d6b6ccd75077f32dd89cfa3c6162ef86 (diff)
Merge branch 'const_reorder_2' into softsyn_2
-rw-r--r--training/const_reorder/Makefile.am12
-rw-r--r--training/const_reorder/trainer.cc2
2 files changed, 6 insertions, 8 deletions
diff --git a/training/const_reorder/Makefile.am b/training/const_reorder/Makefile.am
index 367ac904..2c681398 100644
--- a/training/const_reorder/Makefile.am
+++ b/training/const_reorder/Makefile.am
@@ -1,12 +1,8 @@
-noinst_LIBRARIES = libtrainer.a
-
-libtrainer_a_SOURCES = trainer.h trainer.cc
-
bin_PROGRAMS = const_reorder_model_trainer argument_reorder_model_trainer
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils -I$(top_srcdir)/decoder
-const_reorder_model_trainer_SOURCES = constituent_reorder_model.cc
-const_reorder_model_trainer_LDADD = ../../utils/libutils.a libtrainer.a
-argument_reorder_model_trainer_SOURCES = argument_reorder_model.cc
-argument_reorder_model_trainer_LDADD = ../../utils/libutils.a libtrainer.a
+const_reorder_model_trainer_SOURCES = constituent_reorder_model.cc trainer.h trainer.cc
+const_reorder_model_trainer_LDADD = ../../utils/libutils.a
+argument_reorder_model_trainer_SOURCES = argument_reorder_model.cc trainer.h trainer.cc
+argument_reorder_model_trainer_LDADD = ../../utils/libutils.a
diff --git a/training/const_reorder/trainer.cc b/training/const_reorder/trainer.cc
index 89bd7479..1d388eec 100644
--- a/training/const_reorder/trainer.cc
+++ b/training/const_reorder/trainer.cc
@@ -1,5 +1,7 @@
#include "trainer.h"
+#include "utils/maxent.h"
+
Tsuruoka_Maxent_Trainer::Tsuruoka_Maxent_Trainer()
: const_reorder::Tsuruoka_Maxent(NULL) {}