mosesdecoder/contrib
Barry Haddow 2b4e61d826 Merge branch 'trunk' into miramerge
Compiles, not tested.

Conflicts:
	Jamroot
	OnDiskPt/PhraseNode.h
	OnDiskPt/TargetPhrase.cpp
	OnDiskPt/TargetPhrase.h
	OnDiskPt/TargetPhraseCollection.cpp
	mert/BleuScorer.cpp
	mert/Data.cpp
	mert/FeatureData.cpp
	moses-chart-cmd/src/Main.cpp
	moses/src/AlignmentInfo.h
	moses/src/ChartManager.cpp
	moses/src/LM/Ken.cpp
	moses/src/LM/Ken.h
	moses/src/LMList.h
	moses/src/LexicalReordering.h
	moses/src/PhraseDictionaryTree.h
	moses/src/ScoreIndexManager.h
	moses/src/StaticData.h
	moses/src/TargetPhrase.h
	moses/src/Word.cpp
	scripts/ems/experiment.meta
	scripts/ems/experiment.perl
	scripts/training/train-model.perl
2012-07-17 13:36:50 +01:00
..
checkplf fix start weights in experiment.perl, add hypothesis queue for picking hope and fear translations, add variations to 1slack formulation 2012-06-01 01:49:42 +01:00
eppex revert mode changes 2012-07-04 12:25:21 +01:00
iSenWeb A web interface to Moses. Thanks to Liang Tian 2012-07-09 10:27:28 +01:00
lmserver revert mode changes 2012-07-04 12:25:21 +01:00
memscore revert mode changes 2012-07-04 12:25:21 +01:00
other-builds Merge branch 'trunk' into miramerge 2012-07-17 13:36:50 +01:00
reranking fix start weights in experiment.perl, add hypothesis queue for picking hope and fear translations, add variations to 1slack formulation 2012-06-01 01:49:42 +01:00
server merge 2012-06-07 11:16:52 +01:00
sigtest-filter sigtest-filter can now also filter lexical reordering tables. 2012-07-12 16:04:23 +02:00
synlm/hhmm fix start weights in experiment.perl, add hypothesis queue for picking hope and fear translations, add variations to 1slack formulation 2012-06-01 01:49:42 +01:00
tmcombine tmcombine: fix crash with option --recompute-lexweights 2012-07-16 13:26:39 +02:00
web Merge branch 'trunk' into miramerge 2012-07-17 13:36:50 +01:00
mert-moses-multi.pl move mert-moses-multi.pl 2012-07-06 12:58:06 +01:00