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 | |
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')
-rw-r--r-- | moses/src/CreateTargetPhraseCollection.cpp | 6 | ||||
-rw-r--r-- | moses/src/CreateTranslationOptionCollection.cpp | 1 | ||||
-rw-r--r-- | moses/src/Input.h | 1 | ||||
-rwxr-xr-x | moses/src/Parameter.cpp | 2 | ||||
-rwxr-xr-x | moses/src/StaticData.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/moses/src/CreateTargetPhraseCollection.cpp b/moses/src/CreateTargetPhraseCollection.cpp index 14560a2d8..b59eced4b 100644 --- a/moses/src/CreateTargetPhraseCollection.cpp +++ b/moses/src/CreateTargetPhraseCollection.cpp @@ -5,7 +5,7 @@ #include "Input.h" #include "Sentence.h" #include "WordsRange.h" -//#include "PhraseDictionaryTreeAdaptor.h" +#include "PhraseDictionaryTreeAdaptor.h" TargetPhraseCollection const* CreateTargetPhraseCollection(Dictionary const* d, InputType const* i, @@ -15,8 +15,8 @@ CreateTargetPhraseCollection(Dictionary const* d, Phrase src=s->GetSubString(r); if(PhraseDictionary const* pdict=dynamic_cast<PhraseDictionary const*>(d)) return pdict->FindEquivPhrase(src); - // else if(PhraseDictionaryTreeAdaptor const* pdict=dynamic_cast<PhraseDictionaryTreeAdaptor const*>(d)) - // return pdict->GetTargetPhraseCollection(src); + else if(PhraseDictionaryTreeAdaptor const* pdict=dynamic_cast<PhraseDictionaryTreeAdaptor const*>(d)) + return pdict->GetTargetPhraseCollection(src); else std::cerr<<"ERROR: unknown phrase dictionary type in "<<__FILE__<<"\n"; } diff --git a/moses/src/CreateTranslationOptionCollection.cpp b/moses/src/CreateTranslationOptionCollection.cpp index 19808cd1f..f76cecde3 100644 --- a/moses/src/CreateTranslationOptionCollection.cpp +++ b/moses/src/CreateTranslationOptionCollection.cpp @@ -15,7 +15,6 @@ TranslationOptionCollection* CreateTranslationOptionCollection(InputType const* { std::cerr<<"ERROR: unknown InputType in "<<__FILE__<<"\n"; abort(); - return 0; } } diff --git a/moses/src/Input.h b/moses/src/Input.h index e9093fe1f..515b9e5e2 100644 --- a/moses/src/Input.h +++ b/moses/src/Input.h @@ -15,7 +15,6 @@ protected: public: InputType(long translationId=0); - //Input(); virtual ~InputType(); // for db stuff diff --git a/moses/src/Parameter.cpp b/moses/src/Parameter.cpp index 387016f0f..6b5273b3c 100755 --- a/moses/src/Parameter.cpp +++ b/moses/src/Parameter.cpp @@ -63,6 +63,7 @@ Parameter::Parameter() AddParam("stack"); AddParam("verbose"); AddParam("drop-unknown"); + AddParam("inputtype"); } // check if parameter settings make sense @@ -239,6 +240,7 @@ bool Parameter::LoadParam(int argc, char* argv[]) OverwriteParam("-s", "stack", argc, argv); OverwriteParam("-v", "verbose", argc, argv); OverwriteParam("-drop-unknown", "drop-unknown", argc, argv); + OverwriteParam("-inputtype","inputtype",argc,argv); // check if parameters make sense return Validate(); } diff --git a/moses/src/StaticData.cpp b/moses/src/StaticData.cpp index c3612ca62..40a26ab75 100755 --- a/moses/src/StaticData.cpp +++ b/moses/src/StaticData.cpp @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ***********************************************************************/ #include <string> -#include <assert.h> +#include <cassert> #include "StaticData.h" #include "Util.h" |