diff options
| author | zens <zens@1f5c12ca-751b-0410-a591-d2e778427230> | 2006-07-21 17:50:41 +0400 |
|---|---|---|
| committer | zens <zens@1f5c12ca-751b-0410-a591-d2e778427230> | 2006-07-21 17:50:41 +0400 |
| commit | c220c8650140c4ca1ff0e6a67d83daec67875388 (patch) | |
| tree | f770ef2cb611176a1970518fc93e277030f8c5cb /moses-cmd | |
| parent | 4c03fc1de86e23d88399c87e1f40e2b4d89d44f8 (diff) | |
- binary phrase table now fully supported
-> define preprocessor variable USEBINTTABLE
e.g. uncommenting the line in StaticData.cpp
or on the make command line
- some clean up
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@241 1f5c12ca-751b-0410-a591-d2e778427230
Diffstat (limited to 'moses-cmd')
| -rw-r--r-- | moses-cmd/src/Main.cpp | 9 | ||||
| -rw-r--r-- | moses-cmd/src/Makefile | 12 | ||||
| -rw-r--r-- | moses-cmd/src/Makefile.in | 12 |
3 files changed, 9 insertions, 24 deletions
diff --git a/moses-cmd/src/Main.cpp b/moses-cmd/src/Main.cpp index 1fabde8f0..84de31d29 100644 --- a/moses-cmd/src/Main.cpp +++ b/moses-cmd/src/Main.cpp @@ -97,13 +97,10 @@ int main(int argc, char* argv[]) return EXIT_FAILURE; // read each sentence & decode - InputType *source; - //staticData.GetInputType() - while( (source = inputOutput->GetInput()) != NULL) + while(InputType *source = inputOutput->GetInput()) { - if(Sentence* sent=dynamic_cast<Sentence*>(source)) - TRACE_ERR(*sent << endl); - TranslationOptionCollection * translationOptionCollection=CreateTranslationOptionCollection(source); + if(Sentence* sent=dynamic_cast<Sentence*>(source)) TRACE_ERR(*sent<<"\n"); + TranslationOptionCollection *translationOptionCollection=CreateTranslationOptionCollection(source); assert(translationOptionCollection); Manager manager(*source, *translationOptionCollection, staticData); diff --git a/moses-cmd/src/Makefile b/moses-cmd/src/Makefile index 4dbc2e480..34ee0b997 100644 --- a/moses-cmd/src/Makefile +++ b/moses-cmd/src/Makefile @@ -57,8 +57,6 @@ am__moses_SOURCES_DIST = Main.cpp IOCommandLine.cpp IOFile.cpp \ am_moses_OBJECTS = Main.$(OBJEXT) IOCommandLine.$(OBJEXT) \ IOFile.$(OBJEXT) $(am__objects_1) moses_OBJECTS = $(am_moses_OBJECTS) -am__DEPENDENCIES_1 = -moses_DEPENDENCIES = $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -155,13 +153,9 @@ sharedstatedir = ${prefix}/com sysconfdir = ${prefix}/etc target_alias = moses_SOURCES = Main.cpp IOCommandLine.cpp IOFile.cpp $(am__append_1) -MOSESLIB = -lmoses -processPhraseTable_SOURCES = processPhraseTable.cpp -processPhraseTable_LDADD = $(MOSESLIB) - -# this really needs to be fixed -### INCLUDES = -I../../src -moses_LDADD = $(MOSESLIB) +AM_CPPFLAGS = -W -Wall -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES +moses_LDADD = -lmoses +moses_DEPENDENCIES = $(top_srcdir)/../moses/src/libmoses.a all: all-am .SUFFIXES: diff --git a/moses-cmd/src/Makefile.in b/moses-cmd/src/Makefile.in index fbfa541ea..ab3932caf 100644 --- a/moses-cmd/src/Makefile.in +++ b/moses-cmd/src/Makefile.in @@ -57,8 +57,6 @@ am__moses_SOURCES_DIST = Main.cpp IOCommandLine.cpp IOFile.cpp \ am_moses_OBJECTS = Main.$(OBJEXT) IOCommandLine.$(OBJEXT) \ IOFile.$(OBJEXT) $(am__objects_1) moses_OBJECTS = $(am_moses_OBJECTS) -am__DEPENDENCIES_1 = -moses_DEPENDENCIES = $(am__DEPENDENCIES_1) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -155,13 +153,9 @@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ moses_SOURCES = Main.cpp IOCommandLine.cpp IOFile.cpp $(am__append_1) -MOSESLIB = -lmoses -processPhraseTable_SOURCES = processPhraseTable.cpp -processPhraseTable_LDADD = $(MOSESLIB) - -# this really needs to be fixed -### INCLUDES = -I../../src -moses_LDADD = $(MOSESLIB) +AM_CPPFLAGS = -W -Wall -ffor-scope -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES +moses_LDADD = -lmoses +moses_DEPENDENCIES = $(top_srcdir)/../moses/src/libmoses.a all: all-am .SUFFIXES: |