diff options
| author | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-08-07 16:14:19 +0300 |
|---|---|---|
| committer | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-08-07 16:14:19 +0300 |
| commit | 883c34aee9266cce72f9a8851e863cb4b910c718 (patch) | |
| tree | db3778ea44b6a9ffeaa05436782cab0d8d3ffd52 /moses/TypeDef.h | |
| parent | a07eb65118a6eec894e5d100cdd6f41f08039877 (diff) | |
| parent | 83ef138961a9e4711ba9efecaa9f81eb701fcb3f (diff) | |
Merge branch 'master' of http://github.com/moses-smt/mosesdecoder into mmt-dev
Conflicts:
moses/SearchNormalBatch.cpp
moses/TranslationModel/UG/mm/ug_bitext.h
moses/TranslationModel/UG/mm/ug_typedefs.h
moses/TranslationModel/UG/mmsapt.cpp
moses/TranslationModel/UG/mmsapt.h
Diffstat (limited to 'moses/TypeDef.h')
| -rw-r--r-- | moses/TypeDef.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/moses/TypeDef.h b/moses/TypeDef.h index d8f881df4..4ccc25143 100644 --- a/moses/TypeDef.h +++ b/moses/TypeDef.h @@ -144,7 +144,7 @@ enum SearchAlgorithm { CubePruning = 1, //,CubeGrowing = 2 CYKPlus = 3, - NormalBatch = 4, + //NormalBatch = 4, ChartIncremental = 5, SyntaxS2T = 6, SyntaxT2S = 7, |