diff options
author | Ulrich Germann <ulrich.germann@cs.toronto.edu> | 2013-06-26 06:00:27 +0400 |
---|---|---|
committer | Ulrich Germann <ulrich.germann@cs.toronto.edu> | 2013-06-26 06:00:27 +0400 |
commit | 2f6ca0c0b8bdf78012c8f64105f0fd4773f0de90 (patch) | |
tree | 2772d59314a7cc3c5e568e54cc6f3a34d9e9f090 /moses/TypeDef.h | |
parent | 22d37e9d921cb1f6bd0ab8c7a1bf8ee3d7eb0cae (diff) | |
parent | e15a4fc882952be13efcdecc8284d19560229785 (diff) |
Merge branch 'master' into dynamic-phrase-tables
Conflicts:
moses/Hypothesis.cpp
moses/StaticData.cpp
moses/TargetPhrase.cpp
moses/TranslationModel/BilingualDynSuffixArray.cpp
moses/TranslationModel/BilingualDynSuffixArray.h
moses/TranslationModel/PhraseDictionary.h
moses/TranslationModel/PhraseDictionaryDynSuffixArray.cpp
moses/TranslationModel/PhraseDictionaryDynSuffixArray.h
Diffstat (limited to 'moses/TypeDef.h')
-rw-r--r-- | moses/TypeDef.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/moses/TypeDef.h b/moses/TypeDef.h index 57b607669..af3a47b23 100644 --- a/moses/TypeDef.h +++ b/moses/TypeDef.h @@ -130,7 +130,7 @@ enum InputTypeEnum { ,WordLatticeInput = 2 ,TreeInputType = 3 ,WordLatticeInput2 = 4 - + }; enum XmlInputType { @@ -170,21 +170,11 @@ enum WordAlignmentSort { ,TargetOrder = 1 }; -enum FormatType -{ +enum FormatType { MosesFormat ,HieroFormat }; -enum StatelessFeatureType -{ - SetByOriginator // The scores are set by the phrase table, generatio table, or unknown word handler - // They shouldn't be subsequently evaluated. - ,RequiresTargetPhrase // Default. simplest, but not in phrase-table. eg. word penalty - ,RequiresSource // can't be pre-computed during training, but can be computed before search.eg. source bag-of-word features - ,RequiresSegmentation // can't be pre-computed. Depends on segmentation during search. eg. span-length feature -}; - // typedef typedef size_t FactorType; |