Commit Graph

83 Commits

Author SHA1 Message Date
Barry Haddow
9d42c7f6f7 Merge branch 'master' of github.com:moses-smt/mosesdecoder 2013-04-12 16:07:26 +01:00
Barry Haddow
8efeb59228 don't lowercase reference if there's a recaser 2013-03-18 21:29:17 +00:00
Barry Haddow
51ab9aa19d Merge remote branch 'origin/master' into phrase-weighting 2013-02-21 17:34:59 +00:00
phikoehn
124c36a837 bug fix with MML settings 2013-01-14 19:39:26 +00:00
Graham Neubig
c55a1474df Updated experiment.meta 2013-01-10 16:16:23 +09:00
phikoehn
b275c94dbf allow for inclusion of extract from previous run 2012-12-12 07:02:59 +00:00
phikoehn
24e1df7520 support for use of baseline alignment model 2012-12-12 03:59:14 +00:00
phikoehn
466b502ae0 minor bug fixes with MML 2012-12-09 20:31:20 +00:00
phikoehn
84cb04c05a fixes and extensions to modified Moore-Lewis filtering, now works with domain features 2012-11-30 07:28:31 +00:00
phikoehn
1f7ee0e6c5 change of settings for sigtest filtering 2012-11-29 23:44:10 +00:00
phikoehn
b5d08745a5 extensions to modified moore-lewis filtering, bug fixes 2012-11-24 20:13:14 +00:00
phikoehn
ea610a0558 added modified-moore-lewis from Barry Haddow into EMS 2012-11-24 12:43:13 +00:00
phikoehn
d4cebb008a added ems support for sigtest-filter 2012-11-23 17:35:13 +00:00
Barry Haddow
c316fe68de Strip segmentation before scoring. 2012-11-14 13:28:40 +00:00
phikoehn
7d66a4f8d5 superminortiny fix 2012-10-18 02:52:30 +01:00
Barry Haddow
848aafb644 Merge remote branch 'github/master' into miramerge
Conflicts:
	moses/src/AlignmentInfo.cpp
	moses/src/AlignmentInfo.h
	moses/src/ChartHypothesis.cpp
	moses/src/ChartTrellisNode.cpp
	moses/src/LM/Implementation.cpp
	moses/src/LM/Ken.cpp
	moses/src/TargetPhrase.cpp
	moses/src/TargetPhrase.h
2012-10-08 17:54:59 +01:00
Phil Williams
289a9ea54f experiment.meta: update pcfg-extract and pcfg-score
EMS now looks for binaries in $moses-bin-dir instead of their old
location in $moses-script-dir.
2012-10-03 19:57:51 +01:00
Eva Hasler
e7e4dbd405 merge remaining changes to mira, word pair features, phrase pair features 2012-10-03 18:53:55 +01:00
Eva Hasler
ebbf0d028c changes to mira, adding jackknife to experiment.perl 2012-10-01 20:36:52 +01:00
Barry Haddow
0a950ee9f4 Merge remote branch 'github/master' into miramerge
Compiles, but not tested. Had to disable relent filter. Strangely, it seems to contain the
whole of moses-cmd.

Conflicts:
	Jamroot
	OnDiskPt/TargetPhrase.cpp
	moses-cmd/src/Main.cpp
	moses/src/AlignmentInfo.cpp
	moses/src/AlignmentInfo.h
	moses/src/ChartTranslationOptionCollection.cpp
	moses/src/ChartTranslationOptionCollection.h
	moses/src/GenerationDictionary.cpp
	moses/src/Jamfile
	moses/src/Parameter.cpp
	moses/src/PhraseDictionary.cpp
	moses/src/StaticData.cpp
	moses/src/StaticData.h
	moses/src/TargetPhrase.h
	moses/src/TranslationSystem.cpp
	moses/src/TranslationSystem.h
	moses/src/Word.cpp
	phrase-extract/score.cpp
	regression-testing/Jamfile
	scripts/ems/experiment.meta
	scripts/ems/experiment.perl
	scripts/training/train-model.perl
2012-09-26 22:49:33 +01:00
Barry Haddow
8051981747 Fix so that it works without mira 2012-09-21 09:24:57 +01:00
Barry Haddow
37494dd673 fix phikoehn's merge conflict 2012-09-20 10:28:03 +01:00
phikoehn
4a1a995878 a lot of changes 2012-08-18 23:48:26 +01:00
phikoehn
366ab93f8a a lot of changes 2012-08-18 23:47:05 +01:00
Lane Schwartz
da5429318b KenLM maximum n-gram order can now be set via a compile-time flag 2012-08-08 16:22:13 -04:00
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
phikoehn
c8b2e89573 integrated sparse lexical features into experiment.perl, needs some more testing. 2012-07-03 06:20:09 +01:00
Eva Hasler
e1c1a5343c merge 2012-06-07 11:16:52 +01:00
Hieu Hoang
797b36a73a change output of build-suffix-array step to phrase-table. 2012-06-06 18:47:27 +01:00
Hieu Hoang
c6756f8301 start integrating adam's suffix array 2012-06-01 19:28:22 +01:00
Eva Hasler
6a6a35c65e 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
Colin Cherry
3c44d04baf Merge branch 'master' into miramerge
Conflicts:
	Jamroot
	mert/FeatureStats.cpp
	moses-cmd/src/IOWrapper.h
	scripts/training/mert-moses.pl
	scripts/training/train-model.perl.missing_bin_dir
2012-05-30 12:39:53 -04:00
phikoehn
07fafd51b5 Merge branch 'master' of git://github.com/moses-smt/mosesdecoder 2012-05-26 00:10:08 +01:00
phikoehn
180dd773f6 bolt specific settings 2012-05-26 00:06:34 +01:00
Phil Williams
90c0bc9f5c Add an optional PCFG scoring feature for target syntax models (similar to
the p_cfg feature used in Marcu, Wang, Echihabi, and Knight (2006)).
2012-05-25 17:29:47 +01:00
Barry Haddow
c397d2068b Merge branch 'trunk' into miramerge. Still to fix build.
Conflicts:
	Jamroot
	mert/Data.cpp
	mert/Data.h
	mert/FeatureArray.cpp
	mert/FeatureArray.h
	mert/FeatureData.cpp
	mert/FeatureData.h
	mert/FeatureStats.cpp
	mert/FeatureStats.h
	mert/mert.cpp
	moses-chart-cmd/src/IOWrapper.h
	moses-chart-cmd/src/Main.cpp
	moses-cmd/src/IOWrapper.cpp
	moses-cmd/src/IOWrapper.h
	moses-cmd/src/Main.cpp
	moses/src/GlobalLexicalModel.cpp
	moses/src/Jamfile
	moses/src/Parameter.cpp
	moses/src/PhraseDictionary.cpp
	moses/src/ScoreIndexManager.h
	moses/src/TargetPhrase.h
	regression-testing/tests/phrase.lexicalized-reordering-bin/truth/results.txt
	regression-testing/tests/phrase.lexicalized-reordering-cn/truth/results.txt
	regression-testing/tests/phrase.lexicalized-reordering/truth/results.txt
	regression-testing/tests/phrase.multiple-translation-system-lr/truth/results.txt
	regression-testing/tests/phrase.show-weights.lex-reorder/truth/results.txt
	regression-testing/tests/phrase.show-weights/truth/results.txt
	scripts/ems/experiment.meta
	scripts/ems/experiment.perl
	scripts/training/filter-model-given-input.pl
	scripts/training/mert-moses.pl
2012-05-24 21:11:35 +01:00
Eva Hasler
30deedde9f changed permission, everything changed.. 2012-05-10 18:54:24 +01:00
Eva Hasler
98da24a3a5 add condition for devtest chains, fix paths to moses/moses_chart 2012-04-24 05:17:19 +01:00
phikoehn
d741e25494 re-run extract when using ghkm 2012-04-14 22:18:16 +01:00
phikoehn
05f02157ab re-run extract when using ghkm 2012-04-14 22:18:16 +01:00
Eva Hasler
beb8096d81 set up pipeline for devtest set (mira tuning) 2012-04-13 15:43:01 +01:00
Eva Hasler
b85cf551c9 updates to ems 2012-04-13 13:18:35 +01:00
Eva Hasler
b008dabfce cherry-picked commit 2d47a5637b from master 2012-04-12 12:29:12 +01:00
phikoehn
366d427ce6 minor fixes 2012-04-12 00:25:57 +01:00
phikoehn
2d47a5637b minor fixes 2012-04-12 00:25:57 +01:00
Eva Hasler
77c743e65f enable mira for experiment.perl (.meta still needs some adjustment), clean up mira training script 2012-04-06 21:01:59 +01:00
phikoehn
1794bccd90 only filter rule and reordering tables, if the tables changes, not just when weights or other settings changed 2012-03-22 00:13:02 +00:00
phikoehn
76d2a19741 only filter rule and reordering tables, if the tables changes, not just when weights or other settings changed 2012-03-22 00:13:02 +00:00
Eva Hasler
95a1f8e36f update experiment.meta 2012-03-21 13:02:47 +00:00
phikoehn
15c83daa21 mop up 2012-03-21 00:38:05 +00:00