Commit Graph

149 Commits

Author SHA1 Message Date
Kenneth Heafield
4296e9720b Make Chart's exit behavior consistent with phrase 2012-10-22 11:38:37 +01:00
Barry Haddow
2e1049aee0 fix order in show-weights 2012-10-17 22:16:47 +01:00
Barry Haddow
365e680115 Merge remote-tracking branch 'origin/master' into miramerge
NB Untested

Conflicts:
	Jamroot
	moses-chart-cmd/src/Main.cpp
	moses/src/ChartManager.cpp
	moses/src/RuleTable/LoaderStandard.cpp
	moses/src/RuleTable/PhraseDictionaryALSuffixArray.cpp
	moses/src/Word.cpp
2012-10-15 21:35:56 +01:00
Barry Haddow
61ae24aa5d Merge remote-tracking branch 'origin/master' into miramerge
Conflicts:
	moses/src/PhraseDictionary.cpp
	moses/src/TargetPhrase.cpp
	moses/src/TargetPhrase.h
2012-10-14 14:18:03 +01:00
Kenneth Heafield
e33e0ffd61 It works! 2012-10-12 14:25:39 +01:00
Kenneth Heafield
e75b51bb73 Fix more conflations, update lazy 2012-10-12 14:09:45 +01:00
Kenneth Heafield
3291083be7 Fix some conflations of search algorithm with model 2012-10-12 14:01:10 +01:00
Kenneth Heafield
6f9db664a5 Work Master all the way up to main 2012-10-12 13:53:08 +01:00
Kenneth Heafield
018696367b Remove unused function parameters 2012-10-11 17:11:42 +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
Hieu Hoang
4fd980c386 Merge branch 'master' of github.com:moses-smt/mosesdecoder 2012-10-05 19:13:04 +01:00
Hieu Hoang
c966ca36b1 revert Jacob's change 033fa821ca 2012-10-05 19:12:29 +01:00
Kenneth Heafield
483e6b666b Print usage information before exit 2012-10-05 17:49: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
1ce788e2b8 Fixes for regression tests 2012-09-26 14:40:06 +01:00
Hieu Hoang
a9c890e55e rename CTO to CTOs 2012-09-25 17:34:43 +01:00
Jacob Dlougach
106bad253c Fix compilation warning. 2012-09-24 15:22:30 +04:00
Jacob Dlougach
6e6e731ceb Align unknown word in most simple cases 2012-09-24 15:19:24 +04:00
Jacob Dlougach
033fa821ca Option to print alignment in chart decoder. 2012-09-22 19:09:34 +04:00
Jacob Dlougach
097735469e Refactor output collector so that it can delete the output and debug streams. Very useful if your output can be either cout/cerr or stream. 2012-09-21 17:46:43 +04:00
Barry Haddow
54433bb221 Take notice of calc in t-option flag 2012-09-04 17:50:30 +01:00
Hieu Hoang
97f46537b7 wrap phi's suffix array implementation and extraction method in a wrapper class. Compiles 2012-07-30 21:07:19 +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
027a20730e merge Jamfiles 2012-07-04 11:49:07 +01:00
Hieu Hoang
75e038f4cf create namespace for all classes 2012-07-02 17:05:11 +01:00
Hieu Hoang
85624125ce commented all classes in OnDiskPt and moses-chart-cmd. Leave ken's lm directory 2012-06-28 20:14:45 -04:00
Hieu Hoang
647e320629 commented all classes in OnDiskPt and moses-chart-cmd. Leave ken's lm directory 2012-06-28 20:12:31 -04:00
Colin Cherry
07a5c67ebc Merge branch 'master' into miramerge
Conflicts:
	Jamroot
	misc/queryPhraseTable.cpp
	scripts/training/train-model.perl
2012-06-14 17:08:16 -04:00
Eva Hasler
e1c1a5343c merge 2012-06-07 11:16:52 +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
Hieu Hoang
465c5cbf97 move all executables into bin 2012-05-31 12:55:05 +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
Hieu Hoang
4888e114ed Check factor is not null before outputting 2012-05-17 16:25:53 +01:00
Hieu Hoang
22ca90bd8a Check factor is not null before outputting 2012-05-17 16:25:53 +01:00
Eva Hasler
30deedde9f changed permission, everything changed.. 2012-05-10 18:54:24 +01:00
Christian Federmann
b9b1517e4f Merged in fixes for compiler warnings regarding comparing signed and unsigned integer expressions. 2012-05-10 14:48:51 +02:00
Christian Federmann
4ccab95808 Merged in fixes for compiler warnings regarding comparing signed and unsigned integer expressions. 2012-05-10 14:48:51 +02:00
Eva Hasler
74c2cf3417 fix bug in OutputNBestList 2012-04-11 13:02:23 +01:00
Eva Hasler
56f1101dfc ignore empty input lines 2012-04-07 21:03:30 +01:00
Barry Haddow
5a17ef82b3 Merge remote branch 'github/miramerge' into bjam
Conflicts:
	mira/Decoder.h
	mira/Main.cpp
	mira/Main.h
	moses-chart-cmd/src/IOWrapper.cpp
	moses-chart-cmd/src/Main.cpp
	moses-cmd/src/Main.cpp
	moses/src/BleuScoreFeature.cpp
	moses/src/BleuScoreFeature.h
	moses/src/TargetNgramFeature.h
2012-02-01 10:12:16 +00:00
Phil Williams
039bd5bd4c Create a subdirectory in moses/src for the main CYK+ source files. 2012-01-25 23:14:36 +00:00
Phil Williams
ec9ea87e4d Create a subdirectory in moses/src for the main CYK+ source files. 2012-01-25 23:14:36 +00:00
Phil Williams
d0af7167f8 moses_chart: rule lookup now produces a vector of stack pointers (and a
TargetPhraseCollection pointer) instead of a CYK+ dotted rule.
2012-01-25 12:26:28 +00:00
Phil Williams
72baeab59e moses_chart: rule lookup now produces a vector of stack pointers (and a
TargetPhraseCollection pointer) instead of a CYK+ dotted rule.
2012-01-25 12:26:28 +00:00
Phil Williams
bba1af9f4e Remove obsolete #if HAVE_CONFIG_H directives. 2012-01-23 10:37:35 +00:00
Phil Williams
360113ad6b Remove obsolete #if HAVE_CONFIG_H directives. 2012-01-23 10:37:35 +00:00
Barry Haddow
1e10bb7ef7 Merge from miramerge.
Reverted ChartHypothesis as it breaks chart-decoding.
2012-01-20 15:35:55 +00:00
Eva Hasler
b704381a42 restore order of scores returned by decoder and in nbestlist 2012-01-18 12:26:51 +00:00
Kenneth Heafield
06648fd832 Surround mains in try-catch blocks. 2012-01-13 10:20:42 -05:00
Kenneth Heafield
868255af03 Surround mains in try-catch blocks. 2012-01-13 10:20:42 -05:00