Also fix mert-moses.pl to use correct flag for specifying
weights of non-core features.
Conflicts:
.gitignore
configure.in
ltmain.sh
moses/src/LM/Factory.cpp
moses/src/LMList.cpp
moses/src/LMList.h
moses/src/LanguageModel.cpp
moses/src/LanguageModel.h
moses/src/LanguageModelKen.h
moses/src/Makefile.am
moses/src/Manager.cpp
moses/src/PhraseDictionaryMemory.cpp
moses/src/PhraseDictionaryTree.cpp
moses/src/StaticData.cpp
moses/src/TargetPhrase.h
Passes all regression except for the score tests, as I still have to merge
in the missing files for these tests.
Conflicts:
.gitignore
Makefile.am
configure.in
moses-chart/moses-chart.xcodeproj/project.pbxproj
moses/src/ChartHypothesis.cpp
moses/src/ChartTranslationOptionCollection.cpp
moses/src/ChartTrellisPath.cpp
moses/src/DotChart.cpp
moses/src/LMList.h
moses/src/LanguageModel.cpp
moses/src/LanguageModel.h
moses/src/LanguageModelFactory.cpp
moses/src/LanguageModelRemote.h
moses/src/LexicalReordering.h
moses/src/Makefile.am
moses/src/Manager.cpp
moses/src/Parameter.cpp
moses/src/RuleCubeQueue.h
moses/src/ScoreIndexManager.cpp
moses/src/StaticData.cpp
moses/src/StaticData.h
moses/src/TargetPhrase.cpp
moses/src/TargetPhrase.h
moses/src/TranslationOptionCollection.cpp
