Fix some compile errors, etc.

neubig · Apr 29, 2019 · cc8369e · cc8369e
1 parent 2b9c10e
commit cc8369e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.59])
-AC_INIT([pialign], [0.2.4], [neubig@gmail.com])
+AC_INIT([pialign], [0.2.5], [neubig@gmail.com])
 AC_CONFIG_SRCDIR(src/lib/pialign.cc)
 AC_CONFIG_HEADERS([src/include/pialign/config.h])
 AC_CONFIG_FILES([

diff --git a/src/include/Makefile.am b/src/include/Makefile.am
@@ -1 +1 @@
-nobase_include_HEADERS = pialign/base-compound.h pialign/look-base.h pialign/model-hier.h pialign/sais.hxx pialign/base-measure.h pialign/look-ind.h pialign/model-length.h pialign/base-model1.h pialign/definitions.h pialign/look-none.h pialign/parse-chart.h pialign/base-phrasecooc.h pialign/dirichletdist.h pialign/model-base.h pialign/pialign.h pialign/base-unigram.h pialign/esa.hxx pialign/model-flat.h pialign/pydist.h pialign/config.h gng/counter.h gng/samp-gen.h gng/symbol-map.h gng/symbol-trie.h gng/string.h gng/symbol-set.h gng/trie.h
+nobase_include_HEADERS = pialign/base-compound.h pialign/look-base.h pialign/model-hier.h pialign/sais.hxx pialign/base-measure.h pialign/look-ind.h pialign/model-length.h pialign/base-model1.h pialign/definitions.h pialign/look-none.h pialign/parse-chart.h pialign/base-phrasecooc.h pialign/dirichletdist.h pialign/model-base.h pialign/pialign.h pialign/base-unigram.h pialign/esa.hxx pialign/model-flat.h pialign/pydist.h pialign/config.h gng/counter.h gng/samp-gen.h gng/symbol-map.h gng/symbol-trie.h gng/string.h gng/symbol-set.h gng/trie.h port/port.h
diff --git a/src/include/pialign/config.h b/src/include/pialign/config.h
@@ -62,7 +62,7 @@
 #define PACKAGE_NAME "pialign"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "pialign 0.2.4"
+#define PACKAGE_STRING "pialign 0.2.5"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "pialign"
@@ -71,13 +71,13 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.2.4"
+#define PACKAGE_VERSION "0.2.5"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.2.4"
+#define VERSION "0.2.5"
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE

diff --git a/src/include/pialign/definitions.h b/src/include/pialign/definitions.h
@@ -12,7 +12,6 @@
 // enables compression
 // #define COMPRESS_ON
 
-#include "port/port.h"
 #include "gng/string.h"
 #include "gng/symbol-set.h"
 #include "gng/symbol-map.h"

diff --git a/src/test/maintest-pialign.cc b/src/test/maintest-pialign.cc
@@ -50,7 +50,7 @@ SpanNode * getSpanNode() {
 
 // test various models
 int testModel(ProbModel & mod, int phraseCount) {
-    mod.setMaxLen(4);
+    mod.setMaxLen(4, 4);
     WordString e = makeWS(4), f = makeWS(3);
     BaseUnigram base;
     StringWordSet ep, fp;
@@ -85,7 +85,7 @@ int testModel(ProbModel & mod, int phraseCount) {
 
 // test various models
 int testMatch(ProbModel & mod) {
-    mod.setMaxLen(4);
+    mod.setMaxLen(4, 4);
     WordString e = makeWS(4), f = makeWS(3);
     BaseUnigram base;
     StringWordSet ep, fp;