Commit Graph

315 Commits

Author SHA1 Message Date
Barry Haddow
c83166087e Merge branch 'master' into miramerge
Conflicts:
	moses/src/LanguageModel.cpp
	moses/src/TargetPhrase.h
	moses/src/TrellisPath.h
	moses/src/Util.h
	scripts/training/train-model.perl
2011-10-12 17:14:23 +01:00
bhaddow
84d73700af Implementation of Lattice sampling (Chatterjee and Cancedda, emnlp 2010)
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4295 1f5c12ca-751b-0410-a591-d2e778427230
2011-10-04 15:46:24 +00:00
nicolabertoldi
23d9a9b55e normalization of output spaces before and after field separator
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4293 1f5c12ca-751b-0410-a591-d2e778427230
2011-10-03 16:11:39 +00:00
hieuhoang1972
9762a65bd8 xcode
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4264 1f5c12ca-751b-0410-a591-d2e778427230
2011-09-25 10:44:47 +00:00
heafield
19879a8b1e -threads all option
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4252 1f5c12ca-751b-0410-a591-d2e778427230
2011-09-22 22:29:56 +00:00
bhaddow
5b7c5ebdb5 Merge branch 'master' into miramerge
Conflicts:
	moses-chart-cmd/src/Main.cpp
	moses-cmd/src/IOWrapper.cpp
	moses-cmd/src/Main.cpp
	moses/src/DummyScoreProducers.cpp
	moses/src/DummyScoreProducers.h
	moses/src/GenerationDictionary.cpp
	moses/src/GenerationDictionary.h
	moses/src/GlobalLexicalModel.h
	moses/src/LMList.h
	moses/src/LanguageModel.cpp
	moses/src/LanguageModel.h
	moses/src/LanguageModelImplementation.h
	moses/src/LanguageModelKen.h
	moses/src/LanguageModelMultiFactor.cpp
	moses/src/LanguageModelMultiFactor.h
	moses/src/LanguageModelSingleFactor.cpp
	moses/src/LanguageModelSingleFactor.h
	moses/src/LexicalReordering.h
	moses/src/PhraseDictionary.cpp
	moses/src/PhraseDictionary.h
	moses/src/ScoreIndexManager.cpp
	moses/src/ScoreProducer.h
	moses/src/StaticData.cpp
	moses/src/StaticData.h
	moses/src/TranslationSystem.cpp
2011-09-20 11:23:38 +01:00
arianna_b
633b80f515 recovered missing blank in n-best-list output
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4170 1f5c12ca-751b-0410-a591-d2e778427230
2011-09-02 11:40:32 +00:00
nicolabertoldi
75edc2eddd change to print the corrett name of the features with InputScores
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4168 1f5c12ca-751b-0410-a591-d2e778427230
2011-08-30 12:25:50 +00:00
hieuhoang1972
5449839d75 option to sort word alignment info, as suggested by arianna bisazza
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4164 1f5c12ca-751b-0410-a591-d2e778427230
2011-08-26 02:37:52 +00:00
bhaddow
1f3c11b441 Merge branch 'master' into miramerge
Passes all regression except for the score tests, as I still have to merge
in the missing files for these tests.

Conflicts:
	.gitignore
	Makefile.am
	configure.in
	moses-chart/moses-chart.xcodeproj/project.pbxproj
	moses/src/ChartHypothesis.cpp
	moses/src/ChartTranslationOptionCollection.cpp
	moses/src/ChartTrellisPath.cpp
	moses/src/DotChart.cpp
	moses/src/LMList.h
	moses/src/LanguageModel.cpp
	moses/src/LanguageModel.h
	moses/src/LanguageModelFactory.cpp
	moses/src/LanguageModelRemote.h
	moses/src/LexicalReordering.h
	moses/src/Makefile.am
	moses/src/Manager.cpp
	moses/src/Parameter.cpp
	moses/src/RuleCubeQueue.h
	moses/src/ScoreIndexManager.cpp
	moses/src/StaticData.cpp
	moses/src/StaticData.h
	moses/src/TargetPhrase.cpp
	moses/src/TargetPhrase.h
	moses/src/TranslationOptionCollection.cpp
2011-08-22 14:52:02 +01:00
bhaddow
de26a207d6 Merge commit '67dd80fb7bf71f36f2b29b4ba7a39e3ad35e5f81' into miramerge
Conflicts:
	moses-cmd/src/IOWrapper.cpp
	moses-cmd/src/IOWrapper.h
	moses-cmd/src/Main.cpp
	moses-cmd/src/TranslationAnalysis.cpp
2011-08-19 14:55:32 +01:00
bhaddow
cf81f9188f Merged up to 3895 from trunk
git-svn-id: http://svn.statmt.org/repository/mira@3934 cc96ff50-19ce-11e0-b349-13d7f0bd23df
2011-08-18 12:59:38 +02:00
pkoehn
42e10d010b added reporting of sparse features in n-best list
git-svn-id: http://svn.statmt.org/repository/mira@3926 cc96ff50-19ce-11e0-b349-13d7f0bd23df
2011-08-18 12:59:38 +02:00
bhaddow
e664b4a4b3 Merge 3791-3842 from trunk
git-svn-id: http://svn.statmt.org/repository/mira@3873 cc96ff50-19ce-11e0-b349-13d7f0bd23df
2011-08-18 12:59:36 +02:00
hieuhoang1972
b0ec298ce2 vs.net build
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4088 1f5c12ca-751b-0410-a591-d2e778427230
2011-07-23 23:52:34 +00:00
hieuhoang1972
9c0d725cde visual studio 2010
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4079 1f5c12ca-751b-0410-a591-d2e778427230
2011-07-19 03:07:15 +00:00
naditomeh
83d02c11c6 Fix a segmentation fault produced when both 'constraint' and
'translation-details' are used, and no hypothesis that matches the
reference translation is found.
The problem resulted from a missing check if a vector is empty before
incrementing its iterator.


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3950 1f5c12ca-751b-0410-a591-d2e778427230
2011-04-17 19:46:46 +00:00
phkoehn
4ee7e5f673 added some comments
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3911 1f5c12ca-751b-0410-a591-d2e778427230
2011-03-02 19:02:07 +00:00
pjwilliams
75709a6c87 Memory efficiency: make the reserveSize argument non-optional in
Moses::Phrase's constructor.  The default used to be ARRAY_SIZE_INCR = 10,
which will be excessive in many cases.  Where the default was used, I've
set the exact size where that was obvious and explicitly used ARRAY_SIZE_INCR 
otherwise.  If you know the code involved, it's probably worth reviewing.



git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3908 1f5c12ca-751b-0410-a591-d2e778427230
2011-02-28 11:41:08 +00:00
hieuhoang1972
67dd80fb7b run beautify.perl. Consistent formatting for .h & .cpp files
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3897 1f5c12ca-751b-0410-a591-d2e778427230
2011-02-24 12:39:29 +00:00
phkoehn
4c11bcd617 extensions to phrase table scoring options
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3893 1f5c12ca-751b-0410-a591-d2e778427230
2011-02-23 10:27:54 +00:00
bhaddow
6b8415bffb Write alignment info through OutputCollector so it gets ordered
correctly when run with multiple threads.


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3882 1f5c12ca-751b-0410-a591-d2e778427230
2011-02-16 16:50:55 +00:00
ales-t
83e2406f42 Word alignment output also works with MBR decoding.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3875 1f5c12ca-751b-0410-a591-d2e778427230
2011-02-08 17:15:50 +00:00
bojar
0bc0ece594 Ales Tamchyna's printing of alignments (-print-alignment-info did nothing)
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3867 1f5c12ca-751b-0410-a591-d2e778427230
2011-02-03 09:08:42 +00:00
pjwilliams
8051c5ad35 Use TranslationTask objects to perform sentence decoding in moses-chart.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3846 1f5c12ca-751b-0410-a591-d2e778427230
2011-01-25 17:15:30 +00:00
pjwilliams
99bbfe938b Use OutputCollector to write moses-chart output.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3843 1f5c12ca-751b-0410-a591-d2e778427230
2011-01-25 15:17:17 +00:00
bhaddow
a2bde7a16e Make sure internal libraries and paths go before boost.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3800 1f5c12ca-751b-0410-a591-d2e778427230
2011-01-15 22:41:24 +00:00
bhaddow
a9cd71628a Change of boost macros - please make sure you favourite configuration still works
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3799 1f5c12ca-751b-0410-a591-d2e778427230
2011-01-13 23:38:48 +00:00
heafield
a596b48971 Fix --enable-shared compilation.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3796 1f5c12ca-751b-0410-a591-d2e778427230
2011-01-11 19:32:59 +00:00
bhaddow
a2730c445d Merge up to 3791 from trunk.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/branches/mira-mtm5@3792 1f5c12ca-751b-0410-a591-d2e778427230
2011-01-05 13:49:44 +00:00
hieuhoang1972
41c5b3a1c2 xcode
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3769 1f5c12ca-751b-0410-a591-d2e778427230
2010-12-10 13:04:06 +00:00
bhaddow
50f0e6c07d Add a show-weights option. It prints out the moses features and exits. May
load tables as a side-effect.


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3744 1f5c12ca-751b-0410-a591-d2e778427230
2010-11-29 16:44:28 +00:00
xandfraser
c0c617a8c4 Added print word alignment in nbest
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3726 1f5c12ca-751b-0410-a591-d2e778427230
2010-11-22 15:34:53 +00:00
hieuhoang1972
735d5b682f xcode
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3673 1f5c12ca-751b-0410-a591-d2e778427230
2010-10-27 18:54:50 +00:00
hieuhoang1972
34e7c43114 xcode
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3664 1f5c12ca-751b-0410-a591-d2e778427230
2010-10-27 03:14:11 +00:00
hieuhoang1972
5f6baa9021 xcode
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3627 1f5c12ca-751b-0410-a591-d2e778427230
2010-10-18 05:47:07 +00:00
bhaddow
7e72ceea22 Goodbye ScoreIndexManager.
Compiles ok, but haven't dared to run regression yet.


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/branches/mira-mtm5@3608 1f5c12ca-751b-0410-a591-d2e778427230
2010-10-06 22:06:49 +00:00
hieuhoang1972
e504b797b2 xcode
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3599 1f5c12ca-751b-0410-a591-d2e778427230
2010-10-01 00:21:27 +00:00
hieuhoang1972
559a5e3ece ken lm integration
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3570 1f5c12ca-751b-0410-a591-d2e778427230
2010-09-26 22:29:01 +00:00
hieuhoang1972
bdfa2beab8 delete eclipse build
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3422 1f5c12ca-751b-0410-a591-d2e778427230
2010-09-10 09:16:50 +00:00
redpony
570183461c plf checker
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3407 1f5c12ca-751b-0410-a591-d2e778427230
2010-08-16 01:03:39 +00:00
bhaddow
904133fcb7 Merge in the multiple models branch. These changes allow the moses server
to support multiple translation, language and generation models within the
same process. The main design change is the introduction of a TranslationSystem
object to manage the models, which have been moved out of StaticData.
The changes should have no effect on existing systems.


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3394 1f5c12ca-751b-0410-a591-d2e778427230
2010-08-10 13:12:00 +00:00
hieuhoang1972
31930eb6fc alignment info in pt
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3358 1f5c12ca-751b-0410-a591-d2e778427230
2010-07-17 22:29:06 +00:00
hieuhoang1972
65194ba505 drop unknown option for chart decoding, xcode, minor adjustments to regression test formatting
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3312 1f5c12ca-751b-0410-a591-d2e778427230
2010-06-09 12:56:31 +00:00
hieuhoang1972
c9eb463fe6 vs.net
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3301 1f5c12ca-751b-0410-a591-d2e778427230
2010-06-05 13:10:26 +00:00
bhaddow
649bf24f62 One moses main
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3274 1f5c12ca-751b-0410-a591-d2e778427230
2010-05-27 08:37:25 +00:00
bhaddow
f58f8397f4 Correct bug in use of scale factor
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3268 1f5c12ca-751b-0410-a591-d2e778427230
2010-05-25 08:55:13 +00:00
bhaddow
c9baabe2ea Merging of moses mains. mosesmt now does single and multi-threeaded
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3264 1f5c12ca-751b-0410-a591-d2e778427230
2010-05-19 16:42:18 +00:00
dowobeha
9fec69ce31 Merged fix (r3001-3260) for problem where multi-threaded moses would fail during linking if boost was compiled for 64 bit.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3261 1f5c12ca-751b-0410-a591-d2e778427230
2010-05-17 01:41:58 +00:00
bhaddow
bb2431331c Fix to consensus decoding to stop it discarding hypos with zero score.
Move hypothesis id management into Manager to make it thread-safe.


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3257 1f5c12ca-751b-0410-a591-d2e778427230
2010-05-14 09:33:03 +00:00