Commit Graph

373 Commits

Author SHA1 Message Date
Hieu Hoang
065597dc9f only include moses root when compiling 2012-11-14 14:18:53 +00:00
Hieu Hoang
44f24bd673 resolved merge conflicts 2012-11-12 20:35:32 +00:00
Hieu Hoang
5e3ef23cef move moses/src/* to moses/ 2012-11-12 19:56:18 +00:00
Kenneth Heafield
1bae8e1701 Why was mira pulling in IOWrapper? 2012-11-12 18:27:38 +00:00
Kenneth Heafield
d9a09df221 Unbork mira build 2012-11-12 18:15:27 +00:00
Kenneth Heafield
d7ecd0be1a Remove bleu_lib target. 2012-11-07 23:21:59 +01:00
Hieu Hoang
6f7f2cf332 take out debug arg from perl script 2012-10-23 14:53:53 +01:00
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