Merge github.com:moses-smt/moses-regression-tests

49 files changed, 427 insertions, 1547 deletions

diff --git a/tests/chart.hierarchical-withkenlm/moses.ini b/tests/chart.hierarchical-withkenlm/moses.ini
index 999150d..2289320 100644
--- a/tests/chart.hierarchical-withkenlm/moses.ini
+++ b/tests/chart.hierarchical-withkenlm/moses.ini
@@ -11,44 +11,6 @@
 0 T 0
 1 T 1
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-6 0 0 5 ${MODEL_PATH}/hierarchical/phrase-table.0-0.1
-6 0 0 1 ${MODEL_PATH}/hierarchical/phrase-table.0-0.2
-
-# no generation models, no generation-file section
-
-# language models: type(srilm/irstlm), factors, order, file
-[lmodel-file]
-8 0 3 ${LM_PATH}/news.de.arpalm.gz
-
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-
-
-# language model weights
-[weight-l]
-0.273687
-
-
-# translation model weights
-[weight-t]
-0.077197
-0.014533
-0.059406
-0.001891
--0.098314
-0.131945
-
-# no generation models, no weight-generation section
-
-# word penalty
-[weight-w]
--0.343026
-
 [cube-pruning-pop-limit]
 1000
 
@@ -65,5 +27,17 @@ X
 20
 1000
 
-[weight-d]
-1
+[feature]
+KENLM factor=0 order=3 num-features=1 lazyken=0 path=${LM_PATH}/news.de.arpalm.gz
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/hierarchical/phrase-table.0-0.1 num-features=5 table-limit=20 
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/hierarchical/phrase-table.0-0.2 num-features=1 table-limit=20 
+
+[weight]
+WordPenalty0= -0.148974
+KENLM0= 0.118861
+PhraseDictionaryMemory0= 0.077197 0.014533 0.059406 0.001891 -0.098314
+PhraseDictionaryMemory1= 0.131945
+
+
diff --git a/tests/chart.hierarchical-withsrilm/filter-stderr.pl b/tests/chart.hierarchical-withsrilm/filter-stderr.pl
deleted file mode 100755
index 2f6e176..0000000
--- a/tests/chart.hierarchical-withsrilm/filter-stderr.pl
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/perl
-
-BEGIN { use Cwd qw/ abs_path /; use File::Basename; $script_dir = dirname(abs_path($0)); push @INC, "$script_dir/../perllib"; }
-use RegTestUtils;
-
-$x=0;
-while (<>) {
-  chomp;
-
-  if (/^Finished loading LanguageModels/) {
-    my $time = RegTestUtils::readTime($_);
-    print "LMLOAD_TIME ~ $time\n";
-  }
-  if (/^Finished loading phrase tables/) {
-    my $time = RegTestUtils::readTime($_);
-    print "PTLOAD_TIME ~ $time\n";
-  }
-  next unless /^BEST TRANSLATION:/;
-  my $pscore = RegTestUtils::readHypoScore($_);
-  $x++;
-  print "SCORE_$x = $pscore\n";
-}
diff --git a/tests/chart.hierarchical-withsrilm/filter-stdout.pl b/tests/chart.hierarchical-withsrilm/filter-stdout.pl
deleted file mode 100755
index 476ddf6..0000000
--- a/tests/chart.hierarchical-withsrilm/filter-stdout.pl
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/perl
-$x=0;
-while (<>) {
-  chomp;
-  $x++;
-  print "TRANSLATION_$x=$_\n";
-}
diff --git a/tests/chart.hierarchical-withsrilm/moses.ini b/tests/chart.hierarchical-withsrilm/moses.ini
deleted file mode 100644
index bcc9b2e..0000000
--- a/tests/chart.hierarchical-withsrilm/moses.ini
+++ /dev/null
@@ -1,69 +0,0 @@
-#########################
-### MOSES CONFIG FILE ###
-#########################
-
-# input factors
-[input-factors]
-0
-
-# mapping steps
-[mapping]
-0 T 0
-1 T 1
-
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-6 0 0 5 ${MODEL_PATH}/hierarchical/phrase-table.0-0.1
-6 0 0 1 ${MODEL_PATH}/hierarchical/phrase-table.0-0.2
-
-# no generation models, no generation-file section
-
-# language models: type(srilm/irstlm), factors, order, file
-[lmodel-file]
-8 0 5 ${LM_PATH}/news.de.arpalm.gz
-
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-
-
-# language model weights
-[weight-l]
-0.273687
-
-
-# translation model weights
-[weight-t]
-0.077197
-0.014533
-0.059406
-0.001891
--0.098314
-0.131945
-
-# no generation models, no weight-generation section
-
-# word penalty
-[weight-w]
--0.343026
-
-[cube-pruning-pop-limit]
-1000
-
-[non-terminals]
-X
-
-[search-algorithm]
-3
-
-[inputtype]
-3
-
-[max-chart-span]
-20
-1000
-
-[weight-d]
-1
diff --git a/tests/chart.hierarchical-withsrilm/to-translate.txt b/tests/chart.hierarchical-withsrilm/to-translate.txt
deleted file mode 100644
index 142ac43..0000000
--- a/tests/chart.hierarchical-withsrilm/to-translate.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Prague Stock Market falls to minus by the end of the trading day 
-after a sharp drop in the morning , the Prague Stock Market corrected its losses . 
-transactions with stocks from the Czech Energy Enterprise ( ÄŒEZ ) reached nearly half of the regular daily trading . 
-the Prague Stock Market immediately continued its fall from Monday at the beginning of Tuesday 's trading , when it dropped by nearly six percent . 
-this time the fall in stocks on Wall Street is responsible for the drop . 
diff --git a/tests/chart.hierarchical-withsrilm/truth/results.txt b/tests/chart.hierarchical-withsrilm/truth/results.txt
deleted file mode 100644
index 02f62ad..0000000
--- a/tests/chart.hierarchical-withsrilm/truth/results.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-TRANSLATION_1=Prag Stock Markt fällt , durch das Ende der Handel Tag
-TRANSLATION_2=nach einem steilen Rückgang der Morgen , dem Prager Stock Markt korrigiert ihre Verluste .
-TRANSLATION_3=Transaktionen mit Aktien von der tschechischen Energy Enterprise ( ČEZ ) erreicht beinahe die Hälfte der regelmäßigen täglich Handel .
-TRANSLATION_4=der Prager Stock Markt sofort ihren Sturz von Montag zu Beginn der Handel Tuesday , wenn es um beinahe sechs Prozent .
-TRANSLATION_5=dieses Mal den Rückgang der Aktien an der Wall Street verantwortlich ist für die fallen .
-SCORE_1 = -12.100
-SCORE_2 = -12.344
-SCORE_3 = -116.629
-SCORE_4 = -121.386
-SCORE_5 = -8.128
-TOTAL_WALLTIME ~ 258
diff --git a/tests/chart.hierarchical.ondisk/moses.ini b/tests/chart.hierarchical.ondisk/moses.ini
index 1fdbf78..3d5637b 100644
--- a/tests/chart.hierarchical.ondisk/moses.ini
+++ b/tests/chart.hierarchical.ondisk/moses.ini
@@ -11,44 +11,6 @@
 0 T 0
 1 T 1
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-2 0 0 5 ${MODEL_PATH}/hierarchical/phrase-table.0-0.1.ondisk
-2 0 0 1 ${MODEL_PATH}/hierarchical/phrase-table.0-0.2.ondisk
-
-# no generation models, no generation-file section
-
-# language models: type(srilm/irstlm), factors, order, file
-[lmodel-file]
-1 0 5 ${LM_PATH}/news.de.binlm
-
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-
-
-# language model weights
-[weight-l]
-0.273687
-
-
-# translation model weights
-[weight-t]
-0.077197
-0.014533
-0.059406
-0.001891
--0.098314
-0.131945
-
-# no generation models, no weight-generation section
-
-# word penalty
-[weight-w]
--0.343026
-
 [cube-pruning-pop-limit]
 1000
 
@@ -65,5 +27,17 @@ X
 20
 1000
 
-[weight-d]
-1
+[feature]
+IRSTLM factor=0 order=5 num-features=1 path=${LM_PATH}/news.de.binlm
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryOnDisk input-factor=0 output-factor=0 path=${MODEL_PATH}/hierarchical/phrase-table.0-0.1.ondisk num-features=5 table-limit=20 
+PhraseDictionaryOnDisk input-factor=0 output-factor=0 path=${MODEL_PATH}/hierarchical/phrase-table.0-0.2.ondisk num-features=1 table-limit=20 
+
+[weight]
+WordPenalty0= -0.148974
+IRSTLM0= 0.118861
+PhraseDictionaryOnDisk0= 0.077197 0.014533 0.059406 0.001891 -0.098314
+PhraseDictionaryOnDisk1= 0.131945
+
+
diff --git a/tests/chart.hierarchical/moses.ini b/tests/chart.hierarchical/moses.ini
index 9d6edec..c462a2c 100644
--- a/tests/chart.hierarchical/moses.ini
+++ b/tests/chart.hierarchical/moses.ini
@@ -11,44 +11,6 @@
 0 T 0
 1 T 1
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-6 0 0 5 ${MODEL_PATH}/hierarchical/phrase-table.0-0.1
-6 0 0 1 ${MODEL_PATH}/hierarchical/phrase-table.0-0.2
-
-# no generation models, no generation-file section
-
-# language models: type(srilm/irstlm), factors, order, file
-[lmodel-file]
-1 0 5 ${LM_PATH}/news.de.binlm
-
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-
-
-# language model weights
-[weight-l]
-0.273687
-
-
-# translation model weights
-[weight-t]
-0.077197
-0.014533
-0.059406
-0.001891
--0.098314
-0.131945
-
-# no generation models, no weight-generation section
-
-# word penalty
-[weight-w]
--0.343026
-
 [cube-pruning-pop-limit]
 1000
 
@@ -65,5 +27,17 @@ X
 20
 1000
 
-[weight-d]
-1
+[feature]
+IRSTLM factor=0 order=5 num-features=1 path=${LM_PATH}/news.de.binlm
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/hierarchical/phrase-table.0-0.1 num-features=5 table-limit=20 
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/hierarchical/phrase-table.0-0.2 num-features=1 table-limit=20 
+
+[weight]
+WordPenalty0= -0.148974
+IRSTLM0= 0.118861
+PhraseDictionaryMemory0= 0.077197 0.014533 0.059406 0.001891 -0.098314
+PhraseDictionaryMemory1= 0.131945
+
+
diff --git a/tests/chart.nbest-with-alignment/moses.ini b/tests/chart.nbest-with-alignment/moses.ini
index e706ed3..b2ed9ce 100644
--- a/tests/chart.nbest-with-alignment/moses.ini
+++ b/tests/chart.nbest-with-alignment/moses.ini
@@ -11,44 +11,6 @@
 0 T 0
 1 T 1
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-6 0 0 5 ${MODEL_PATH}/hierarchical/phrase-table.0-0.1
-6 0 0 1 ${MODEL_PATH}/hierarchical/phrase-table.0-0.2
-
-# no generation models, no generation-file section
-
-# language models: type(srilm/irstlm), factors, order, file
-[lmodel-file]
-1 0 5 ${LM_PATH}/news.de.binlm
-
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-
-
-# language model weights
-[weight-l]
-0.273687
-
-
-# translation model weights
-[weight-t]
-0.077197
-0.014533
-0.059406
-0.001891
--0.098314
-0.131945
-
-# no generation models, no weight-generation section
-
-# word penalty
-[weight-w]
--0.343026
-
 [cube-pruning-pop-limit]
 1000
 
@@ -65,11 +27,21 @@ X
 20
 1000
 
-[weight-d]
-1
-
 [n-best-list]
 nbest
 5
 
+[feature]
+IRSTLM factor=0 order=5 num-features=1 path=${LM_PATH}/news.de.binlm
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/hierarchical/phrase-table.0-0.1 num-features=5 table-limit=20 
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/hierarchical/phrase-table.0-0.2 num-features=1 table-limit=20 
+
+[weight]
+WordPenalty0= -0.148974
+IRSTLM0= 0.118861
+PhraseDictionaryMemory0= 0.077197 0.014533 0.059406 0.001891 -0.098314
+PhraseDictionaryMemory1= 0.131945
+
 
diff --git a/tests/chart.show-weights.target-syntax/moses.ini b/tests/chart.show-weights.target-syntax/moses.ini
index 3ae39c7..ed87c7e 100644
--- a/tests/chart.show-weights.target-syntax/moses.ini
+++ b/tests/chart.show-weights.target-syntax/moses.ini
@@ -11,44 +11,6 @@
 0 T 0
 1 T 1
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-2 0 0 5 ${MODEL_PATH}/target-syntax/phrase-table.0-0.1.ondisk
-2 0 0 1 ${MODEL_PATH}/target-syntax/phrase-table.0-0.2.ondisk
-
-# no generation models, no generation-file section
-
-# language models: type(srilm/irstlm), factors, order, file
-[lmodel-file]
-1 0 5 ${LM_PATH}/news.de.binlm
-
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-
-
-# language model weights
-[weight-l]
-0.210707
-
-
-# translation model weights
-[weight-t]
-0.067170
-0.024389
-0.013606
-0.024433
--0.103362
-0.017807
-
-# no generation models, no weight-generation section
-
-# word penalty
-[weight-w]
--0.538526
-
 [cube-pruning-pop-limit]
 1000
 
@@ -65,8 +27,20 @@ X
 20
 1000
 
-[weight-d]
-1
-
 [show-weights]
 1
+
+[feature]
+IRSTLM factor=0 order=5 num-features=1 path=${LM_PATH}/news.de.binlm
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryOnDisk input-factor=0 output-factor=0 path=${MODEL_PATH}/target-syntax/phrase-table.0-0.1.ondisk num-features=5 table-limit=20 
+PhraseDictionaryOnDisk input-factor=0 output-factor=0 path=${MODEL_PATH}/target-syntax/phrase-table.0-0.2.ondisk num-features=1 table-limit=20 
+
+
+[weight]
+WordPenalty0= -0.233879
+IRSTLM0= 0.0915089
+PhraseDictionaryOnDisk0= 0.06717 0.024389 0.013606 0.024433 -0.103362
+PhraseDictionaryOnDisk1= 0.017807
+
diff --git a/tests/chart.target-syntax.ondisk/moses.ini b/tests/chart.target-syntax.ondisk/moses.ini
index 0e40974..4f64be3 100644
--- a/tests/chart.target-syntax.ondisk/moses.ini
+++ b/tests/chart.target-syntax.ondisk/moses.ini
@@ -11,44 +11,6 @@
 0 T 0
 1 T 1
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-2 0 0 5 ${MODEL_PATH}/target-syntax/phrase-table.0-0.1.ondisk
-2 0 0 1 ${MODEL_PATH}/target-syntax/phrase-table.0-0.2.ondisk
-
-# no generation models, no generation-file section
-
-# language models: type(srilm/irstlm), factors, order, file
-[lmodel-file]
-8 0 5 ${LM_PATH}/news.de.arpalm.gz
-
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-
-
-# language model weights
-[weight-l]
-0.210707
-
-
-# translation model weights
-[weight-t]
-0.067170
-0.024389
-0.013606
-0.024433
--0.103362
-0.017807
-
-# no generation models, no weight-generation section
-
-# word penalty
-[weight-w]
--0.538526
-
 [cube-pruning-pop-limit]
 1000
 
@@ -65,5 +27,17 @@ X
 20
 1000
 
-[weight-d]
-1
+[feature]
+KENLM factor=0 order=5 num-features=1 lazyken=0 path=${LM_PATH}/news.de.arpalm.gz
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryOnDisk input-factor=0 output-factor=0 path=${MODEL_PATH}/target-syntax/phrase-table.0-0.1.ondisk num-features=5 table-limit=20 
+PhraseDictionaryOnDisk input-factor=0 output-factor=0 path=${MODEL_PATH}/target-syntax/phrase-table.0-0.2.ondisk num-features=1 table-limit=20 
+
+[weight]
+WordPenalty0= -0.233879
+KENLM0= 0.0915089
+PhraseDictionaryOnDisk0= 0.06717 0.024389 0.013606 0.024433 -0.103362
+PhraseDictionaryOnDisk1= 0.017807
+
+
diff --git a/tests/chart.target-syntax/moses.ini b/tests/chart.target-syntax/moses.ini
index 81f4e39..b1dfc14 100644
--- a/tests/chart.target-syntax/moses.ini
+++ b/tests/chart.target-syntax/moses.ini
@@ -11,44 +11,6 @@
 0 T 0
 1 T 1
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-6 0 0 5 ${MODEL_PATH}/target-syntax/phrase-table.0-0.1
-6 0 0 1 ${MODEL_PATH}/target-syntax/phrase-table.0-0.2
-
-# no generation models, no generation-file section
-
-# language models: type(srilm/irstlm), factors, order, file
-[lmodel-file]
-8 0 5 ${LM_PATH}/news.de.arpalm.gz
-
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-
-
-# language model weights
-[weight-l]
-0.210707
-
-
-# translation model weights
-[weight-t]
-0.067170
-0.024389
-0.013606
-0.024433
--0.103362
-0.017807
-
-# no generation models, no weight-generation section
-
-# word penalty
-[weight-w]
--0.538526
-
 [cube-pruning-pop-limit]
 1000
 
@@ -65,5 +27,16 @@ X
 20
 1000
 
-[weight-d]
-1
+[feature]
+KENLM factor=0 order=5 num-features=1 lazyken=0 path=${LM_PATH}/news.de.arpalm.gz
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/target-syntax/phrase-table.0-0.1 num-features=5 table-limit=20 
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/target-syntax/phrase-table.0-0.2 num-features=1 table-limit=20 
+
+[weight]
+WordPenalty0= -0.233879
+KENLM0= 0.0915089
+PhraseDictionaryMemory0= 0.06717 0.024389 0.013606 0.024433 -0.103362
+PhraseDictionaryMemory1= 0.017807
+
diff --git a/tests/phrase.basic-lm-oov-withkenlm/filter-stderr.pl b/tests/phrase.basic-lm-oov-withkenlm/filter-stderr.pl
deleted file mode 100755
index 2f6e176..0000000
--- a/tests/phrase.basic-lm-oov-withkenlm/filter-stderr.pl
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/perl
-
-BEGIN { use Cwd qw/ abs_path /; use File::Basename; $script_dir = dirname(abs_path($0)); push @INC, "$script_dir/../perllib"; }
-use RegTestUtils;
-
-$x=0;
-while (<>) {
-  chomp;
-
-  if (/^Finished loading LanguageModels/) {
-    my $time = RegTestUtils::readTime($_);
-    print "LMLOAD_TIME ~ $time\n";
-  }
-  if (/^Finished loading phrase tables/) {
-    my $time = RegTestUtils::readTime($_);
-    print "PTLOAD_TIME ~ $time\n";
-  }
-  next unless /^BEST TRANSLATION:/;
-  my $pscore = RegTestUtils::readHypoScore($_);
-  $x++;
-  print "SCORE_$x = $pscore\n";
-}
diff --git a/tests/phrase.basic-lm-oov-withkenlm/filter-stdout.pl b/tests/phrase.basic-lm-oov-withkenlm/filter-stdout.pl
deleted file mode 100755
index 476ddf6..0000000
--- a/tests/phrase.basic-lm-oov-withkenlm/filter-stdout.pl
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/perl
-$x=0;
-while (<>) {
-  chomp;
-  $x++;
-  print "TRANSLATION_$x=$_\n";
-}
diff --git a/tests/phrase.basic-lm-oov-withkenlm/moses.ini b/tests/phrase.basic-lm-oov-withkenlm/moses.ini
deleted file mode 100644
index 3c25585..0000000
--- a/tests/phrase.basic-lm-oov-withkenlm/moses.ini
+++ /dev/null
@@ -1,53 +0,0 @@
-# moses.ini for regression test
-
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/basic-surface-only/phrase-table.gz
-
-# language model
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-# limit on how many phrase translations e for each phrase f are loaded
-[ttable-limit]
-#ttable element load limit 0 = all elements loaded
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.141806519223522
-
-# language model weight
-[weight-l]
-0.142658800199951
-0.1
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.00402447059454402
-0.0685647475075862
-0.294089113124688
-0.0328320356515851
--0.0426081987467227
-
-# word penalty
-[weight-w]
--0.273416114951401
-
-[distortion-limit]
-4
-
-[beam-threshold]
-0.03
-
-[input-factors]
-0
-
-[mapping]
-T 0
-
-[lmodel-oov-feature]
-1
-
-
-[verbose]
-2
-
diff --git a/tests/phrase.basic-lm-oov-withkenlm/to-translate.txt b/tests/phrase.basic-lm-oov-withkenlm/to-translate.txt
deleted file mode 100644
index a505702..0000000
--- a/tests/phrase.basic-lm-oov-withkenlm/to-translate.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-ich frage sie also , herr präsident : stellen die unterschiedlichen arbeitskosten somit nicht auch eine beschränkung des freien wettbewerbs in der europäischen union dar ?
-schaut man sich die fälligkeitspläne der ausführung des haushalts für die rubriken 2 , 3 , 4 und 7 an , stellt man fest , dass nur durchschnittlich 8 % aller verpflichtungen durch zahlungen gedeckt sind .
-vor drei jahren haben wir mit unserer beschäftigungsinitiative begonnen , indem wir kleinen und mittleren unternehmen halfen , chancenkapital zu bekommen .
-das parlament will das auf zweierlei weise tun .
-nur dann werden die europäischen institutionen auch ihrem auftrag gerecht .
diff --git a/tests/phrase.basic-lm-oov-withkenlm/truth/results.txt b/tests/phrase.basic-lm-oov-withkenlm/truth/results.txt
deleted file mode 100644
index b3b2e17..0000000
--- a/tests/phrase.basic-lm-oov-withkenlm/truth/results.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-TRANSLATION_1=i ask you , therefore , mr president , the different labour costs are therefore not a restriction of free competition in the european union ? 
-TRANSLATION_2=if we look at the fälligkeitspläne the implementation of the budget for the categories 2 , 3 , 4 and 7 to , we see that only an average of 8 % of commitments by payments are met . 
-TRANSLATION_3=three years ago our employment strategy , we started by small and medium-sized enterprises , halfen chancenkapital to obtain . 
-TRANSLATION_4=parliament wants the in two ways . 
-TRANSLATION_5=only then will the european institutions to its mandate . 
-SCORE_1 = -14.843
-SCORE_2 = -152.932
-SCORE_3 = -277.957
-SCORE_4 = -5.995
-SCORE_5 = -7.015
-TOTAL_WALLTIME ~ 8
diff --git a/tests/phrase.basic-lm-oov/moses.ini b/tests/phrase.basic-lm-oov/moses.ini
index 3c25585..e4add1c 100644
--- a/tests/phrase.basic-lm-oov/moses.ini
+++ b/tests/phrase.basic-lm-oov/moses.ini
@@ -1,37 +1,5 @@
 # moses.ini for regression test
 
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/basic-surface-only/phrase-table.gz
-
-# language model
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-# limit on how many phrase translations e for each phrase f are loaded
-[ttable-limit]
-#ttable element load limit 0 = all elements loaded
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.141806519223522
-
-# language model weight
-[weight-l]
-0.142658800199951
-0.1
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.00402447059454402
-0.0685647475075862
-0.294089113124688
-0.0328320356515851
--0.0426081987467227
-
-# word penalty
-[weight-w]
--0.273416114951401
-
 [distortion-limit]
 4
 
@@ -51,3 +19,18 @@ T 0
 [verbose]
 2
 
+
+[feature]
+KENLM factor=0 order=3 num-features=2 lazyken=0 path=${LM_PATH}/europarl.en.srilm.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/basic-surface-only/phrase-table.gz num-features=5 table-limit=20 
+
+
+[weight]
+WordPenalty0= -0.273416
+KENLM0= 0.142659 0.1
+Distortion0= 0.141807
+PhraseDictionaryMemory0= 0.00402447 0.0685648 0.294089 0.032832 -0.0426082
+
diff --git a/tests/phrase.basic-surface-binptable/moses.ini b/tests/phrase.basic-surface-binptable/moses.ini
index cedc536..a3e6c30 100644
--- a/tests/phrase.basic-surface-binptable/moses.ini
+++ b/tests/phrase.basic-surface-binptable/moses.ini
@@ -5,39 +5,6 @@
 ### PHARAOH CONFIG FILE ###
 ###########################
 
-# phrase table f, n, p(n|f)
-[ttable-file]
-1 0 0 5 ${MODEL_PATH}/basic-surface-binptable/phrase-table.gz
-
-# language model
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-
-# limit on how many phrase translations e for each phrase f are loaded
-[ttable-limit]
-#ttable element load limit 0 = all elements loaded
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.141806519223522
-
-# language model weight
-[weight-l]
-0.142658800199951
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.00402447059454402
-0.0685647475075862
-0.294089113124688
-0.0328320356515851
--0.0426081987467227
-
-# word penalty
-[weight-w]
--0.273416114951401
-
 [distortion-limit]
 4
 
@@ -54,3 +21,17 @@ T 0
 [verbose]
 2
 
+[feature]
+KENLM factor=0 order=3 num-features=1 lazyken=0 path=${LM_PATH}/europarl.en.srilm.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryBinary input-factor=0 output-factor=0 path=${MODEL_PATH}/basic-surface-binptable/phrase-table.gz num-features=5 table-limit=20 
+
+[weight]
+WordPenalty0= -0.273416
+KENLM0= 0.142659
+Distortion0= 0.141807
+PhraseDictionaryBinary0= 0.00402447 0.0685648 0.294089 0.032832 -0.0426082
+
+
diff --git a/tests/phrase.basic-surface-only-withirstlm-binlm/moses.ini b/tests/phrase.basic-surface-only-withirstlm-binlm/moses.ini
index 271b8b3..6727b4a 100644
--- a/tests/phrase.basic-surface-only-withirstlm-binlm/moses.ini
+++ b/tests/phrase.basic-surface-only-withirstlm-binlm/moses.ini
@@ -1,36 +1,5 @@
 # moses.ini for regression test
 
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/basic-surface-only/phrase-table.gz
-
-# language model
-[lmodel-file]
-1 0 3 ${LM_PATH}/europarl.en.binlm
-# limit on how many phrase translations e for each phrase f are loaded
-[ttable-limit]
-#ttable element load limit 0 = all elements loaded
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.141806519223522
-
-# language model weight
-[weight-l]
-0.142658800199951
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.00402447059454402
-0.0685647475075862
-0.294089113124688
-0.0328320356515851
--0.0426081987467227
-
-# word penalty
-[weight-w]
--0.273416114951401
-
 [distortion-limit]
 4
 
@@ -47,3 +16,16 @@ T 0
 [verbose]
 2
 
+[feature]
+IRSTLM factor=0 order=3 num-features=1 path=${LM_PATH}/europarl.en.binlm
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/basic-surface-only/phrase-table.gz num-features=5 table-limit=20 
+
+[weight]
+WordPenalty0= -0.273416
+IRSTLM0= 0.142659
+Distortion0= 0.141807
+PhraseDictionaryMemory0= 0.00402447 0.0685648 0.294089 0.032832 -0.0426082
+
diff --git a/tests/phrase.basic-surface-only-withirstlm/moses.ini b/tests/phrase.basic-surface-only-withirstlm/moses.ini
index f4c6fee..f563174 100644
--- a/tests/phrase.basic-surface-only-withirstlm/moses.ini
+++ b/tests/phrase.basic-surface-only-withirstlm/moses.ini
@@ -1,36 +1,5 @@
 # moses.ini for regression test
 
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/basic-surface-only/phrase-table.gz
-
-# language model
-[lmodel-file]
-1 0 3 ${LM_PATH}/europarl.en.srilm.gz
-# limit on how many phrase translations e for each phrase f are loaded
-[ttable-limit]
-#ttable element load limit 0 = all elements loaded
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.141806519223522
-
-# language model weight
-[weight-l]
-0.142658800199951
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.00402447059454402
-0.0685647475075862
-0.294089113124688
-0.0328320356515851
--0.0426081987467227
-
-# word penalty
-[weight-w]
--0.273416114951401
-
 [distortion-limit]
 4
 
@@ -47,3 +16,17 @@ T 0
 [verbose]
 2
 
+[feature]
+IRSTLM factor=0 order=3 num-features=1 path=${LM_PATH}/europarl.en.srilm.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/basic-surface-only/phrase-table.gz num-features=5 table-limit=20 
+
+[weight]
+WordPenalty0= -0.273416
+IRSTLM0= 0.142659
+Distortion0= 0.141807
+PhraseDictionaryMemory0= 0.00402447 0.0685648 0.294089 0.032832 -0.0426082
+
+
diff --git a/tests/phrase.basic-surface-only-withkenlm.bin/filter-stderr.pl b/tests/phrase.basic-surface-only-withkenlm.bin/filter-stderr.pl
deleted file mode 100755
index 2f6e176..0000000
--- a/tests/phrase.basic-surface-only-withkenlm.bin/filter-stderr.pl
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/perl
-
-BEGIN { use Cwd qw/ abs_path /; use File::Basename; $script_dir = dirname(abs_path($0)); push @INC, "$script_dir/../perllib"; }
-use RegTestUtils;
-
-$x=0;
-while (<>) {
-  chomp;
-
-  if (/^Finished loading LanguageModels/) {
-    my $time = RegTestUtils::readTime($_);
-    print "LMLOAD_TIME ~ $time\n";
-  }
-  if (/^Finished loading phrase tables/) {
-    my $time = RegTestUtils::readTime($_);
-    print "PTLOAD_TIME ~ $time\n";
-  }
-  next unless /^BEST TRANSLATION:/;
-  my $pscore = RegTestUtils::readHypoScore($_);
-  $x++;
-  print "SCORE_$x = $pscore\n";
-}
diff --git a/tests/phrase.basic-surface-only-withkenlm.bin/filter-stdout.pl b/tests/phrase.basic-surface-only-withkenlm.bin/filter-stdout.pl
deleted file mode 100755
index 476ddf6..0000000
--- a/tests/phrase.basic-surface-only-withkenlm.bin/filter-stdout.pl
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/perl
-$x=0;
-while (<>) {
-  chomp;
-  $x++;
-  print "TRANSLATION_$x=$_\n";
-}
diff --git a/tests/phrase.basic-surface-only-withkenlm.bin/moses.ini b/tests/phrase.basic-surface-only-withkenlm.bin/moses.ini
deleted file mode 100644
index 25bd271..0000000
--- a/tests/phrase.basic-surface-only-withkenlm.bin/moses.ini
+++ /dev/null
@@ -1,49 +0,0 @@
-# moses.ini for regression test
-
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/basic-surface-only/phrase-table.gz
-
-# language model
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-# limit on how many phrase translations e for each phrase f are loaded
-[ttable-limit]
-#ttable element load limit 0 = all elements loaded
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.141806519223522
-
-# language model weight
-[weight-l]
-0.142658800199951
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.00402447059454402
-0.0685647475075862
-0.294089113124688
-0.0328320356515851
--0.0426081987467227
-
-# word penalty
-[weight-w]
--0.273416114951401
-
-[distortion-limit]
-4
-
-[beam-threshold]
-0.03
-
-[input-factors]
-0
-
-[mapping]
-T 0
-
-
-[verbose]
-2
-
diff --git a/tests/phrase.basic-surface-only-withkenlm.bin/to-translate.txt b/tests/phrase.basic-surface-only-withkenlm.bin/to-translate.txt
deleted file mode 100644
index a505702..0000000
--- a/tests/phrase.basic-surface-only-withkenlm.bin/to-translate.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-ich frage sie also , herr präsident : stellen die unterschiedlichen arbeitskosten somit nicht auch eine beschränkung des freien wettbewerbs in der europäischen union dar ?
-schaut man sich die fälligkeitspläne der ausführung des haushalts für die rubriken 2 , 3 , 4 und 7 an , stellt man fest , dass nur durchschnittlich 8 % aller verpflichtungen durch zahlungen gedeckt sind .
-vor drei jahren haben wir mit unserer beschäftigungsinitiative begonnen , indem wir kleinen und mittleren unternehmen halfen , chancenkapital zu bekommen .
-das parlament will das auf zweierlei weise tun .
-nur dann werden die europäischen institutionen auch ihrem auftrag gerecht .
diff --git a/tests/phrase.basic-surface-only-withkenlm.bin/truth/results.txt b/tests/phrase.basic-surface-only-withkenlm.bin/truth/results.txt
deleted file mode 100644
index faf5eaf..0000000
--- a/tests/phrase.basic-surface-only-withkenlm.bin/truth/results.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-TRANSLATION_1=i ask you , therefore , mr president , the different labour costs are therefore not a restriction of free competition in the european union ? 
-TRANSLATION_2=if we look at the fälligkeitspläne the implementation of the budget for the categories 2 , 3 , 4 and 7 to , we see that only an average of 8 % of commitments by payments are met . 
-TRANSLATION_3=three years ago our employment strategy , we started by small and medium-sized enterprises , halfen chancenkapital to obtain . 
-TRANSLATION_4=parliament wants the in two ways . 
-TRANSLATION_5=only then will the european institutions to its mandate . 
-SCORE_1 = -14.843
-SCORE_2 = -153.032
-SCORE_3 = -278.157
-SCORE_4 = -5.995
-SCORE_5 = -7.015
-TOTAL_WALLTIME ~ 13
diff --git a/tests/phrase.basic-surface-only-withkenlm/filter-stderr.pl b/tests/phrase.basic-surface-only-withkenlm/filter-stderr.pl
deleted file mode 100755
index 2f6e176..0000000
--- a/tests/phrase.basic-surface-only-withkenlm/filter-stderr.pl
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/perl
-
-BEGIN { use Cwd qw/ abs_path /; use File::Basename; $script_dir = dirname(abs_path($0)); push @INC, "$script_dir/../perllib"; }
-use RegTestUtils;
-
-$x=0;
-while (<>) {
-  chomp;
-
-  if (/^Finished loading LanguageModels/) {
-    my $time = RegTestUtils::readTime($_);
-    print "LMLOAD_TIME ~ $time\n";
-  }
-  if (/^Finished loading phrase tables/) {
-    my $time = RegTestUtils::readTime($_);
-    print "PTLOAD_TIME ~ $time\n";
-  }
-  next unless /^BEST TRANSLATION:/;
-  my $pscore = RegTestUtils::readHypoScore($_);
-  $x++;
-  print "SCORE_$x = $pscore\n";
-}
diff --git a/tests/phrase.basic-surface-only-withkenlm/filter-stdout.pl b/tests/phrase.basic-surface-only-withkenlm/filter-stdout.pl
deleted file mode 100755
index 476ddf6..0000000
--- a/tests/phrase.basic-surface-only-withkenlm/filter-stdout.pl
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/perl
-$x=0;
-while (<>) {
-  chomp;
-  $x++;
-  print "TRANSLATION_$x=$_\n";
-}
diff --git a/tests/phrase.basic-surface-only-withkenlm/moses.ini b/tests/phrase.basic-surface-only-withkenlm/moses.ini
deleted file mode 100644
index 25bd271..0000000
--- a/tests/phrase.basic-surface-only-withkenlm/moses.ini
+++ /dev/null
@@ -1,49 +0,0 @@
-# moses.ini for regression test
-
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/basic-surface-only/phrase-table.gz
-
-# language model
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-# limit on how many phrase translations e for each phrase f are loaded
-[ttable-limit]
-#ttable element load limit 0 = all elements loaded
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.141806519223522
-
-# language model weight
-[weight-l]
-0.142658800199951
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.00402447059454402
-0.0685647475075862
-0.294089113124688
-0.0328320356515851
--0.0426081987467227
-
-# word penalty
-[weight-w]
--0.273416114951401
-
-[distortion-limit]
-4
-
-[beam-threshold]
-0.03
-
-[input-factors]
-0
-
-[mapping]
-T 0
-
-
-[verbose]
-2
-
diff --git a/tests/phrase.basic-surface-only-withkenlm/to-translate.txt b/tests/phrase.basic-surface-only-withkenlm/to-translate.txt
deleted file mode 100644
index a505702..0000000
--- a/tests/phrase.basic-surface-only-withkenlm/to-translate.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-ich frage sie also , herr präsident : stellen die unterschiedlichen arbeitskosten somit nicht auch eine beschränkung des freien wettbewerbs in der europäischen union dar ?
-schaut man sich die fälligkeitspläne der ausführung des haushalts für die rubriken 2 , 3 , 4 und 7 an , stellt man fest , dass nur durchschnittlich 8 % aller verpflichtungen durch zahlungen gedeckt sind .
-vor drei jahren haben wir mit unserer beschäftigungsinitiative begonnen , indem wir kleinen und mittleren unternehmen halfen , chancenkapital zu bekommen .
-das parlament will das auf zweierlei weise tun .
-nur dann werden die europäischen institutionen auch ihrem auftrag gerecht .
diff --git a/tests/phrase.basic-surface-only-withkenlm/truth/results.txt b/tests/phrase.basic-surface-only-withkenlm/truth/results.txt
deleted file mode 100644
index 354ac4f..0000000
--- a/tests/phrase.basic-surface-only-withkenlm/truth/results.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-TRANSLATION_1=i ask you , therefore , mr president , the different labour costs are therefore not a restriction of free competition in the european union ? 
-TRANSLATION_2=if we look at the fälligkeitspläne the implementation of the budget for the categories 2 , 3 , 4 and 7 to , we see that only an average of 8 % of commitments by payments are met . 
-TRANSLATION_3=three years ago our employment strategy , we started by small and medium-sized enterprises , halfen chancenkapital to obtain . 
-TRANSLATION_4=parliament wants the in two ways . 
-TRANSLATION_5=only then will the european institutions to its mandate . 
-SCORE_1 = -14.843
-SCORE_2 = -153.032
-SCORE_3 = -278.157
-SCORE_4 = -5.995
-SCORE_5 = -7.015
-TOTAL_WALLTIME ~ 16
diff --git a/tests/phrase.basic-surface-only/moses.ini b/tests/phrase.basic-surface-only/moses.ini
index 25bd271..a24cc2d 100644
--- a/tests/phrase.basic-surface-only/moses.ini
+++ b/tests/phrase.basic-surface-only/moses.ini
@@ -1,36 +1,5 @@
 # moses.ini for regression test
 
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/basic-surface-only/phrase-table.gz
-
-# language model
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-# limit on how many phrase translations e for each phrase f are loaded
-[ttable-limit]
-#ttable element load limit 0 = all elements loaded
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.141806519223522
-
-# language model weight
-[weight-l]
-0.142658800199951
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.00402447059454402
-0.0685647475075862
-0.294089113124688
-0.0328320356515851
--0.0426081987467227
-
-# word penalty
-[weight-w]
--0.273416114951401
-
 [distortion-limit]
 4
 
@@ -47,3 +16,17 @@ T 0
 [verbose]
 2
 
+[feature]
+KENLM factor=0 order=3 num-features=1 lazyken=0 path=${LM_PATH}/europarl.en.srilm.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/basic-surface-only/phrase-table.gz num-features=5 table-limit=20 
+
+[weight]
+WordPenalty0= -0.273416
+KENLM0= 0.142659
+Distortion0= 0.141807
+PhraseDictionaryMemory0= 0.00402447 0.0685648 0.294089 0.032832 -0.0426082
+
+
diff --git a/tests/phrase.compresspt/moses.ini b/tests/phrase.compresspt/moses.ini
index 899e2c1..b9434a6 100644
--- a/tests/phrase.compresspt/moses.ini
+++ b/tests/phrase.compresspt/moses.ini
@@ -13,47 +13,6 @@
 [mapping]
 0 T 0
 
-# translation tables: table type (hierarchical(0), textual (0), binary (1)), source-factors, target-factors, number of scores, file 
-# OLD FORMAT is still handled for back-compatibility
-# OLD FORMAT translation tables: source-factors, target-factors, number of scores, file 
-# OLD FORMAT a binary table type (1) is assumed 
-[ttable-file]
-12 0 0 5 ${TEST_PATH}/phrase-table.minphr
-
-# no generation models, no generation-file section
-
-# language models: type(srilm/irstlm), factors, order, file
-[lmodel-file]
-1 0 3 ${MODEL_PATH}/ptable-with-alignment/mini.irstlm.en.3g.lm
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.6
-
-# language model weights
-[weight-l]
-0.5000
-
-
-# translation model weights
-[weight-t]
-0.20
-0.20
-0.20
-0.20
-0.20
-
-# no generation models, no weight-generation section
-
-# word penalty
-[weight-w]
--1
-
 [distortion-limit]
 6
 
@@ -69,4 +28,18 @@ true
 true
 
 
+[feature]
+IRSTLM factor=0 order=3 num-features=1 path=${MODEL_PATH}/ptable-with-alignment/mini.irstlm.en.3g.lm
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryCompact input-factor=0 output-factor=0 path=${TEST_PATH}/phrase-table.minphr num-features=5 table-limit=20 
+
+[weight]
+WordPenalty0= -1
+IRSTLM0= 0.5
+Distortion0= 0.6
+PhraseDictionaryCompact0= 0.2 0.2 0.2 0.2 0.2
+
+
 
diff --git a/tests/phrase.consensus-decoding-surface/moses.ini b/tests/phrase.consensus-decoding-surface/moses.ini
index f78e5b9..aa12a63 100644
--- a/tests/phrase.consensus-decoding-surface/moses.ini
+++ b/tests/phrase.consensus-decoding-surface/moses.ini
@@ -1,36 +1,5 @@
 # moses.ini for regression test
 
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/basic-surface-only/phrase-table.gz
-
-# language model
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-# limit on how many phrase translations e for each phrase f are loaded
-[ttable-limit]
-#ttable element load limit 0 = all elements loaded
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.141806519223522
-
-# language model weight
-[weight-l]
-0.142658800199951
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.00402447059454402
-0.0685647475075862
-0.294089113124688
-0.0328320356515851
--0.0426081987467227
-
-# word penalty
-[weight-w]
--0.273416114951401
-
 [distortion-limit]
 4
 
@@ -58,3 +27,17 @@ T 0
 
 [mbr-scale]
 1
+
+[feature]
+KENLM factor=0 order=3 num-features=1 lazyken=0 path=${LM_PATH}/europarl.en.srilm.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/basic-surface-only/phrase-table.gz num-features=5 table-limit=20 
+
+[weight]
+WordPenalty0= -0.273416
+KENLM0= 0.142659
+Distortion0= 0.141807
+PhraseDictionaryMemory0= 0.00402447 0.0685648 0.294089 0.032832 -0.0426082
+
diff --git a/tests/phrase.continue-partial-translation/moses.ini b/tests/phrase.continue-partial-translation/moses.ini
index 86e99bb..621e327 100644
--- a/tests/phrase.continue-partial-translation/moses.ini
+++ b/tests/phrase.continue-partial-translation/moses.ini
@@ -1,36 +1,4 @@
 # moses.ini for regression test
-
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/basic-surface-only/phrase-table.gz
-
-# language model
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-# limit on how many phrase translations e for each phrase f are loaded
-[ttable-limit]
-#ttable element load limit 0 = all elements loaded
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.141806519223522
-
-# language model weight
-[weight-l]
-1.42658800199951
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.00402447059454402
-0.0685647475075862
-0.294089113124688
-0.0328320356515851
--0.0426081987467227
-
-# word penalty
-[weight-w]
--0.273416114951401
-
 [distortion-limit]
 4
 
@@ -49,3 +17,18 @@ T 0
 
 [verbose]
 2
+
+
+[feature]
+KENLM factor=0 order=3 num-features=1 lazyken=0 path=${LM_PATH}/europarl.en.srilm.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/basic-surface-only/phrase-table.gz num-features=5 table-limit=20 
+
+[weight]
+WordPenalty0= -0.273416
+KENLM0= 1.42659
+Distortion0= 0.141807
+PhraseDictionaryMemory0= 0.00402447 0.0685648 0.294089 0.032832 -0.0426082
+
diff --git a/tests/phrase.early-distortion-cost/moses.ini b/tests/phrase.early-distortion-cost/moses.ini
index d08dbdd..1ac658f 100644
--- a/tests/phrase.early-distortion-cost/moses.ini
+++ b/tests/phrase.early-distortion-cost/moses.ini
@@ -10,47 +10,6 @@
 [mapping]
 0 T 0
 
-# translation tables: table type (hierarchical(0), textual (0), binary (1)), source-factors, target-factors, number of scores, file 
-# OLD FORMAT is still handled for back-compatibility
-# OLD FORMAT translation tables: source-factors, target-factors, number of scores, file 
-# OLD FORMAT a binary table type (1) is assumed 
-[ttable-file]
-0 0 0 5 ${TEST_PATH}/phrase-table.gz
-
-# no generation models, no generation-file section
-
-# language models: type(srilm/irstlm), factors, order, file
-[lmodel-file]
-1 0 3 ${TEST_PATH}/mini.irstlm.en.3g.lm
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.05
-
-# language model weights
-[weight-l]
-0.5000
-
-
-# translation model weights
-[weight-t]
-0.20
-0.20
-0.20
-0.20
-0.20
-
-# no generation models, no weight-generation section
-
-# word penalty
-[weight-w]
--1
-
 [early-distortion-cost]
 yes
 
@@ -64,3 +23,17 @@ yes
 nbest
 50
 
+[feature]
+IRSTLM factor=0 order=3 num-features=1 path=${TEST_PATH}/mini.irstlm.en.3g.lm
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${TEST_PATH}/phrase-table.gz num-features=5 table-limit=20 
+
+[weight]
+WordPenalty0= -1
+IRSTLM0= 0.5
+Distortion0= 0.05
+PhraseDictionaryMemory0= 0.2 0.2 0.2 0.2 0.2
+
+
diff --git a/tests/phrase.lexicalized-reordering-bin/moses.ini b/tests/phrase.lexicalized-reordering-bin/moses.ini
index 27bf874..b9d0232 100644
--- a/tests/phrase.lexicalized-reordering-bin/moses.ini
+++ b/tests/phrase.lexicalized-reordering-bin/moses.ini
@@ -10,54 +10,22 @@
 [mapping]
 T 0
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-1 0 0 5 ${MODEL_PATH}/lexicalized-reordering-bin/phrase-table
-
-# no generation models, no generation-file section
-
-# language models: type(srilm/irstlm), factors, order, file
-[lmodel-file]
-8 0 5 ${MODEL_PATH}/lexicalized-reordering/europarl.lm
-
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-0
-# distortion (reordering) files
-[distortion-file]
-0-0 msd-bidirectional-fe 6 ${MODEL_PATH}/lexicalized-reordering-bin/reordering-table.msd-bidirectional-fe
-
-# distortion (reordering) weight
-[weight-d]
-0.5
-0.3
-0.3
-0.3
-0.3
-0.3
-0.3
-
-# language model weights
-[weight-l]
-0.5000
-
+[distortion-limit]
+6
 
-# translation model weights
-[weight-t]
-0.2
-0.2
-0.2
-0.2
-0.2
+[feature]
+KENLM factor=0 order=5 num-features=1 lazyken=0 path=${MODEL_PATH}/lexicalized-reordering/europarl.lm
+Distortion
+LexicalReordering type=msd-bidirectional-fe input-factor=0 output-factor=0 num-features=6 path=${MODEL_PATH}/lexicalized-reordering-bin/reordering-table.msd-bidirectional-fe
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryBinary input-factor=0 output-factor=0 path=${MODEL_PATH}/lexicalized-reordering-bin/phrase-table num-features=5 table-limit=20 
 
-# no generation models, no weight-generation section
+[weight]
+WordPenalty0= -1
+KENLM0= 0.5
+Distortion0= 0.5
+LexicalReordering0= 0.3 0.3 0.3 0.3 0.3 0.3
+PhraseDictionaryBinary0= 0.2 0.2 0.2 0.2 0.2
 
-# word penalty
-[weight-w]
--1
 
-[distortion-limit]
-6
diff --git a/tests/phrase.lexicalized-reordering/moses.ini b/tests/phrase.lexicalized-reordering/moses.ini
index 15c5427..d713855 100644
--- a/tests/phrase.lexicalized-reordering/moses.ini
+++ b/tests/phrase.lexicalized-reordering/moses.ini
@@ -10,54 +10,22 @@
 [mapping]
 T 0
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/lexicalized-reordering/phrase-table.0-0.gz
-
-# no generation models, no generation-file section
-
-# language models: type(srilm/irstlm), factors, order, file
-[lmodel-file]
-8 0 5 ${MODEL_PATH}/lexicalized-reordering/europarl.lm
-
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-0
-# distortion (reordering) files
-[distortion-file]
-0-0 msd-bidirectional-fe 6 ${MODEL_PATH}/lexicalized-reordering/reordering-table.msd-bidirectional-fe.0.5.0-0.gz
-
-# distortion (reordering) weight
-[weight-d]
-0.5
-0.3
-0.3
-0.3
-0.3
-0.3
-0.3
-
-# language model weights
-[weight-l]
-0.5000
-
+[distortion-limit]
+6
 
-# translation model weights
-[weight-t]
-0.2
-0.2
-0.2
-0.2
-0.2
+[feature]
+KENLM factor=0 order=5 num-features=1 lazyken=0 path=${MODEL_PATH}/lexicalized-reordering/europarl.lm
+Distortion
+LexicalReordering type=msd-bidirectional-fe input-factor=0 output-factor=0 num-features=6 path=${MODEL_PATH}/lexicalized-reordering/reordering-table.msd-bidirectional-fe.0.5.0-0.gz
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/lexicalized-reordering/phrase-table.0-0.gz num-features=5 table-limit=20 
 
-# no generation models, no weight-generation section
 
-# word penalty
-[weight-w]
--1
+[weight]
+WordPenalty0= -1
+KENLM0= 0.5
+Distortion0= 0.5
+LexicalReordering0= 0.3 0.3 0.3 0.3 0.3 0.3
+PhraseDictionaryMemory0= 0.2 0.2 0.2 0.2 0.2
 
-[distortion-limit]
-6
diff --git a/tests/phrase.multi-factor-binptable/moses.ini b/tests/phrase.multi-factor-binptable/moses.ini
index 80a6405..2a4a7b3 100644
--- a/tests/phrase.multi-factor-binptable/moses.ini
+++ b/tests/phrase.multi-factor-binptable/moses.ini
@@ -13,56 +13,24 @@ T 0
 G 0
 T 1
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-1 0 0 5 ${MODEL_PATH}/multi-factor-binptable/phrase-table.0-0.gz
-1 1 1 5 ${MODEL_PATH}/multi-factor-binptable/phrase-table.1-1.gz
-
-# generation models: source-factors, target-factors
-[generation-file]
-0 1 2 ${MODEL_PATH}/multi-factor-binptable/generation.0-1.gz
-
-# language models: 0, factors, type, file
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-0
-
-# distortion (reordering) weight
-[weight-d]
-0.6
-
-# language model weights
-[weight-l]
-0.5
-
-# translation model weights
-[weight-t]
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-
-# generation model weights
-[weight-generation]
-0.3
-0
-
-# word penalty
-[weight-w]
--1
-
-
 [verbose]
 2
 
+
+[feature]
+KENLM factor=0 order=3 num-features=1 lazyken=0 path=${LM_PATH}/europarl.en.srilm.gz
+Generation input-factor=0 output-factor=1 num-features=2 path=${MODEL_PATH}/multi-factor-binptable/generation.0-1.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryBinary input-factor=0 output-factor=0 path=${MODEL_PATH}/multi-factor-binptable/phrase-table.0-0.gz num-features=5 table-limit=20 
+PhraseDictionaryBinary input-factor=1 output-factor=1 path=${MODEL_PATH}/multi-factor-binptable/phrase-table.1-1.gz num-features=5 table-limit=0 
+
+[weight]
+WordPenalty0= -1
+KENLM0= 0.5
+Generation0= 0.3 0
+Distortion0= 0.6
+PhraseDictionaryBinary0= 0.2 0.2 0.2 0.2 0.2
+PhraseDictionaryBinary1= 0.2 0.2 0.2 0.2 0.2
+
diff --git a/tests/phrase.multi-factor-drop/moses.ini b/tests/phrase.multi-factor-drop/moses.ini
index f9bd893..22d123b 100644
--- a/tests/phrase.multi-factor-drop/moses.ini
+++ b/tests/phrase.multi-factor-drop/moses.ini
@@ -13,63 +13,27 @@ T 0
 G 0
 T 1
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-0 0 0 6 ${MODEL_PATH}/multi-factor-drop/phrase-table.0-0.gz
-1 1 1 5 ${MODEL_PATH}/multi-factor-drop/phrase-table.1-1.gz
-
-# generation models: source-factors, target-factors
-[generation-file]
-0 1 2 ${MODEL_PATH}/multi-factor-drop/generation.0-1.gz
-
-# language models: 0, factors, type, file
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-0
-
-# distortion (reordering) weight
-[weight-d]
-0.6
-
-# language model weights
-[weight-l]
-0.5
-
-# translation model weights
-[weight-t]
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-
-# generation model weights
-[weight-generation]
-0.3
-0
-
-# word penalty
-[weight-w]
--1
-
 [phrase-drop-allowed]
 yes
 
-##word-drop penalty
-#[weight-e]
-#2.718
 
 [verbose]
 2
 
+[feature]
+KENLM factor=0 order=3 num-features=1 lazyken=0 path=${LM_PATH}/europarl.en.srilm.gz
+Generation input-factor=0 output-factor=1 num-features=2 path=${MODEL_PATH}/multi-factor-drop/generation.0-1.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/multi-factor-drop/phrase-table.0-0.gz num-features=6 table-limit=20 
+PhraseDictionaryBinary input-factor=1 output-factor=1 path=${MODEL_PATH}/multi-factor-drop/phrase-table.1-1.gz num-features=5 table-limit=0 
+
+[weight]
+WordPenalty0= -1
+KENLM0= 0.5
+Generation0= 0.3 0
+Distortion0= 0.6
+PhraseDictionaryMemory0= 0.2 0.2 0.2 0.2 0.2 0.2
+PhraseDictionaryBinary0= 0.2 0.2 0.2 0.2 0.2
+
diff --git a/tests/phrase.multi-factor/moses.ini b/tests/phrase.multi-factor/moses.ini
index 6e12521..0cc0ee1 100644
--- a/tests/phrase.multi-factor/moses.ini
+++ b/tests/phrase.multi-factor/moses.ini
@@ -17,55 +17,23 @@ T 0
 G 0
 T 1
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/multi-factor/phrase-table.0-0.gz
-1 1 1 5 ${MODEL_PATH}/multi-factor/phrase-table.1-1.gz
-
-# generation models: source-factors, target-factors
-[generation-file]
-0 1 2 ${MODEL_PATH}/multi-factor/generation.0-1.gz
-
-# language models: 0, factors, type, file
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-0
-
-# distortion (reordering) weight
-[weight-d]
-0.6
-
-# language model weights
-[weight-l]
-0.5
-
-# translation model weights
-[weight-t]
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-
-# generation model weights
-[weight-generation]
-0.3
-0
-
-# word penalty
-[weight-w]
--1
-
 [verbose]
 2
 
+[feature]
+KENLM factor=0 order=3 num-features=1 lazyken=0 path=${LM_PATH}/europarl.en.srilm.gz
+Generation input-factor=0 output-factor=1 num-features=2 path=${MODEL_PATH}/multi-factor/generation.0-1.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/multi-factor/phrase-table.0-0.gz num-features=5 table-limit=20 
+PhraseDictionaryBinary input-factor=1 output-factor=1 path=${MODEL_PATH}/multi-factor/phrase-table.1-1.gz num-features=5 table-limit=0 
+
+[weight]
+WordPenalty0= -1
+KENLM0= 0.5
+Generation0= 0.3 0
+Distortion0= 0.6
+PhraseDictionaryMemory0= 0.2 0.2 0.2 0.2 0.2
+PhraseDictionaryBinary0= 0.2 0.2 0.2 0.2 0.2
+
diff --git a/tests/phrase.nbest-multi-factor.distinct/moses.ini b/tests/phrase.nbest-multi-factor.distinct/moses.ini
index 842ebb8..64e0829 100644
--- a/tests/phrase.nbest-multi-factor.distinct/moses.ini
+++ b/tests/phrase.nbest-multi-factor.distinct/moses.ini
@@ -17,55 +17,6 @@ T 0
 G 0
 T 1
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/multi-factor/phrase-table.0-0.gz
-1 1 1 5 ${MODEL_PATH}/multi-factor/phrase-table.1-1.gz
-
-# generation models: source-factors, target-factors
-[generation-file]
-0 1 2 ${MODEL_PATH}/multi-factor/generation.0-1.gz
-
-# language models: 0, factors, type, file
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-0
-
-# distortion (reordering) weight
-[weight-d]
-0.6
-
-# language model weights
-[weight-l]
-0.5
-
-# translation model weights
-[weight-t]
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-
-# generation model weights
-[weight-generation]
-0.3
-0
-
-# word penalty
-[weight-w]
--1
-
 [n-best-list]
 nbest
 100
@@ -74,3 +25,21 @@ distinct
 [verbose]
 2
 
+[feature]
+KENLM factor=0 order=3 num-features=1 lazyken=0 path=${LM_PATH}/europarl.en.srilm.gz
+Generation input-factor=0 output-factor=1 num-features=2 path=${MODEL_PATH}/multi-factor/generation.0-1.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/multi-factor/phrase-table.0-0.gz num-features=5 table-limit=20 
+PhraseDictionaryBinary input-factor=1 output-factor=1 path=${MODEL_PATH}/multi-factor/phrase-table.1-1.gz num-features=5 table-limit=0 
+
+[weight]
+WordPenalty0= -1
+KENLM0= 0.5
+Generation0= 0.3 0
+Distortion0= 0.6
+PhraseDictionaryMemory0= 0.2 0.2 0.2 0.2 0.2
+PhraseDictionaryBinary0= 0.2 0.2 0.2 0.2 0.2
+
+
diff --git a/tests/phrase.nbest-multi-factor/moses.ini b/tests/phrase.nbest-multi-factor/moses.ini
index ef732ac..3ee13a2 100644
--- a/tests/phrase.nbest-multi-factor/moses.ini
+++ b/tests/phrase.nbest-multi-factor/moses.ini
@@ -17,55 +17,6 @@ T 0
 G 0
 T 1
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/multi-factor/phrase-table.0-0.gz
-1 1 1 5 ${MODEL_PATH}/multi-factor/phrase-table.1-1.gz
-
-# generation models: source-factors, target-factors
-[generation-file]
-0 1 2 ${MODEL_PATH}/multi-factor/generation.0-1.gz
-
-# language models: 0, factors, type, file
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-0
-
-# distortion (reordering) weight
-[weight-d]
-0.6
-
-# language model weights
-[weight-l]
-0.5
-
-# translation model weights
-[weight-t]
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-0.2
-
-# generation model weights
-[weight-generation]
-0.3
-0
-
-# word penalty
-[weight-w]
--1
-
 [n-best-list]
 nbest
 2
@@ -73,3 +24,22 @@ nbest
 [verbose]
 2
 
+
+[feature]
+KENLM factor=0 order=3 num-features=1 lazyken=0 path=${LM_PATH}/europarl.en.srilm.gz
+Generation input-factor=0 output-factor=1 num-features=2 path=${MODEL_PATH}/multi-factor/generation.0-1.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/multi-factor/phrase-table.0-0.gz num-features=5 table-limit=20 
+PhraseDictionaryBinary input-factor=1 output-factor=1 path=${MODEL_PATH}/multi-factor/phrase-table.1-1.gz num-features=5 table-limit=0 
+
+[weight]
+WordPenalty0= -1
+KENLM0= 0.5
+Generation0= 0.3 0
+Distortion0= 0.6
+PhraseDictionaryMemory0= 0.2 0.2 0.2 0.2 0.2
+PhraseDictionaryBinary0= 0.2 0.2 0.2 0.2 0.2
+
+
diff --git a/tests/phrase.nbest-with-alignment/moses.ini b/tests/phrase.nbest-with-alignment/moses.ini
index a8049f5..3dff875 100644
--- a/tests/phrase.nbest-with-alignment/moses.ini
+++ b/tests/phrase.nbest-with-alignment/moses.ini
@@ -13,47 +13,6 @@
 [mapping]
 0 T 0
 
-# translation tables: table type (hierarchical(0), textual (0), binary (1)), source-factors, target-factors, number of scores, file 
-# OLD FORMAT is still handled for back-compatibility
-# OLD FORMAT translation tables: source-factors, target-factors, number of scores, file 
-# OLD FORMAT a binary table type (1) is assumed 
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/ptable-with-alignment/phrase-table.gz
-
-# no generation models, no generation-file section
-
-# language models: type(srilm/irstlm), factors, order, file
-[lmodel-file]
-1 0 3 ${MODEL_PATH}/ptable-with-alignment/mini.irstlm.en.3g.lm
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.6
-
-# language model weights
-[weight-l]
-0.5000
-
-
-# translation model weights
-[weight-t]
-0.20
-0.20
-0.20
-0.20
-0.20
-
-# no generation models, no weight-generation section
-
-# word penalty
-[weight-w]
--1
-
 [distortion-limit]
 6
 
@@ -68,5 +27,17 @@ true
 [include-segmentation-in-n-best]
 true
 
+[feature]
+IRSTLM factor=0 order=3 num-features=1 path=${MODEL_PATH}/ptable-with-alignment/mini.irstlm.en.3g.lm
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/ptable-with-alignment/phrase-table.gz num-features=5 table-limit=20 
+
+[weight]
+WordPenalty0= -1
+IRSTLM0= 0.5
+Distortion0= 0.6
+PhraseDictionaryMemory0= 0.2 0.2 0.2 0.2 0.2
 
 
diff --git a/tests/phrase.ptable-filtering/moses.ini b/tests/phrase.ptable-filtering/moses.ini
index 6307257..97fd9fd 100644
--- a/tests/phrase.ptable-filtering/moses.ini
+++ b/tests/phrase.ptable-filtering/moses.ini
@@ -1,37 +1,4 @@
 # reg testing
-
-[ttable-file]
-0 0 0 6 ${MODEL_PATH}/ptable-filtering/phrase-table.gz
-
-# language model
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.01
-
-# language model weight
-[weight-l]
-0.05
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.019268
-0.025749
-0.018038
-0.008511
-0.013410
--0.624610
-
-# word penalty
-[weight-w]
--0.108496
-
 [distortion-limit]
 6
 
@@ -50,3 +17,17 @@ T 0
 [verbose]
 3
 
+[feature]
+KENLM factor=0 order=3 num-features=1 lazyken=0 path=${LM_PATH}/europarl.en.srilm.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/ptable-filtering/phrase-table.gz num-features=6 table-limit=20 
+
+[weight]
+WordPenalty0= -0.108496
+KENLM0= 0.05
+Distortion0= 0.01
+PhraseDictionaryMemory0= 0.019268 0.025749 0.018038 0.008511 0.01341 -0.62461
+
+
diff --git a/tests/phrase.show-weights.lex-reorder/moses.ini b/tests/phrase.show-weights.lex-reorder/moses.ini
index bbe14fa..a020dfe 100644
--- a/tests/phrase.show-weights.lex-reorder/moses.ini
+++ b/tests/phrase.show-weights.lex-reorder/moses.ini
@@ -10,57 +10,24 @@
 [mapping]
 T 0
 
-# translation tables: source-factors, target-factors, number of scores, file 
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/lexicalized-reordering/phrase-table.0-0.gz
-
-# no generation models, no generation-file section
-
-# language models: type(srilm/irstlm), factors, order, file
-[lmodel-file]
-8 0 5 ${MODEL_PATH}/lexicalized-reordering/europarl.lm
-
-
-# limit on how many phrase translations e for each phrase f are loaded
-# 0 = all elements loaded
-[ttable-limit]
-20
-0
-# distortion (reordering) files
-[distortion-file]
-0-0 msd-bidirectional-fe 6 ${MODEL_PATH}/lexicalized-reordering/reordering-table.msd-bidirectional-fe.0.5.0-0.gz
-
-# distortion (reordering) weight
-[weight-d]
-0.5
-0.3
-0.3
-0.3
-0.3
-0.3
-0.3
-
-# language model weights
-[weight-l]
-0.5000
-
-
-# translation model weights
-[weight-t]
-0.2
-0.2
-0.2
-0.2
-0.2
-
-# no generation models, no weight-generation section
-
-# word penalty
-[weight-w]
--1
-
 [distortion-limit]
 6
 
 [show-weights]
 1
+
+[feature]
+KENLM factor=0 order=5 num-features=1 lazyken=0 path=${MODEL_PATH}/lexicalized-reordering/europarl.lm
+Distortion
+LexicalReordering type=msd-bidirectional-fe input-factor=0 output-factor=0 num-features=6 path=${MODEL_PATH}/lexicalized-reordering/reordering-table.msd-bidirectional-fe.0.5.0-0.gz
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/lexicalized-reordering/phrase-table.0-0.gz num-features=5 table-limit=20 
+
+[weight]
+WordPenalty0= -1
+KENLM0= 0.5
+Distortion0= 0.5
+LexicalReordering0= 0.3 0.3 0.3 0.3 0.3 0.3
+PhraseDictionaryMemory0= 0.2 0.2 0.2 0.2 0.2
+
diff --git a/tests/phrase.show-weights/moses.ini b/tests/phrase.show-weights/moses.ini
index b9af00f..469c8b3 100644
--- a/tests/phrase.show-weights/moses.ini
+++ b/tests/phrase.show-weights/moses.ini
@@ -4,40 +4,6 @@
 ###########################
 ### PHARAOH CONFIG FILE ###
 ###########################
-
-# phrase table f, n, p(n|f)
-[ttable-file]
-1 0 0 5 ${MODEL_PATH}/basic-surface-binptable/phrase-table.gz
-
-# language model
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-
-# limit on how many phrase translations e for each phrase f are loaded
-[ttable-limit]
-#ttable element load limit 0 = all elements loaded
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.141806519223522
-
-# language model weight
-[weight-l]
-0.142658800199951
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.00402447059454402
-0.0685647475075862
-0.294089113124688
-0.0328320356515851
--0.0426081987467227
-
-# word penalty
-[weight-w]
--0.273416114951401
-
 [distortion-limit]
 4
 
@@ -56,3 +22,17 @@ T 0
 
 [show-weights]
 1
+
+[feature]
+KENLM factor=0 order=3 num-features=1 lazyken=0 path=${LM_PATH}/europarl.en.srilm.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryBinary input-factor=0 output-factor=0 path=${MODEL_PATH}/basic-surface-binptable/phrase-table.gz num-features=5 table-limit=20 
+
+[weight]
+WordPenalty0= -0.273416
+KENLM0= 0.142659
+Distortion0= 0.141807
+PhraseDictionaryBinary0= 0.00402447 0.0685648 0.294089 0.032832 -0.0426082
+
diff --git a/tests/phrase.sparse-phrase-table/moses.ini b/tests/phrase.sparse-phrase-table/moses.ini
index 5673ecc..5cfff90 100644
--- a/tests/phrase.sparse-phrase-table/moses.ini
+++ b/tests/phrase.sparse-phrase-table/moses.ini
@@ -1,36 +1,4 @@
 # moses.ini for regression test
-
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/sparse-phrase-table/phrase-table.gz sparse
-
-# language model
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-# limit on how many phrase translations e for each phrase f are loaded
-[ttable-limit]
-#ttable element load limit 0 = all elements loaded
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.141806519223522
-
-# language model weight
-[weight-l]
-0.142658800199951
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.00402447059454402
-0.0685647475075862
-0.294089113124688
-0.0328320356515851
--0.0426081987467227
-
-# word penalty
-[weight-w]
--0.273416114951401
-
 [distortion-limit]
 4
 
@@ -49,3 +17,17 @@ T 0
 
 [weight-file]
 ${TEST_PATH}/weights
+
+[feature]
+KENLM factor=0 order=3 num-features=1 lazyken=0 path=${LM_PATH}/europarl.en.srilm.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryMemory input-factor=0 output-factor=0 path=${MODEL_PATH}/sparse-phrase-table/phrase-table.gz num-features=5 table-limit=20 
+
+[weight]
+WordPenalty0= -0.273416
+KENLM0= 0.142659
+Distortion0= 0.141807
+PhraseDictionaryMemory0= 0.00402447 0.0685648 0.294089 0.032832 -0.0426082
+
diff --git a/tests/phrase.xml-markup/moses.ini b/tests/phrase.xml-markup/moses.ini
index 8c8542f..531874c 100644
--- a/tests/phrase.xml-markup/moses.ini
+++ b/tests/phrase.xml-markup/moses.ini
@@ -4,35 +4,6 @@
 ###########################
 ### PHARAOH CONFIG FILE ###
 ###########################
-
-# phrase table f, n, p(n|f)
-[ttable-file]
-1 0 0 1 ${TEST_PATH}/phrase-table
-
-# language model
-[lmodel-file]
-8 0 3 ${LM_PATH}/europarl.en.srilm.gz
-# limit on how many phrase translations e for each phrase f are loaded
-[ttable-limit]
-#ttable element load limit 0 = all elements loaded
-0
-
-# distortion (reordering) weight
-[weight-d]
-1.0
-
-# language model weight
-[weight-l]
-1.0
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-1.0
-
-# word penalty
-[weight-w]
--5.0
-
 [distortion-limit]
 25
 
@@ -55,3 +26,17 @@ nbest
 [xml-input]
 inclusive
 
+[feature]
+KENLM factor=0 order=3 num-features=1 lazyken=0 path=${LM_PATH}/europarl.en.srilm.gz
+Distortion
+WordPenalty
+UnknownWordPenalty
+PhraseDictionaryBinary input-factor=0 output-factor=0 path=${TEST_PATH}/phrase-table num-features=1 table-limit=0 
+
+[weight]
+WordPenalty0= -5
+KENLM0= 1
+Distortion0= 1
+PhraseDictionaryBinary0= 1
+
+