summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/synutils/Makefile.am14
-rw-r--r--utils/synutils/alignment.h2
-rw-r--r--utils/synutils/constituent_reorder_model.cc6
-rw-r--r--utils/synutils/srl_sentence.h5
-rw-r--r--utils/synutils/tree.h4
-rw-r--r--utils/synutils/tsuruoka_maxent.h10
-rw-r--r--utils/synutils/utility.h2
7 files changed, 20 insertions, 23 deletions
diff --git a/utils/synutils/Makefile.am b/utils/synutils/Makefile.am
index f87f1f8a..ac76be40 100644
--- a/utils/synutils/Makefile.am
+++ b/utils/synutils/Makefile.am
@@ -1,16 +1,6 @@
bin_PROGRAMS = const_reorder_model_trainer
const_reorder_model_trainer_SOURCES = constituent_reorder_model.cc
-const_reorder_model_trainer_LDADD = libfeature.a maxent-3.0/libtsuruoka_maxent.a -lgfortran
+const_reorder_model_trainer_LDADD = maxent-3.0/libtsuruoka_maxent.a
-noinst_LIBRARIES = libfeature.a
-
-libfeature_a_SOURCES = \
- alignment.h \
- srl_sentence.h \
- tree.h \
- utility.h \
- argument_reorder_model.h \
- tsuruoka_maxent.h
-
-AM_CPPFLAGS = -W -Wall -I$(top_srcdir) -I$(top_srcdir)/utils -I$(top_srcdir)/synutils/maxent-3.0
+AM_CPPFLAGS = -W -Wall -I$(top_srcdir)
diff --git a/utils/synutils/alignment.h b/utils/synutils/alignment.h
index c0648aab..6abd12bc 100644
--- a/utils/synutils/alignment.h
+++ b/utils/synutils/alignment.h
@@ -13,7 +13,7 @@
#include <stdio.h>
#include <string.h>
-#include "stringlib.h"
+#include "utils/stringlib.h"
using namespace std;
diff --git a/utils/synutils/constituent_reorder_model.cc b/utils/synutils/constituent_reorder_model.cc
index a4fb9627..78d61b90 100644
--- a/utils/synutils/constituent_reorder_model.cc
+++ b/utils/synutils/constituent_reorder_model.cc
@@ -12,12 +12,12 @@
#include "utility.h"
#include "tsuruoka_maxent.h"
-#include <tr1/unordered_map>
+#include <unordered_map>
using namespace std;
-typedef std::tr1::unordered_map<std::string, int> Map;
-typedef std::tr1::unordered_map<std::string, int>::iterator Iterator;
+typedef std::unordered_map<std::string, int> Map;
+typedef std::unordered_map<std::string, int>::iterator Iterator;
namespace po = boost::program_options;
diff --git a/utils/synutils/srl_sentence.h b/utils/synutils/srl_sentence.h
index c08cc065..1afdec45 100644
--- a/utils/synutils/srl_sentence.h
+++ b/utils/synutils/srl_sentence.h
@@ -8,10 +8,13 @@
#ifndef SRL_SENTENCE_H_
#define SRL_SENTENCE_H_
-#include "tree.h"
+#include <sstream>
#include <vector>
+#include "tree.h"
+#include "utils/stringlib.h"
+
using namespace std;
struct SArgument {
diff --git a/utils/synutils/tree.h b/utils/synutils/tree.h
index 32521a3a..8070f828 100644
--- a/utils/synutils/tree.h
+++ b/utils/synutils/tree.h
@@ -8,10 +8,12 @@
#ifndef TREE_H_
#define TREE_H_
-#include <string>
#include <assert.h>
#include <stdio.h>
+#include <string>
+#include <vector>
+
using namespace std;
struct STreeItem {
diff --git a/utils/synutils/tsuruoka_maxent.h b/utils/synutils/tsuruoka_maxent.h
index b5a87404..89b06b97 100644
--- a/utils/synutils/tsuruoka_maxent.h
+++ b/utils/synutils/tsuruoka_maxent.h
@@ -7,19 +7,19 @@
#define TSURUOKA_MAXENT_H_
#include "utility.h"
-#include "stringlib.h"
-#include "maxent-3.0/maxent.h"
+#include "utils/stringlib.h"
+#include "utils/synutils/maxent-3.0/maxent.h"
#include <assert.h>
#include <vector>
#include <string>
#include <string.h>
-#include <tr1/unordered_map>
+#include <unordered_map>
using namespace std;
-typedef std::tr1::unordered_map<std::string, int> Map;
-typedef std::tr1::unordered_map<std::string, int>::iterator Iterator;
+typedef std::unordered_map<std::string, int> Map;
+typedef std::unordered_map<std::string, int>::iterator Iterator;
struct Tsuruoka_Maxent {
Tsuruoka_Maxent(const char* pszModelFName) {
diff --git a/utils/synutils/utility.h b/utils/synutils/utility.h
index 791b2286..ef7b78b7 100644
--- a/utils/synutils/utility.h
+++ b/utils/synutils/utility.h
@@ -13,6 +13,8 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
+
+#include <string>
#include <unordered_map>
using namespace std;