each language model should have separate description, rather than just 'LM'

5 files changed, 21 insertions, 21 deletions

diff --git a/tests/phrase.compresspt/truth/results.txt b/tests/phrase.compresspt/truth/results.txt
index 0185520..2b3c442 100644
--- a/tests/phrase.compresspt/truth/results.txt
+++ b/tests/phrase.compresspt/truth/results.txt
@@ -1,9 +1,9 @@
 TRANSLATION_0=beide Versäumnisse , terroristische Gruppen in Pakistan gestärkt . 
-PTLOAD_TIME ~ 0.038
+PTLOAD_TIME ~ 0.049
 SCORE_0 = -549.862
-TRANSLATION_0_NBEST_1=beide Versäumnisse , terroristische Gruppen in Pakistan gestärkt . ||| LM0= -112.888 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -5.01064 -2.17433 -1.73026 -6.17638 2.99969 ||| -549.862 ||| 0=0 1=1 2=2 3=3 4=4 5-6=5-6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
-TRANSLATION_0_NBEST_2=beide Versäumnisse , terroristische Gruppen in Pakistan gestärkt . ||| LM0= -112.888 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -6.00156 -2.17433 -1.82688 -6.17638 3.99959 ||| -549.88 ||| 0=0 1=1 2=2 3=3 4=4 5=5 6=6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
-TRANSLATION_0_NBEST_3=beide Versäumnisse made terroristische Gruppen in Pakistan gestärkt . ||| LM0= -116.003 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -1.37305 -2.17433 -1.73026 -2.3922 2.99969 ||| -549.936 ||| 0=0 1=1 2=2 3=3 4=4 5-6=5-6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
-TRANSLATION_0_NBEST_4=beide Versäumnisse made terroristische Gruppen in Pakistan gestärkt . ||| LM0= -116.003 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -2.36397 -2.17433 -1.82688 -2.3922 3.99959 ||| -549.953 ||| 0=0 1=1 2=2 3=3 4=4 5=5 6=6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
-TRANSLATION_0_NBEST_5=beide Versäumnisse , terroristische Gruppen in Pakistan . gestärkt ||| LM0= -110.706 Distortion0= -3 WordPenalty0= -9 PhraseModel0= -5.01064 -2.17433 -1.73026 -6.17638 2.99969 ||| -550.572 ||| 0=0 1=1 2=2 3=3 4=4 5-6=5-6 8=7 7=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 8-7 7-8 
+TRANSLATION_0_NBEST_1=beide Versäumnisse , terroristische Gruppen in Pakistan gestärkt . ||| IRSTLM0= -112.888 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -5.01064 -2.17433 -1.73026 -6.17638 2.99969 ||| -549.862 ||| 0=0 1=1 2=2 3=3 4=4 5-6=5-6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
+TRANSLATION_0_NBEST_2=beide Versäumnisse , terroristische Gruppen in Pakistan gestärkt . ||| IRSTLM0= -112.888 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -6.00156 -2.17433 -1.82688 -6.17638 3.99959 ||| -549.88 ||| 0=0 1=1 2=2 3=3 4=4 5=5 6=6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
+TRANSLATION_0_NBEST_3=beide Versäumnisse made terroristische Gruppen in Pakistan gestärkt . ||| IRSTLM0= -116.003 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -1.37305 -2.17433 -1.73026 -2.3922 2.99969 ||| -549.936 ||| 0=0 1=1 2=2 3=3 4=4 5-6=5-6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
+TRANSLATION_0_NBEST_4=beide Versäumnisse made terroristische Gruppen in Pakistan gestärkt . ||| IRSTLM0= -116.003 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -2.36397 -2.17433 -1.82688 -2.3922 3.99959 ||| -549.953 ||| 0=0 1=1 2=2 3=3 4=4 5=5 6=6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
+TRANSLATION_0_NBEST_5=beide Versäumnisse , terroristische Gruppen in Pakistan . gestärkt ||| IRSTLM0= -110.706 Distortion0= -3 WordPenalty0= -9 PhraseModel0= -5.01064 -2.17433 -1.73026 -6.17638 2.99969 ||| -550.572 ||| 0=0 1=1 2=2 3=3 4=4 5-6=5-6 8=7 7=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 8-7 7-8 
 TOTAL_WALLTIME ~ 0
diff --git a/tests/phrase.nbest-multi-factor/truth/results.txt b/tests/phrase.nbest-multi-factor/truth/results.txt
index 31a7e54..c25ce88 100644
--- a/tests/phrase.nbest-multi-factor/truth/results.txt
+++ b/tests/phrase.nbest-multi-factor/truth/results.txt
@@ -1,7 +1,7 @@
 TRANSLATION_0=there are various different opinions . 
-PTLOAD_TIME ~ 2.994
-PTLOAD_TIME ~ 3.015
+PTLOAD_TIME ~ 3.205
+PTLOAD_TIME ~ 4.140
 SCORE_0 = -113.734
-TRANSLATION_0_NBEST_1=there are various different opinions . ||| LM0= -21.6664 Distortion0= 0 Generation0= -0.0625204 -18.098 WordPenalty0= -6 PhraseModel0= -3.46226 -10.822 -2.82666 -9.32004 2.99969 PhraseModel1= -2.44147 -4.91188 -6.12017 -10.5033 2.99969
-TRANSLATION_0_NBEST_2=there are various other opinions . ||| LM0= -25.3276 Distortion0= 0 Generation0= -0.149241 -16.9924 WordPenalty0= -6 PhraseModel0= -1.94591 -10.3833 -0.693147 -7.77959 1.99979 PhraseModel1= -0.924822 -4.91188 -3.33314 -10.5033 1.99979
-TOTAL_WALLTIME ~ 5
+TRANSLATION_0_NBEST_1=there are various different opinions . ||| KENLM0= -21.6664 Distortion0= 0 Generation0= -0.0625204 -18.098 WordPenalty0= -6 PhraseModel0= -3.46226 -10.822 -2.82666 -9.32004 2.99969 PhraseModel1= -2.44147 -4.91188 -6.12017 -10.5033 2.99969
+TRANSLATION_0_NBEST_2=there are various other opinions . ||| KENLM0= -25.3276 Distortion0= 0 Generation0= -0.149241 -16.9924 WordPenalty0= -6 PhraseModel0= -1.94591 -10.3833 -0.693147 -7.77959 1.99979 PhraseModel1= -0.924822 -4.91188 -3.33314 -10.5033 1.99979
+TOTAL_WALLTIME ~ 4
diff --git a/tests/phrase.nbest-with-alignment/truth/results.txt b/tests/phrase.nbest-with-alignment/truth/results.txt
index c2dfe45..18b9bb2 100644
--- a/tests/phrase.nbest-with-alignment/truth/results.txt
+++ b/tests/phrase.nbest-with-alignment/truth/results.txt
@@ -1,9 +1,9 @@
 TRANSLATION_0=beide Versäumnisse , terroristische Gruppen in Pakistan gestärkt . 
-PTLOAD_TIME ~ 0.039
+PTLOAD_TIME ~ 0.041
 SCORE_0 = -549.862
-TRANSLATION_0_NBEST_1=beide Versäumnisse , terroristische Gruppen in Pakistan gestärkt . ||| LM0= -112.888 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -5.01064 -2.17433 -1.73026 -6.17638 2.99969 ||| -549.862 ||| 0=0 1=1 2=2 3=3 4=4 5-6=5-6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
-TRANSLATION_0_NBEST_2=beide Versäumnisse , terroristische Gruppen in Pakistan gestärkt . ||| LM0= -112.888 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -6.00156 -2.17433 -1.82688 -6.17638 3.99959 ||| -549.88 ||| 0=0 1=1 2=2 3=3 4=4 5=5 6=6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
-TRANSLATION_0_NBEST_3=beide Versäumnisse made terroristische Gruppen in Pakistan gestärkt . ||| LM0= -116.003 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -1.37305 -2.17433 -1.73026 -2.3922 2.99969 ||| -549.936 ||| 0=0 1=1 2=2 3=3 4=4 5-6=5-6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
-TRANSLATION_0_NBEST_4=beide Versäumnisse made terroristische Gruppen in Pakistan gestärkt . ||| LM0= -116.003 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -2.36397 -2.17433 -1.82688 -2.3922 3.99959 ||| -549.953 ||| 0=0 1=1 2=2 3=3 4=4 5=5 6=6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
-TRANSLATION_0_NBEST_5=beide Versäumnisse , terroristische Gruppen in Pakistan . gestärkt ||| LM0= -110.706 Distortion0= -3 WordPenalty0= -9 PhraseModel0= -5.01064 -2.17433 -1.73026 -6.17638 2.99969 ||| -550.572 ||| 0=0 1=1 2=2 3=3 4=4 5-6=5-6 8=7 7=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 8-7 7-8 
+TRANSLATION_0_NBEST_1=beide Versäumnisse , terroristische Gruppen in Pakistan gestärkt . ||| IRSTLM0= -112.888 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -5.01064 -2.17433 -1.73026 -6.17638 2.99969 ||| -549.862 ||| 0=0 1=1 2=2 3=3 4=4 5-6=5-6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
+TRANSLATION_0_NBEST_2=beide Versäumnisse , terroristische Gruppen in Pakistan gestärkt . ||| IRSTLM0= -112.888 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -6.00156 -2.17433 -1.82688 -6.17638 3.99959 ||| -549.88 ||| 0=0 1=1 2=2 3=3 4=4 5=5 6=6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
+TRANSLATION_0_NBEST_3=beide Versäumnisse made terroristische Gruppen in Pakistan gestärkt . ||| IRSTLM0= -116.003 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -1.37305 -2.17433 -1.73026 -2.3922 2.99969 ||| -549.936 ||| 0=0 1=1 2=2 3=3 4=4 5-6=5-6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
+TRANSLATION_0_NBEST_4=beide Versäumnisse made terroristische Gruppen in Pakistan gestärkt . ||| IRSTLM0= -116.003 Distortion0= 0 WordPenalty0= -9 PhraseModel0= -2.36397 -2.17433 -1.82688 -2.3922 3.99959 ||| -549.953 ||| 0=0 1=1 2=2 3=3 4=4 5=5 6=6 7=7 8=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 7-7 8-8 
+TRANSLATION_0_NBEST_5=beide Versäumnisse , terroristische Gruppen in Pakistan . gestärkt ||| IRSTLM0= -110.706 Distortion0= -3 WordPenalty0= -9 PhraseModel0= -5.01064 -2.17433 -1.73026 -6.17638 2.99969 ||| -550.572 ||| 0=0 1=1 2=2 3=3 4=4 5-6=5-6 8=7 7=8 ||| 0-0 1-1 2-2 3-3 4-4 5-5 6-6 8-7 7-8 
 TOTAL_WALLTIME ~ 0
diff --git a/tests/phrase.show-weights.lex-reorder/truth/results.txt b/tests/phrase.show-weights.lex-reorder/truth/results.txt
index a4d4b47..9d1ee0d 100644
--- a/tests/phrase.show-weights.lex-reorder/truth/results.txt
+++ b/tests/phrase.show-weights.lex-reorder/truth/results.txt
@@ -1,6 +1,6 @@
-WEIGHT_1=LM0= 0.500000
+WEIGHT_1=KENLM0= 0.500000
 WEIGHT_2=Distortion0= 0.500000
 WEIGHT_3=LexicalReordering0= 0.300000 0.300000 0.300000 0.300000 0.300000 0.300000
 WEIGHT_4=WordPenalty0= -1.000000
 WEIGHT_5=PhraseModel0= 0.200000 0.200000 0.200000 0.200000 0.200000
-TOTAL_WALLTIME ~ 1
+TOTAL_WALLTIME ~ 0
diff --git a/tests/phrase.show-weights/truth/results.txt b/tests/phrase.show-weights/truth/results.txt
index ababf6b..4d0c6ae 100644
--- a/tests/phrase.show-weights/truth/results.txt
+++ b/tests/phrase.show-weights/truth/results.txt
@@ -1,5 +1,5 @@
-WEIGHT_1=LM0= 0.142659
+WEIGHT_1=KENLM0= 0.142659
 WEIGHT_2=Distortion0= 0.141807
 WEIGHT_3=WordPenalty0= -0.273416
 WEIGHT_4=PhraseModel0= 0.004024 0.068565 0.294089 0.032832 -0.042608
-TOTAL_WALLTIME ~ 3
+TOTAL_WALLTIME ~ 4