fix tests

5 files changed, 19 insertions, 7 deletions

diff --git a/tests/system_tests/hmm/gold.statistics b/tests/system_tests/hmm/gold.statistics
index a2373477..ce0b3e45 100644
--- a/tests/system_tests/hmm/gold.statistics
+++ b/tests/system_tests/hmm/gold.statistics
@@ -4,6 +4,7 @@
 +lm_nodes 64
 +lm_edges 238
 +lm_paths 16807
++lm_trans it is quite understandable .
 constr_nodes 64
 constr_edges 238
 constr_paths 16807
diff --git a/tests/system_tests/lattice/gold.statistics b/tests/system_tests/lattice/gold.statistics
index ae5949d1..302ddf14 100644
--- a/tests/system_tests/lattice/gold.statistics
+++ b/tests/system_tests/lattice/gold.statistics
@@ -4,3 +4,4 @@
 +lm_nodes 6
 +lm_edges 10
 +lm_paths 5
++lm_trans ab
diff --git a/tests/system_tests/tagger/gold.statistics b/tests/system_tests/tagger/gold.statistics
index a86584aa..20bfbb73 100644
--- a/tests/system_tests/tagger/gold.statistics
+++ b/tests/system_tests/tagger/gold.statistics
@@ -4,9 +4,11 @@
 +lm_nodes 16
 +lm_edges 30
 +lm_paths 27
++lm_trans c c c
 -lm_nodes 2
 -lm_edges 4
 -lm_paths 3
 +lm_nodes 4
 +lm_edges 6
 +lm_paths 3
++lm_trans c
diff --git a/tests/system_tests/unsup-align/gold.statistics b/tests/system_tests/unsup-align/gold.statistics
index 09e75975..5ea2bfc8 100644
--- a/tests/system_tests/unsup-align/gold.statistics
+++ b/tests/system_tests/unsup-align/gold.statistics
@@ -4,6 +4,7 @@
 +lm_nodes 2
 +lm_edges 3
 +lm_paths 2
++lm_trans blue
 constr_nodes 2
 constr_edges 2
 constr_paths 1
@@ -13,6 +14,7 @@ constr_paths 1
 +lm_nodes 2
 +lm_edges 4
 +lm_paths 3
++lm_trans house
 constr_nodes 2
 constr_edges 2
 constr_paths 1
@@ -22,6 +24,7 @@ constr_paths 1
 +lm_nodes 7
 +lm_edges 20
 +lm_paths 49
++lm_trans the house
 constr_nodes 7
 constr_edges 10
 constr_paths 4
@@ -31,6 +34,7 @@ constr_paths 4
 +lm_nodes 7
 +lm_edges 16
 +lm_paths 25
++lm_trans house blue
 constr_nodes 7
 constr_edges 10
 constr_paths 4
@@ -40,6 +44,7 @@ constr_paths 4
 +lm_nodes 7
 +lm_edges 18
 +lm_paths 36
++lm_trans the the
 constr_nodes 7
 constr_edges 10
 constr_paths 4
@@ -49,6 +54,7 @@ constr_paths 4
 +lm_nodes 2
 +lm_edges 5
 +lm_paths 4
++lm_trans the
 constr_nodes 2
 constr_edges 2
 constr_paths 1
@@ -58,6 +64,7 @@ constr_paths 1
 +lm_nodes 7
 +lm_edges 18
 +lm_paths 36
++lm_trans the the
 constr_nodes 7
 constr_edges 10
 constr_paths 4
@@ -67,6 +74,7 @@ constr_paths 4
 +lm_nodes 7
 +lm_edges 14
 +lm_paths 16
++lm_trans thet thet
 constr_nodes 7
 constr_edges 10
 constr_paths 4
diff --git a/tests/tools/filter-stderr.pl b/tests/tools/filter-stderr.pl
index 29a97298..4a762324 100755
--- a/tests/tools/filter-stderr.pl
+++ b/tests/tools/filter-stderr.pl
@@ -4,10 +4,10 @@ use strict;
 my $REAL = '(\+|-)?[1-9][0-9]*(\.[0-9]*)?|(\+|-)?[1-9]\.[0-9]*e(\+|-)?[0-9]+';
 
 while(<>) {
-if (/-LM forest\s+\(nodes\/edges\): (\d+)\/(\d+)/) { print "-lm_nodes $1\n-lm_edges $2\n"; }
-if (/-LM forest\s+\(paths\): (.+)$/) { print "-lm_paths $1\n"; }
+if (/Init.*forest\s+\(nodes\/edges\): (\d+)\/(\d+)/) { print "-lm_nodes $1\n-lm_edges $2\n"; }
+if (/Init.*forest\s+\(paths\): (.+)$/) { print "-lm_paths $1\n"; }
 # -LM Viterbi: -12.7893
-if (/-LM\s+Viterbi:\s+($REAL)/) {
+if (/Init.*\s+Viterbi:\s+($REAL)/) {
   print "-lm_viterbi $1\n";
 } elsif (/-LM\s+Viterbi:\s+(.+)$/) {
   # -LM Viterbi: australia is have diplomatic relations with north korea one of the few countries .
@@ -18,11 +18,11 @@ if (/-LM\s+Viterbi:\s+($REAL)/) {
 if (/Constr\. forest\s+\(nodes\/edges\): (\d+)\/(\d+)/) { print "constr_nodes $1\nconstr_edges $2\n"; }
 if (/Constr\. forest\s+\(paths\): (.+)$/) { print "constr_paths $1\n"; }
 
-if (/\+LM forest\s+\(nodes\/edges\): (\d+)\/(\d+)/) { print "+lm_nodes $1\n+lm_edges $2\n"; }
-if (/\+LM forest\s+\(paths\): (.+)$/) { print "+lm_paths $1\n"; }
-if (/\+LM\s+Viterbi:\s+($REAL)/) {
+if (/Pass1.*forest\s+\(nodes\/edges\): (\d+)\/(\d+)/) { print "+lm_nodes $1\n+lm_edges $2\n"; }
+if (/Pass1.*forest\s+\(paths\): (.+)$/) { print "+lm_paths $1\n"; }
+if (/Pass1.*Viterbi:\s+($REAL)/) {
   print "+lm_viterbi $1\n";
-} elsif (/\+LM\s+Viterbi:\s+(.+)$/) {
+} elsif (/Pass1.*Viterbi:\s+(.+)$/) {
   # -LM Viterbi: australia is have diplomatic relations with north korea one of the few countries .
   print "+lm_trans $1\n";
 }