merged

22 files changed, 0 insertions, 417 deletions

diff --git a/tests/delete-me/phrase.multiple-translation-system-lr/filter-stderr.pl b/tests/delete-me/phrase.multiple-translation-system-lr/filter-stderr.pl
deleted file mode 100755
index 2f6e176..0000000
--- a/tests/delete-me/phrase.multiple-translation-system-lr/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/delete-me/phrase.multiple-translation-system-lr/filter-stdout.pl b/tests/delete-me/phrase.multiple-translation-system-lr/filter-stdout.pl
deleted file mode 100755
index 476ddf6..0000000
--- a/tests/delete-me/phrase.multiple-translation-system-lr/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/delete-me/phrase.multiple-translation-system-lr/moses.ini b/tests/delete-me/phrase.multiple-translation-system-lr/moses.ini
deleted file mode 100644
index 0ea29c8..0000000
--- a/tests/delete-me/phrase.multiple-translation-system-lr/moses.ini
+++ /dev/null
@@ -1,76 +0,0 @@
-# moses.ini for regression test
-
-# D - decoding path, R - reordering model, L - language model
-[translation-systems]
-other D 0 L 0
-default D 1 L 1 R 0
-
-[mapping]
-0 T 0
-1 T 1
-
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/basic-surface-only/phrase-table.gz
-0 0 0 5 ${MODEL_PATH}/lexicalized-reordering/phrase-table.0-0.gz
-
-# language model
-[lmodel-file]
-8 0 5 ${MODEL_PATH}/lexicalized-reordering/europarl.lm
-8 0 5 ${MODEL_PATH}/lexicalized-reordering/europarl.lm
-# limit on how many phrase translations e for each phrase f are loaded
-
-# 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
-
-[ttable-limit]
-#ttable element load limit 0 = all elements loaded
-20
-
-# distortion (reordering) weight
-[weight-d]
-0.1
-0.5
-
-# lexical reordering weights
-[weight-lr]
-0.3
-0.3
-0.3
-0.3
-0.3
-0.3
-
-# language model weight
-[weight-l]
-0.001
-0.5
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.5
-0.5
-0.5
-0.5
-0.5
-0.2
-0.2
-0.2
-0.2
-0.2
-
-# word penalty
-[weight-w]
-0.273416114951401
--1
-
-[distortion-limit]
-6
-
-[input-factors]
-0
-
-
-[verbose]
-2
-
diff --git a/tests/delete-me/phrase.multiple-translation-system-lr/to-translate.txt b/tests/delete-me/phrase.multiple-translation-system-lr/to-translate.txt
deleted file mode 100644
index d336d82..0000000
--- a/tests/delete-me/phrase.multiple-translation-system-lr/to-translate.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-monsieur le président , ce que nous devrons toutefois également faire à biarritz , c' est regarder un peu plus loin .
-les élus que nous sommes avons au moins autant le devoir de l' encourager à progresser , en dépit de l' adversité , que de relayer les messages que nous recevons de l' opinion publique dans chacun de nos pays .
-au regard des événements de ces derniers temps , la question du prix de l' essence me semble elle aussi particulièrement remarquable .
-à l' heure actuelle , le conseil est en train d' examiner l' inclusion de tels mécanismes dans l' article 7 .
-deuxièmement , dans la transparence pour les citoyens , qui connaissent à présent les droits dont ils disposent vis-à-vis de ceux qui appliquent et élaborent le droit européen , et pour ceux qui , justement , appliquent et élaborent ce droit européen .
diff --git a/tests/delete-me/phrase.multiple-translation-system-lr/truth/results.txt b/tests/delete-me/phrase.multiple-translation-system-lr/truth/results.txt
deleted file mode 100644
index 79c98ba..0000000
--- a/tests/delete-me/phrase.multiple-translation-system-lr/truth/results.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-TRANSLATION_1=mr president , what we devrons but also to to biarritz , this is regarder a little more loin . 
-TRANSLATION_2=the élus that we are have the with difference the us of the encourager to progresser , in dépit of the adversité , that of relayer the messages that we recevons of the opinion all in each of our countries . 
-TRANSLATION_3=the prerequisites for the événements of these derniers time , the issue of the sufficiently of the essence to it also in remarquable . 
-TRANSLATION_4=in the , the council , it is train of examiner the inclusion of such mécanismes in article 7 . 
-TRANSLATION_5=secondly , in the transparency for the citizens , which are now the droits which they disposent vis-à-vis of those appliquent and élaborent the european law and , to those , precisely appliquent and élaborent this european law . 
-LMLOAD_TIME ~ 1.196
-PTLOAD_TIME ~ 1.196
-PTLOAD_TIME ~ 2.071
-PTLOAD_TIME ~ 2.717
-SCORE_1 = -883.502
-SCORE_2 = -1994.346
-SCORE_3 = -898.780
-SCORE_4 = -894.141
-SCORE_5 = -1568.085
-TOTAL_WALLTIME ~ 16
diff --git a/tests/delete-me/phrase.multiple-translation-system/filter-stderr.pl b/tests/delete-me/phrase.multiple-translation-system/filter-stderr.pl
deleted file mode 100755
index 2f6e176..0000000
--- a/tests/delete-me/phrase.multiple-translation-system/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/delete-me/phrase.multiple-translation-system/filter-stdout.pl b/tests/delete-me/phrase.multiple-translation-system/filter-stdout.pl
deleted file mode 100755
index 476ddf6..0000000
--- a/tests/delete-me/phrase.multiple-translation-system/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/delete-me/phrase.multiple-translation-system/moses.ini b/tests/delete-me/phrase.multiple-translation-system/moses.ini
deleted file mode 100644
index c7fc8a8..0000000
--- a/tests/delete-me/phrase.multiple-translation-system/moses.ini
+++ /dev/null
@@ -1,65 +0,0 @@
-# moses.ini for regression test
-
-# D - decoding path, R - reordering model, L - language model
-[translation-systems]
-other D 0 L 0
-default D 1 L 1
-
-[mapping]
-0 T 0
-1 T 1
-
-[ttable-file]
-0 0 0 5 ${MODEL_PATH}/lexicalized-reordering/phrase-table.0-0.gz
-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
-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.1
-0.141806519223522
-
-# language model weight
-[weight-l]
-0.001
-0.142658800199951
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.5
-0.5
-0.5
-0.5
-0.5
-0.00402447059454402
-0.0685647475075862
-0.294089113124688
-0.0328320356515851
--0.0426081987467227
-
-# word penalty
-[weight-w]
-0.273416114951401
--0.273416114951401
-
-[distortion-limit]
-4
-
-[beam-threshold]
-0.03
-
-[input-factors]
-0
-
-
-[verbose]
-2
-
diff --git a/tests/delete-me/phrase.multiple-translation-system/to-translate.txt b/tests/delete-me/phrase.multiple-translation-system/to-translate.txt
deleted file mode 100644
index a505702..0000000
--- a/tests/delete-me/phrase.multiple-translation-system/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/delete-me/phrase.multiple-translation-system/truth/results.txt b/tests/delete-me/phrase.multiple-translation-system/truth/results.txt
deleted file mode 100644
index d15f400..0000000
--- a/tests/delete-me/phrase.multiple-translation-system/truth/results.txt
+++ /dev/null
@@ -1,15 +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 . 
-LMLOAD_TIME ~ 10.130
-PTLOAD_TIME ~ 10.130
-PTLOAD_TIME ~ 10.637
-PTLOAD_TIME ~ 11.081
-SCORE_1 = -14.843
-SCORE_2 = -153.032
-SCORE_3 = -278.157
-SCORE_4 = -5.995
-SCORE_5 = -7.015
-TOTAL_WALLTIME ~ 22
diff --git a/tests/misc.extract-parallel-weighted/run.perl b/tests/misc.extract-parallel-weighted/run.perl
index c6a1ed0..566a02f 100755
--- a/tests/misc.extract-parallel-weighted/run.perl
+++ b/tests/misc.extract-parallel-weighted/run.perl
@@ -17,16 +17,6 @@ GetOptions("moses-root=s" => \$mosesRoot,
            "results-dir=s"=> \$results_dir,
           ) or exit 1;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-my $cmd;
-$cmd = "$mosesRoot/scripts/generic/extract-parallel.perl 2 $splitCmd $sortCmd $mosesBin/extract $test_dir/$test_name/en $test_dir/$test_name/fr $test_dir/$test_name/align.fr-en $results_dir/extract 7 --GZOutput --InstanceWeights $test_dir/$test_name/weights 2> $results_dir/log";
-print STDERR "Executing: $cmd\n";
-`$cmd`;
-system("$catCmd $results_dir/extract.sorted.gz $results_dir/extract.inv.sorted.gz > $results_dir/out");
-=======
-=======
->>>>>>> 47addea26d2effd79843275644e2d287aa282266
 my $SPLIT_EXEC = `gsplit --help 2>/dev/null`; 
 if($SPLIT_EXEC) {
   $SPLIT_EXEC = 'gsplit';
@@ -51,9 +41,5 @@ print STDERR "Executing: $cmd\n";
 `$cmd`;
 
 system("$CAT_EXEC $results_dir/extract.sorted.gz $results_dir/extract.inv.sorted.gz > $results_dir/out");
-<<<<<<< HEAD
->>>>>>> 475688bf6e70934b733b1e3ffb711f997c993ba3
-=======
->>>>>>> 47addea26d2effd79843275644e2d287aa282266
 
 
diff --git a/tests/phrase.interpolated/filter-stderr.pl b/tests/phrase.interpolated/filter-stderr.pl
deleted file mode 100755
index 2f6e176..0000000
--- a/tests/phrase.interpolated/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.interpolated/filter-stdout.pl b/tests/phrase.interpolated/filter-stdout.pl
deleted file mode 100755
index 476ddf6..0000000
--- a/tests/phrase.interpolated/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.interpolated/moses.ini b/tests/phrase.interpolated/moses.ini
deleted file mode 100644
index d9ebd45..0000000
--- a/tests/phrase.interpolated/moses.ini
+++ /dev/null
@@ -1,56 +0,0 @@
-# Moses configuration file
-# automatic exodus from pharaoh.ini Wed Jul 12 18:24:14 EDT 2006
-
-###########################
-### PHARAOH CONFIG FILE ###
-###########################
-
-# phrase table f, n, p(n|f)
-[ttable-file]
-13 0 0 5 naive ${MODEL_PATH}/ptable-interpolated/phrase-table.1 ${MODEL_PATH}/ptable-interpolated/phrase-table.2 0.4,0.6;0.2,0.8;0.1,0.9;0.8,0.2
-
-# 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.2
-
-# language model weight
-[weight-l]
-0.2
-
-# translation model weight (phrase translation, lexical weighting)
-[weight-t]
-0.2
-0.2
-0.2
-0.2
-0.2
-
-# word penalty
-[weight-w]
--0.1
-
-[distortion-limit]
-4
-
-[beam-threshold]
-0.03
-
-[input-factors]
-0
-
-[mapping]
-T 0
-
-
-[verbose]
-2
-
diff --git a/tests/phrase.interpolated/to-translate.txt b/tests/phrase.interpolated/to-translate.txt
deleted file mode 100644
index 1b4b9f3..0000000
--- a/tests/phrase.interpolated/to-translate.txt
+++ /dev/null
@@ -1 +0,0 @@
-a b c d e
diff --git a/tests/phrase.interpolated/truth/results.txt b/tests/phrase.interpolated/truth/results.txt
deleted file mode 100644
index a14fe87..0000000
--- a/tests/phrase.interpolated/truth/results.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-TRANSLATION_1=the and a an 
-LMLOAD_TIME ~ 3.240
-PTLOAD_TIME ~ 3.240
-SCORE_1 = -11.370
-TOTAL_WALLTIME ~ 3
diff --git a/tests/phrase.word-translation/filter-stderr.pl b/tests/phrase.word-translation/filter-stderr.pl
deleted file mode 100755
index 2f6e176..0000000
--- a/tests/phrase.word-translation/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.word-translation/filter-stdout.pl b/tests/phrase.word-translation/filter-stdout.pl
deleted file mode 100755
index 476ddf6..0000000
--- a/tests/phrase.word-translation/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.word-translation/moses.ini b/tests/phrase.word-translation/moses.ini
deleted file mode 100644
index 3cdb881..0000000
--- a/tests/phrase.word-translation/moses.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-# moses.ini for regression test
-[distortion-limit]
-4
-
-[beam-threshold]
-0.03
-
-[input-factors]
-0
-
-[mapping]
-T 0
-
-
-[verbose]
-2
-
-[feature]
-WordPenalty
-Distortion
-KENLM lazyken=0 order=3 factor=0 path=${LM_PATH}/europarl.en.srilm.gz
-WordTranslationFeature input-factor=0 output-factor=0 simple=1 source-context=0 target-context=0 
-PhraseDictionaryMemory num-features=5 input-factor=0 output-factor=0 table-limit=20 path=${MODEL_PATH}/ptable-with-alignment/phrase-table.gz
-
-[weight]
-WordPenalty0= -0.273416114951401
-Distortion0= 0.141806519223522
-KENLM0= 0.142658800199951
-PhraseDictionaryMemory0= 0.00402447059454402 0.0685647475075862 0.294089113124688 0.0328320356515851 -0.0426081987467227
-
-[weight-file]
-${TEST_PATH}/weights
-
diff --git a/tests/phrase.word-translation/to-translate.txt b/tests/phrase.word-translation/to-translate.txt
deleted file mode 100644
index 9e59361..0000000
--- a/tests/phrase.word-translation/to-translate.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-der Rahmen der Verfassung
-Rechtsstaatlichkeit
diff --git a/tests/phrase.word-translation/truth/results.txt b/tests/phrase.word-translation/truth/results.txt
deleted file mode 100644
index 28f97ea..0000000
--- a/tests/phrase.word-translation/truth/results.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-TRANSLATION_1=of the realm of constitutional 
-TRANSLATION_2=rule 
-SCORE_1 = -3.693
-SCORE_2 = -3.635
-TOTAL_WALLTIME ~ 7
diff --git a/tests/phrase.word-translation/weights b/tests/phrase.word-translation/weights
deleted file mode 100644
index 168d6d2..0000000
--- a/tests/phrase.word-translation/weights
+++ /dev/null
@@ -1,4 +0,0 @@
-wt_der~of 1.0
-wt_Rahmen~framework -0.25
-wt_der~the -0.4
-wt_Rechtsstaatlichkeit~rule -0.5