diff options
author | Nicola Bertoldi <bertoldi@fbk.eu> | 2014-01-15 19:16:37 +0400 |
---|---|---|
committer | Nicola Bertoldi <bertoldi@fbk.eu> | 2014-01-15 19:16:37 +0400 |
commit | 47bece6eac17d537d443872ab014013bbd971fe8 (patch) | |
tree | ae8cdc3bb830703c22d3a2ac615b131d4df2ca9c /moses/TypeDef.h | |
parent | c13bb8f8e88402ffa570c7f418e4a4e3238ca6bc (diff) | |
parent | 32ccbef3b91f667ab8e26c1ba6197d6f23c08695 (diff) |
code cleanup; fixings to others' code/test
Diffstat (limited to 'moses/TypeDef.h')
-rw-r--r-- | moses/TypeDef.h | 62 |
1 files changed, 29 insertions, 33 deletions
diff --git a/moses/TypeDef.h b/moses/TypeDef.h index 5675ca328..f6a8bc4d0 100644 --- a/moses/TypeDef.h +++ b/moses/TypeDef.h @@ -108,29 +108,30 @@ enum DistortionOrientationOptions { enum PhraseTableImplementation { Memory = 0 - ,Binary = 1 - ,OnDisk = 2 - //,GlueRule = 3 - //,Joshua = 4 - //,MemorySourceLabel = 5 - ,SCFG = 6 - //,BerkeleyDb = 7 - ,SuffixArray = 8 - ,Hiero = 9 - ,ALSuffixArray = 10 - ,FuzzyMatch = 11 - ,Compact = 12 - ,Interpolated = 13 - ,DSuffixArray = 14 - ,DCacheBased = 32 + ,Binary = 1 + ,OnDisk = 2 + //,GlueRule = 3 + //,Joshua = 4 + //,MemorySourceLabel = 5 + ,SCFG = 6 + //,BerkeleyDb = 7 + ,SuffixArray = 8 + ,Hiero = 9 + ,ALSuffixArray = 10 + ,FuzzyMatch = 11 + ,Compact = 12 + ,Interpolated = 13 + ,DSuffixArray = 14 + ,MemMappedSA = 15 + ,DCacheBased = 32 }; enum InputTypeEnum { SentenceInput = 0 - ,ConfusionNetworkInput = 1 - ,WordLatticeInput = 2 - ,TreeInputType = 3 - ,WordLatticeInput2 = 4 + ,ConfusionNetworkInput = 1 + ,WordLatticeInput = 2 + ,TreeInputType = 3 + ,WordLatticeInput2 = 4 }; @@ -144,32 +145,27 @@ enum XmlInputType { enum DictionaryFind { Best = 0 - ,All = 1 -}; - -enum ParsingAlgorithm { - ParseCYKPlus = 0, - ParseScope3 = 1 + ,All = 1 }; enum SearchAlgorithm { Normal = 0 - ,CubePruning = 1 - ,CubeGrowing = 2 - ,ChartDecoding= 3 - ,NormalBatch = 4 - ,ChartIncremental = 5 + ,CubePruning = 1 + ,CubeGrowing = 2 + ,ChartDecoding= 3 + ,NormalBatch = 4 + ,ChartIncremental = 5 }; enum SourceLabelOverlap { SourceLabelOverlapAdd = 0 - ,SourceLabelOverlapReplace = 1 - ,SourceLabelOverlapDiscard = 2 + ,SourceLabelOverlapReplace = 1 + ,SourceLabelOverlapDiscard = 2 }; enum WordAlignmentSort { NoSort = 0 - ,TargetOrder = 1 + ,TargetOrder = 1 }; enum FormatType { |