multimodel(counts): source text in correct language, and table limits for component models

9 files changed, 70 insertions, 77 deletions

diff --git a/tests/phrase.multimodel-binptable/moses.ini b/tests/phrase.multimodel-binptable/moses.ini
index 06b01e9..35de0ef 100644
--- a/tests/phrase.multimodel-binptable/moses.ini
+++ b/tests/phrase.multimodel-binptable/moses.ini
@@ -1,6 +1,5 @@
 # moses.ini for regression test
 
-
 [distortion-limit]
 4
 
@@ -23,16 +22,13 @@ T 2
 UnknownWordPenalty
 WordPenalty
 Distortion
-PhraseDictionaryBinary tuneable=false num-features=5 input-factor=0 output-factor=0 path=${MODEL_PATH}/multimodel/model1/phrase-table.bin
-PhraseDictionaryBinary tuneable=false num-features=5 input-factor=0 output-factor=0 path=${MODEL_PATH}/multimodel/model2/phrase-table.bin
+PhraseDictionaryBinary tuneable=false num-features=5 input-factor=0 output-factor=0 path=${MODEL_PATH}/multimodel/model1/phrase-table.bin table-limit=20
+PhraseDictionaryBinary tuneable=false num-features=5 input-factor=0 output-factor=0 path=${MODEL_PATH}/multimodel/model2/phrase-table.bin table-limit=20
 PhraseDictionaryMultiModel num-features=5 input-factor=0 output-factor=0 table-limit=20 mode=interpolate lambda=0.2,0.8 components=PhraseDictionaryBinary0,PhraseDictionaryBinary1
 
 [weight]
 WordPenalty0= -0.273416114951401
 Distortion0= 0.141806519223522
 PhraseDictionaryMultiModel0= 0.00402447059454402 0.0685647475075862 0.294089113124688 0.0328320356515851 -0.0426081987467227
-PhraseDictionaryBinary0= 1 1 1 1 1
-PhraseDictionaryBinary1= 1 1 1 1 1
-
-
-
+PhraseDictionaryBinary0= 0 0 1 0 0
+PhraseDictionaryBinary1= 0 0 1 0 0
\ No newline at end of file
diff --git a/tests/phrase.multimodel-binptable/to-translate.txt b/tests/phrase.multimodel-binptable/to-translate.txt
index 7693455..2e1f048 100644
--- a/tests/phrase.multimodel-binptable/to-translate.txt
+++ b/tests/phrase.multimodel-binptable/to-translate.txt
@@ -1,7 +1,7 @@
-i declare resumed the session of the european parliament adjourned on thursday 3 february 2000 .
-approval of the minutes of the previous sitting
-the minutes of the sitting on thursday 3 february have been distributed .
-are there any comments ?
-i can see from your reaction that many of the members of parliament have not received the minutes and clearly you cannot approve minutes which you have not seen .
-i therefore propose to submit the minutes for your approval tomorrow morning , since obviously you do not have them and i must apologise for this .
-i shall therefore postpone the approval of the minutes .
\ No newline at end of file
+ich erkläre die am donnerstag , dem 3. februar 2000 , unterbrochene sitzungsperiode des europäischen parlaments für wiederaufgenommen .
+genehmigung des protokolls der vorangegangenen sitzung
+das protokoll der sitzung von donnerstag , dem 3. februar ist verteilt worden .
+gibt es einwände ?
+aus ihrer reaktion schließe ich , daß viele mitglieder des hauses dieses protokoll nicht erhalten haben , und es versteht sich von selbst , daß sie einem protokoll , das sie nicht erhalten haben , nicht zustimmen können .
+ich schlage deshalb vor , das protokoll morgen zu genehmigen , da es ihnen offensichtlich jetzt nicht vorliegt , wofür ich mich entschuldige .
+die genehmigung des protokolls wird somit verschoben .
\ No newline at end of file
diff --git a/tests/phrase.multimodel-binptable/truth/results.txt b/tests/phrase.multimodel-binptable/truth/results.txt
index ad1e6c0..da0190b 100644
--- a/tests/phrase.multimodel-binptable/truth/results.txt
+++ b/tests/phrase.multimodel-binptable/truth/results.txt
@@ -1,13 +1,13 @@
-TRANSLATION_1=i declare resumed the session of the european parliament adjourned on thursday 3 february 2000 . 
-TRANSLATION_2=approval of the minutes of the previous sitting 
-TRANSLATION_3=the minutes of the sitting on thursday 3 february have been distributed . 
+TRANSLATION_1=i erkläre which originated thursday , the 3. february 2000 , unterbrochene part-session of the european parliament adjourned on . 
+TRANSLATION_2=adoption of the minutes of the previous sitting 
+TRANSLATION_3=the minutes for ' s sitting tomorrow thursday , the 3. february 's been distributed been . 
 TRANSLATION_4=are there any comments ? 
-TRANSLATION_5=i can see from your reaction that many of the members of parliament have not received the minutes and clearly you cannot approve minutes which you have not seen . 
-TRANSLATION_6=i therefore propose to submit the minutes for your approval tomorrow morning , since obviously you do not have them and i must apologise for this . 
-SCORE_1 = -1197.531
-SCORE_2 = -797.813
-SCORE_3 = -997.538
-SCORE_4 = -398.719
-SCORE_5 = -2293.913
-SCORE_6 = -1994.631
-TOTAL_WALLTIME ~ 1
+TRANSLATION_5=from their reaktion schließe i , that many members of the when this minutes 't obtain have , and it versteht of that kind to what is from even , that you a minutes , it you 't obtain have , 't zustimmen can . 
+TRANSLATION_6=i schlage so a , it minutes tomorrow to , there it the opportunity to propose to you however , now 't vorliegt , wofür i me entschuldige . 
+SCORE_1 = -301.671
+SCORE_2 = 0.036
+SCORE_3 = -102.520
+SCORE_4 = -0.102
+SCORE_5 = -410.750
+SCORE_6 = -402.951
+TOTAL_WALLTIME ~ 3
diff --git a/tests/phrase.multimodel/moses.ini b/tests/phrase.multimodel/moses.ini
index 8a91d1a..83eca4b 100644
--- a/tests/phrase.multimodel/moses.ini
+++ b/tests/phrase.multimodel/moses.ini
@@ -22,16 +22,13 @@ T 2
 UnknownWordPenalty
 WordPenalty
 Distortion
-PhraseDictionaryMemory tuneable=false num-features=5 input-factor=0 output-factor=0 path=${MODEL_PATH}/multimodel/model1/phrase-table.gz
-PhraseDictionaryMemory tuneable=false num-features=5 input-factor=0 output-factor=0 path=${MODEL_PATH}/multimodel/model2/phrase-table.gz
+PhraseDictionaryMemory tuneable=false num-features=5 input-factor=0 output-factor=0 path=${MODEL_PATH}/multimodel/model1/phrase-table.gz table-limit=20
+PhraseDictionaryMemory tuneable=false num-features=5 input-factor=0 output-factor=0 path=${MODEL_PATH}/multimodel/model2/phrase-table.gz table-limit=20
 PhraseDictionaryMultiModel num-features=5 input-factor=0 output-factor=0 table-limit=20 mode=interpolate lambda=0.2,0.8 components=PhraseDictionaryMemory0,PhraseDictionaryMemory1
 
 [weight]
 WordPenalty0= -0.273416114951401
 Distortion0= 0.141806519223522
 PhraseDictionaryMultiModel0= 0.00402447059454402 0.0685647475075862 0.294089113124688 0.0328320356515851 -0.0426081987467227
-PhraseDictionaryMemory0= 1 1 1 1 1
-PhraseDictionaryMemory1= 1 1 1 1 1
-
-
-
+PhraseDictionaryMemory0= 0 0 1 0 0
+PhraseDictionaryMemory1= 0 0 1 0 0
\ No newline at end of file
diff --git a/tests/phrase.multimodel/to-translate.txt b/tests/phrase.multimodel/to-translate.txt
index 7693455..2e1f048 100644
--- a/tests/phrase.multimodel/to-translate.txt
+++ b/tests/phrase.multimodel/to-translate.txt
@@ -1,7 +1,7 @@
-i declare resumed the session of the european parliament adjourned on thursday 3 february 2000 .
-approval of the minutes of the previous sitting
-the minutes of the sitting on thursday 3 february have been distributed .
-are there any comments ?
-i can see from your reaction that many of the members of parliament have not received the minutes and clearly you cannot approve minutes which you have not seen .
-i therefore propose to submit the minutes for your approval tomorrow morning , since obviously you do not have them and i must apologise for this .
-i shall therefore postpone the approval of the minutes .
\ No newline at end of file
+ich erkläre die am donnerstag , dem 3. februar 2000 , unterbrochene sitzungsperiode des europäischen parlaments für wiederaufgenommen .
+genehmigung des protokolls der vorangegangenen sitzung
+das protokoll der sitzung von donnerstag , dem 3. februar ist verteilt worden .
+gibt es einwände ?
+aus ihrer reaktion schließe ich , daß viele mitglieder des hauses dieses protokoll nicht erhalten haben , und es versteht sich von selbst , daß sie einem protokoll , das sie nicht erhalten haben , nicht zustimmen können .
+ich schlage deshalb vor , das protokoll morgen zu genehmigen , da es ihnen offensichtlich jetzt nicht vorliegt , wofür ich mich entschuldige .
+die genehmigung des protokolls wird somit verschoben .
\ No newline at end of file
diff --git a/tests/phrase.multimodel/truth/results.txt b/tests/phrase.multimodel/truth/results.txt
index ad1e6c0..da0190b 100644
--- a/tests/phrase.multimodel/truth/results.txt
+++ b/tests/phrase.multimodel/truth/results.txt
@@ -1,13 +1,13 @@
-TRANSLATION_1=i declare resumed the session of the european parliament adjourned on thursday 3 february 2000 . 
-TRANSLATION_2=approval of the minutes of the previous sitting 
-TRANSLATION_3=the minutes of the sitting on thursday 3 february have been distributed . 
+TRANSLATION_1=i erkläre which originated thursday , the 3. february 2000 , unterbrochene part-session of the european parliament adjourned on . 
+TRANSLATION_2=adoption of the minutes of the previous sitting 
+TRANSLATION_3=the minutes for ' s sitting tomorrow thursday , the 3. february 's been distributed been . 
 TRANSLATION_4=are there any comments ? 
-TRANSLATION_5=i can see from your reaction that many of the members of parliament have not received the minutes and clearly you cannot approve minutes which you have not seen . 
-TRANSLATION_6=i therefore propose to submit the minutes for your approval tomorrow morning , since obviously you do not have them and i must apologise for this . 
-SCORE_1 = -1197.531
-SCORE_2 = -797.813
-SCORE_3 = -997.538
-SCORE_4 = -398.719
-SCORE_5 = -2293.913
-SCORE_6 = -1994.631
-TOTAL_WALLTIME ~ 1
+TRANSLATION_5=from their reaktion schließe i , that many members of the when this minutes 't obtain have , and it versteht of that kind to what is from even , that you a minutes , it you 't obtain have , 't zustimmen can . 
+TRANSLATION_6=i schlage so a , it minutes tomorrow to , there it the opportunity to propose to you however , now 't vorliegt , wofür i me entschuldige . 
+SCORE_1 = -301.671
+SCORE_2 = 0.036
+SCORE_3 = -102.520
+SCORE_4 = -0.102
+SCORE_5 = -410.750
+SCORE_6 = -402.951
+TOTAL_WALLTIME ~ 3
diff --git a/tests/phrase.multimodelcounts/moses.ini b/tests/phrase.multimodelcounts/moses.ini
index d17a070..aeb866e 100644
--- a/tests/phrase.multimodelcounts/moses.ini
+++ b/tests/phrase.multimodelcounts/moses.ini
@@ -23,8 +23,8 @@ T 4
 UnknownWordPenalty
 WordPenalty
 Distortion
-PhraseDictionaryMemory tuneable=false num-features=3 input-factor=0 output-factor=0 path=${MODEL_PATH}/multimodel/model1/count-table.gz
-PhraseDictionaryMemory tuneable=false num-features=3 input-factor=0 output-factor=0 path=${MODEL_PATH}/multimodel/model2/count-table.gz
+PhraseDictionaryMemory tuneable=false num-features=3 input-factor=0 output-factor=0 path=${MODEL_PATH}/multimodel/model1/count-table.gz table-limit=20
+PhraseDictionaryMemory tuneable=false num-features=3 input-factor=0 output-factor=0 path=${MODEL_PATH}/multimodel/model2/count-table.gz table-limit=20
 
 PhraseDictionaryMemory tuneable=false filterable=false num-features=1 input-factor=0 output-factor=0 path=${MODEL_PATH}/multimodel/model1/count-table-target.gz
 PhraseDictionaryMemory tuneable=false filterable=false num-features=1 input-factor=0 output-factor=0 path=${MODEL_PATH}/multimodel/model2/count-table-target.gz
@@ -36,8 +36,8 @@ WordPenalty0= -0.273416114951401
 Distortion0= 0.141806519223522
 PhraseDictionaryMultiModelCounts0= 0.00402447059454402 0.0685647475075862 0.294089113124688 0.0328320356515851 -0.0426081987467227
 
-PhraseDictionaryMemory0= 1 1 1 
-PhraseDictionaryMemory1= 1 1 1 
-PhraseDictionaryMemory2= 1 
-PhraseDictionaryMemory3= 1
+PhraseDictionaryMemory0= 1 0 0
+PhraseDictionaryMemory1= 1 0 0
+PhraseDictionaryMemory2= 0
+PhraseDictionaryMemory3= 0
 
diff --git a/tests/phrase.multimodelcounts/to-translate.txt b/tests/phrase.multimodelcounts/to-translate.txt
index 7693455..2e1f048 100644
--- a/tests/phrase.multimodelcounts/to-translate.txt
+++ b/tests/phrase.multimodelcounts/to-translate.txt
@@ -1,7 +1,7 @@
-i declare resumed the session of the european parliament adjourned on thursday 3 february 2000 .
-approval of the minutes of the previous sitting
-the minutes of the sitting on thursday 3 february have been distributed .
-are there any comments ?
-i can see from your reaction that many of the members of parliament have not received the minutes and clearly you cannot approve minutes which you have not seen .
-i therefore propose to submit the minutes for your approval tomorrow morning , since obviously you do not have them and i must apologise for this .
-i shall therefore postpone the approval of the minutes .
\ No newline at end of file
+ich erkläre die am donnerstag , dem 3. februar 2000 , unterbrochene sitzungsperiode des europäischen parlaments für wiederaufgenommen .
+genehmigung des protokolls der vorangegangenen sitzung
+das protokoll der sitzung von donnerstag , dem 3. februar ist verteilt worden .
+gibt es einwände ?
+aus ihrer reaktion schließe ich , daß viele mitglieder des hauses dieses protokoll nicht erhalten haben , und es versteht sich von selbst , daß sie einem protokoll , das sie nicht erhalten haben , nicht zustimmen können .
+ich schlage deshalb vor , das protokoll morgen zu genehmigen , da es ihnen offensichtlich jetzt nicht vorliegt , wofür ich mich entschuldige .
+die genehmigung des protokolls wird somit verschoben .
\ No newline at end of file
diff --git a/tests/phrase.multimodelcounts/truth/results.txt b/tests/phrase.multimodelcounts/truth/results.txt
index fe7c24a..d468725 100644
--- a/tests/phrase.multimodelcounts/truth/results.txt
+++ b/tests/phrase.multimodelcounts/truth/results.txt
@@ -1,13 +1,13 @@
-TRANSLATION_1=i declare resumed the session of the european parliament adjourned on thursday 3 february 2000 . 
-TRANSLATION_2=approval of the minutes of the previous sitting 
-TRANSLATION_3=the minutes of the sitting on thursday 3 february have been distributed . 
+TRANSLATION_1=i erkläre the on thursday , the 3. february 2000 , unterbrochene part-session of the european parliament adjourned on . 
+TRANSLATION_2=adoption of the minutes of the previous sitting 
+TRANSLATION_3=the minutes for ' s sitting tomorrow has been set , unfortunately for next , the 3. february is been distributed been . 
 TRANSLATION_4=are there any comments ? 
-TRANSLATION_5=i can see from your reaction that many of the members of parliament have not received the minutes and clearly you cannot approve minutes which you have not seen . 
-TRANSLATION_6=i therefore propose to submit the minutes for your approval tomorrow morning , since obviously you do not have them and i must apologise for this . 
-SCORE_1 = -1196.237
-SCORE_2 = -797.813
-SCORE_3 = -997.015
-SCORE_4 = -398.715
-SCORE_5 = -2294.002
-SCORE_6 = -1994.913
+TRANSLATION_5=are to succeed this state aid code their reaktion schließe , i that many members of the when this minutes not obtain have , and it versteht of that kind to what is of even , that you a minutes , none of this is to they do not obtain have , not zustimmen citizens . 
+TRANSLATION_6=i schlage therefore meps , the minutes tomorrow to , there it the opportunity to propose to you however , not vorliegt , wofür i me entschuldige . 
+SCORE_1 = -299.073
+SCORE_2 = 1.311
+SCORE_3 = -99.917
+SCORE_4 = 0.503
+SCORE_5 = -403.499
+SCORE_6 = -401.264
 TOTAL_WALLTIME ~ 2