Commit Graph

5 Commits

Author SHA1 Message Date
Hieu Hoang
efc2c6145e beautify 2013-06-26 17:19:09 +01:00
Ulrich Germann
2f6ca0c0b8 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
2013-06-26 03:00:27 +01:00
Ulrich Germann
570b7c6aa5 Fixed bug in ComparePosition::operator()(...). 2013-06-03 12:22:05 +01:00
Hieu Hoang
6249432407 beautify 2013-05-29 18:16:15 +01:00
Hieu Hoang
6bf2870f18 move the rest of DynSA to TranslationModel/ 2012-11-27 16:31:42 +00:00