Commit Graph

416 Commits

Author SHA1 Message Date
Barry Haddow
190f4c5996 Fix non-mpi compile error 2012-10-09 21:51:32 +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
2d71e5be60 Non-mpi build 2012-08-17 13:46:38 +01:00
ehasler
6ba85d22a4 save all changes related to domain adaptation 2012-07-26 17:32:50 +01: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
Eva Hasler
bc2c564178 remove unused vars 2012-07-04 11:53:45 +01:00
Eva Hasler
ea1bdd03f1 clean up mira 2012-07-04 11:40:12 +01:00
Eva Hasler
788bea2f2b clean up and fixing stopping criterion in mira training script 2012-07-03 16:21:09 +01:00
Eva Hasler
e1c1a5343c merge 2012-06-07 11:16:52 +01:00
Eva Hasler
3c1728f30d clean up 2012-06-01 20:20:30 +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
Eva
62d10a2af3 implement CalculateBleu for complete translations, add parameters --disable-bleu-feature and --real-bleu to replace dynamic sentence Bleu with real sentence Bleu 2012-05-29 17:04:36 -07:00
Eva
29b31f6cd9 remove <s> and </s> from chart bleu score computation 2012-05-28 15:49:39 -07:00
Eva
d81ebe2337 Fix nbest lists for chart mira 2012-05-27 23:03:45 -07:00
Eva Hasler
4f76643486 update feature learning rate code 2012-05-18 18:58:42 +01:00
Eva Hasler
c8f04a7e48 add feature confidence 2012-05-15 17:49:54 +01:00
Eva Hasler
30deedde9f changed permission, everything changed.. 2012-05-10 18:54:24 +01:00
Eva Hasler
dd9bd42a62 fix weight scaling 2012-05-02 22:54:23 +01:00
Eva Hasler
702c9d1b81 enable start weights and scaling all features 2012-05-02 21:34:39 +01:00
Eva Hasler
9035a0ac85 fix margin normalisation 2012-05-02 17:57:24 +01:00
Eva Hasler
e9fb37a918 set bleu weight back to 1 2012-05-01 00:22:01 +01:00
Eva Hasler
1b18c0a914 distinguish between dynamic and external score 2012-05-01 00:15:16 +01:00
Eva
b137d737b9 fix sampling for history bleu 2012-04-30 10:57:10 -07:00
Eva
668e91c1da fix merge conflict 2012-04-29 23:49:21 -07:00
Eva
459696a2af add optional scaling to history bleu, adjust bleu selection for history bleu 2012-04-29 23:39:02 -07:00
Eva Hasler
77444b3e91 add sanity check for sampled hypotheses 2012-04-30 06:07:39 +01:00
Eva
3eb1e0d765 fix: scale feature values for sampled translations 2012-04-29 21:56:24 -07:00
Eva
1d0c166927 fix merge conflict 2012-04-29 21:32:37 -07:00
Eva Hasler
81a252f787 fix setting bleu weights 2012-04-30 05:31:09 +01:00
Eva
6c2a58a48e clean up mira, add sampling from hope/model/fear 2012-04-29 21:29:18 -07:00
Eva
6f39ad0b3e test 2012-04-28 23:11:30 -07:00
Eva
b8b3000daf test 2012-04-28 23:08:11 -07:00
Eva Hasler
ef552fe91a remove caching of wp weight and translation weights, clean up mira code 2012-04-29 05:37:48 +01:00
Eva Hasler
f09c962f76 separate decoder settings, or general 2012-04-27 05:24:21 +01:00
Eva Hasler
3bfb46d416 separate decoder settings 2012-04-27 04:57:40 +01:00
Eva Hasler
1b0789ca53 fix normalisation and sanity check 2012-04-25 23:48:12 +01:00
Eva Hasler
56bccff657 reduce cache size to 0 to be sure 2012-04-24 20:09:52 +01:00
Eva Hasler
0e7e84f910 fix waiting for bleu files 2012-04-24 05:08:37 +01:00
Eva Hasler
c0e6adb28f Sanity check for hope/fear translations 2012-04-24 05:07:57 +01:00
Eva Hasler
2d4c0c6580 disable caching 2012-04-22 19:15:23 +01:00
Eva Hasler
b85cf551c9 updates to ems 2012-04-13 13:18:35 +01:00
Eva Hasler
2b9c250d36 Merge branch 'miramerge' of thor.inf.ed.ac.uk:/fs/saxnot3/ehasler/mosesdecoder_github_mira into miramerge 2012-04-09 20:49:32 +01:00
Eva Hasler
fdca250516 fix setting sourcePhrase, enable stateless ff for chart, add EvaluateChart to stateless ff, revert glmu to stateless ff, Evaluate gets hypothesis instead of target phrase, swd/twi/wt features implemented for chart (w/o context features) 2012-04-09 20:47:51 +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
Eva Hasler
1e2d9e0695 trim decoder settings to avoid parse errors 2012-04-06 19:42:16 +01:00
Eva Hasler
96642447aa print counts for every epoch 2012-04-03 17:07:15 +01:00
Eva Hasler
9480ab6bad move declaration of output files, separate params --print-feature-counts, --print-nbest-with-features 2012-04-03 15:41:15 +01:00
Eva Hasler
8560a19823 move declaration of output files, separate params --print-feature-counts, --print-nbest-with-features 2012-04-03 15:11:16 +01:00
Eva Hasler
1917a6edf6 count hope and fear features separately 2012-04-03 14:39:45 +01:00
Eva Hasler
9587b7be5b fix cleanup() 2012-04-02 14:31:57 +01:00
Eva Hasler
1b1459283c Implement EvaluateChart for BleuScoreFeature, add mira parameter --avg-ref-length (either shortest or average reference length), clean up CalculateBleu(..), clean up Decoder.cpp 2012-04-01 19:59:00 +01:00
Eva Hasler
0a537a9f58 print feature counts to file 2012-03-29 22:01:17 +01:00
Eva Hasler
03d3cb6a7a adapt Jamfiles, don't output bleu score feature in nbest 2012-03-29 20:58:53 +01:00
Eva Hasler
1fab532bd0 add parameter --print-feature-info 1, start adding megam support.. --megam 2012-03-29 19:44:16 +01:00
Eva Hasler
f5a4d61fd4 resolving conflicts 2012-03-27 14:24:49 +01:00
Eva HASLER
e1cbbb5584 prune zero weights at every mixing step 2012-03-26 20:44:29 +01:00
Eva
6758881357 add pruning options for sparse features 2012-03-26 16:29:58 +01:00
Eva Hasler
80796af3c3 fix small bug in multi-fold training 2012-03-20 17:12:19 +00:00
Eva
95894c107d Merge branch 'miramerge' of thor.inf.ed.ac.uk:/fs/saxnot3/ehasler/mosesdecoder_github_mira into miramerge 2012-03-19 21:50:23 +00:00
Eva
b70ac9cd01 enable multiple cores per fold, 2 2012-03-19 21:50:08 +00:00
Eva
53c7025309 enable multiple cores per fold 2012-03-19 21:47:23 +00:00
Eva Hasler
0bbda749c0 update training script to enable multi-fold training 2012-03-19 19:54:57 +00:00
Eva
3ffc86b4eb change param mixWithoutAveraging to --sparse-no-average, enable training on multiple folds 2012-03-19 16:10:32 +00:00
Eva
4bc3982da7 add parameters --scale-margin-precision, --scale-update-precision 2012-03-18 16:38:13 +00:00
Eva Hasler
4a1e7fd07d fix history Bleu and add parameter --use-source-length-history 2012-03-15 18:43:08 +00:00
Eva Hasler
b681502605 add parameter --mix-without-averaging 2012-03-14 17:59:59 +00:00
Eva
e1601ef154 replace parameter --mix-by-averaging with --sparse-average, fix bug in sharding, fix bug in --dump-mixed-weights 2012-03-13 16:34:48 +00:00
Eva
104bb20882 add parameter --dump-mixed-weights 2012-03-12 21:31:05 +00:00
Eva
0a4521eb13 fix: mixing without averaging 2012-03-12 20:43:21 +00:00
Eva
bdfedb34f2 change history Bleu, add scaling option for sentence Bleu 2012-03-12 19:59:10 +00:00
Eva
fa5df7396d add parameter --mix-by-averaging 2012-03-12 12:36:50 +00:00
Eva
5625a8f026 update partial updates before next update 2012-03-12 10:24:44 +00:00
Eva Hasler
7ac84d5da9 add parameter --batch-equals-shard, --separate-updates 2012-03-11 16:18:42 +00:00
Eva Hasler
0fc9d2511c tempor. change margin normalisation to normalise loss and modelScoreDiff 2012-03-08 19:41:07 +00:00
Eva Hasler
9be5ccaa86 Merge branch 'miramerge' of thor.inf.ed.ac.uk:/fs/saxnot3/ehasler/mosesdecoder_github_mira into miramerge 2012-03-07 17:43:42 +00:00
Eva Hasler
607119cacd add option --scale-by-inverse-length 2012-03-07 17:43:15 +00:00
Eva
1ff4da3d1e enable mpi for hope/fear/model decoding 2012-03-07 09:47:04 +00:00
Eva Hasler
75e388ad1d add parameter --normalise-margin 2012-03-06 18:32:02 +00:00
Eva Hasler
45f04073f4 fix decode-hope/decode-fear 2012-03-05 18:14:13 +00:00
Eva Hasler
d32cf964ba add schemes 6, 7 2012-03-05 15:29:22 +00:00
Eva Hasler
3aa15b7137 add parameter --hope-model 2012-03-05 14:55:46 +00:00
Eva Hasler
9e79b2ea89 add scheme 6 2012-03-05 12:33:46 +00:00
Eva
ba7da1042d specify 5 different update schemes 2012-03-05 00:55:36 +00:00
Eva
eb69065fa5 print features parameters --decode-hope, --decode-fear 2012-03-04 19:50:59 +00:00
Eva Hasler
a65cec2a21 Merge branch 'miramerge' of thor.inf.ed.ac.uk:/fs/saxnot3/ehasler/mosesdecoder_github_mira into miramerge 2012-03-02 12:09:29 +00:00
Eva Hasler
a32278efd9 add option --decode-model 2012-03-02 12:09:22 +00:00
Eva Hasler
c62a61cde9 fix length check 2012-03-01 18:14:15 +00:00
Eva Hasler
36c5946f0d enable nbest hope/fear decoding 2012-03-01 17:42:59 +00:00
Eva Hasler
a8e7f10cad change hope decoding output 2012-03-01 16:09:25 +00:00
Eva Hasler
141dd82c21 Merge branch 'miramerge' of thor.inf.ed.ac.uk:/fs/saxnot3/ehasler/mosesdecoder_github_mira into miramerge 2012-03-01 12:23:36 +00:00
Eva Hasler
b3949c48b9 dont print out weight vectors 2012-03-01 12:23:11 +00:00
Eva Hasler
40135a092f add params --decode-hope, --decode-fear 2012-03-01 12:22:12 +00:00
Eva Hasler
360c5d5d51 dont print out weight vectors 2012-02-29 11:50:17 +00:00
Eva Hasler
75f9d300e9 remove warning.. 2012-02-20 21:22:31 +00:00
Eva Hasler
19f591bb98 add modes 'rank-only' and 'hope-fear-rank' 2012-02-20 20:14:19 +00:00
Eva Hasler
f3daf4fac6 compute model score difference from model scores instead of from feature value difference 2012-02-20 17:27:35 +00:00
Eva Hasler
5e3331311e introduce boost parameter 2012-02-20 15:54:55 +00:00
Eva Hasler
384b7e7598 enable mira learning rate for analytical update 2012-02-19 19:56:16 +00:00