From 521dc2fdbf7eee7d6a86410f490ba7a76691590b Mon Sep 17 00:00:00 2001 From: redpony Date: Fri, 24 Sep 2010 16:49:24 +0000 Subject: fixed broken tests git-svn-id: https://ws10smt.googlecode.com/svn/trunk@658 ec762483-ff6d-05da-a07a-a48fb63a330f --- tests/system_tests/australia-align/gold.statistics | 2 - tests/system_tests/australia/gold.statistics | 2 - .../controlled_synparse/gold.statistics | 4 -- tests/system_tests/controlled_synparse/gold.stdout | 72 +++++++++++----------- tests/system_tests/ftrans/gold.statistics | 2 - tests/system_tests/ftrans/gold.stdout | 8 +-- tests/system_tests/hmm/gold.statistics | 3 - tests/system_tests/lattice/gold.statistics | 3 - tests/system_tests/lattice/gold.stdout | 10 +-- tests/system_tests/mcle_gradient/gold.statistics | 6 -- tests/system_tests/mcle_gradient/gold.stdout | 2 +- tests/system_tests/unsup-align/gold.statistics | 24 -------- 12 files changed, 46 insertions(+), 92 deletions(-) diff --git a/tests/system_tests/australia-align/gold.statistics b/tests/system_tests/australia-align/gold.statistics index 8101bd40..5aa2fa7b 100644 --- a/tests/system_tests/australia-align/gold.statistics +++ b/tests/system_tests/australia-align/gold.statistics @@ -1,8 +1,6 @@ -lm_nodes 77 -lm_edges 244232 -lm_paths 3.79555e+28 --lm_trans australia is have diplomatic relations with north korea one of the few countries . --lm_viterbi -12.7893 constr_nodes 111 constr_edges 305 constr_paths 9899 diff --git a/tests/system_tests/australia/gold.statistics b/tests/system_tests/australia/gold.statistics index 050d12dd..12b9315c 100644 --- a/tests/system_tests/australia/gold.statistics +++ b/tests/system_tests/australia/gold.statistics @@ -1,8 +1,6 @@ -lm_nodes 77 -lm_edges 244232 -lm_paths 3.79555e+28 --lm_trans australia is have diplomatic relations with north korea one of the few countries . --lm_viterbi -12.7893 constr_nodes 185 constr_edges 827 constr_paths 279358 diff --git a/tests/system_tests/controlled_synparse/gold.statistics b/tests/system_tests/controlled_synparse/gold.statistics index 3885cf94..0b8453f8 100644 --- a/tests/system_tests/controlled_synparse/gold.statistics +++ b/tests/system_tests/controlled_synparse/gold.statistics @@ -1,16 +1,12 @@ -lm_nodes 11 -lm_edges 18 -lm_paths 18 --lm_trans a d c b --lm_trans 0 constr_nodes 8 constr_edges 8 constr_paths 1 -lm_nodes 11 -lm_edges 18 -lm_paths 18 --lm_trans a d c b --lm_trans 0 constr_nodes 12 constr_edges 14 constr_paths 3 diff --git a/tests/system_tests/controlled_synparse/gold.stdout b/tests/system_tests/controlled_synparse/gold.stdout index 9e68069e..fb981cd9 100644 --- a/tests/system_tests/controlled_synparse/gold.stdout +++ b/tests/system_tests/controlled_synparse/gold.stdout @@ -1,36 +1,36 @@ -0 ||| c b c d ||| F1bad2=1;F5=1;F6=1;F7=1;Glue=3 ||| 0 -0 ||| c d c b e ||| F1bad2=1;F4=1;F5=1;F7=1;Glue=1 ||| 0 -0 ||| c b c d ||| F1bad2=1;F6=1;F7=1;F9=1;Glue=2 ||| 0 -0 ||| b d c b e ||| F1bad1=1;F4=1;F5=1;F7=1;Glue=1 ||| 0 -0 ||| c b c d ||| F1bad2=1;F3=1;F5=1;F7=1;Glue=1 ||| 0 -0 ||| a d c b e ||| F1=1;F4=1;F5=1;F7=1;Glue=1 ||| 0 -0 ||| b b c d ||| F1bad1=1;F3=1;F5=1;F7=1;Glue=1 ||| 0 -0 ||| c d c b ||| F1bad2=1;F2=1;F5=1;F7=1;Glue=1 ||| 0 -0 ||| a b c d ||| F1=1;F3=1;F5=1;F7=1;Glue=1 ||| 0 -0 ||| b b c d ||| F1bad1=1;F5=1;F6=1;F7=1;Glue=3 ||| 0 -0 ||| b d c b ||| F1bad1=1;F2=1;F5=1;F7=1;Glue=1 ||| 0 -0 ||| a d c b ||| F1=1;F2=1;F5=1;F7=1;Glue=1 ||| 0 -0 ||| b b c d ||| F1bad1=1;F6=1;F7=1;F9=1;Glue=2 ||| 0 -0 ||| c c b d ||| F1bad2=1;F6=1;F7=1;F8=1;Glue=2 ||| 0 -0 ||| a b c d ||| F1=1;F6=1;F7=1;F9=1;Glue=2 ||| 0 -0 ||| a b c d ||| F1=1;F5=1;F6=1;F7=1;Glue=3 ||| 0 -0 ||| b c b d ||| F1bad1=1;F6=1;F7=1;F8=1;Glue=2 ||| 0 -0 ||| a c b d ||| F1=1;F6=1;F7=1;F8=1;Glue=2 ||| 0 -1 ||| c b c d ||| F1bad2=1;F5=1;F6=1;F7=1;Glue=3 ||| 0 -1 ||| c d c b e ||| F1bad2=1;F4=1;F5=1;F7=1;Glue=1 ||| 0 -1 ||| c b c d ||| F1bad2=1;F6=1;F7=1;F9=1;Glue=2 ||| 0 -1 ||| b d c b e ||| F1bad1=1;F4=1;F5=1;F7=1;Glue=1 ||| 0 -1 ||| c b c d ||| F1bad2=1;F3=1;F5=1;F7=1;Glue=1 ||| 0 -1 ||| a d c b e ||| F1=1;F4=1;F5=1;F7=1;Glue=1 ||| 0 -1 ||| b b c d ||| F1bad1=1;F3=1;F5=1;F7=1;Glue=1 ||| 0 -1 ||| c d c b ||| F1bad2=1;F2=1;F5=1;F7=1;Glue=1 ||| 0 -1 ||| a b c d ||| F1=1;F3=1;F5=1;F7=1;Glue=1 ||| 0 -1 ||| b b c d ||| F1bad1=1;F5=1;F6=1;F7=1;Glue=3 ||| 0 -1 ||| b d c b ||| F1bad1=1;F2=1;F5=1;F7=1;Glue=1 ||| 0 -1 ||| a d c b ||| F1=1;F2=1;F5=1;F7=1;Glue=1 ||| 0 -1 ||| b b c d ||| F1bad1=1;F6=1;F7=1;F9=1;Glue=2 ||| 0 -1 ||| c c b d ||| F1bad2=1;F6=1;F7=1;F8=1;Glue=2 ||| 0 -1 ||| a b c d ||| F1=1;F6=1;F7=1;F9=1;Glue=2 ||| 0 -1 ||| a b c d ||| F1=1;F5=1;F6=1;F7=1;Glue=3 ||| 0 -1 ||| b c b d ||| F1bad1=1;F6=1;F7=1;F8=1;Glue=2 ||| 0 -1 ||| a c b d ||| F1=1;F6=1;F7=1;F8=1;Glue=2 ||| 0 +0 ||| c b c d ||| F1bad2=1 F5=1 F6=1 F7=1 Glue=3 ||| 0 +0 ||| c d c b e ||| F1bad2=1 F4=1 F5=1 F7=1 Glue=1 ||| 0 +0 ||| c b c d ||| F1bad2=1 F6=1 F7=1 F9=1 Glue=2 ||| 0 +0 ||| b d c b e ||| F1bad1=1 F4=1 F5=1 F7=1 Glue=1 ||| 0 +0 ||| c b c d ||| F1bad2=1 F3=1 F5=1 F7=1 Glue=1 ||| 0 +0 ||| a d c b e ||| F1=1 F4=1 F5=1 F7=1 Glue=1 ||| 0 +0 ||| b b c d ||| F1bad1=1 F3=1 F5=1 F7=1 Glue=1 ||| 0 +0 ||| c d c b ||| F1bad2=1 F2=1 F5=1 F7=1 Glue=1 ||| 0 +0 ||| a b c d ||| F1=1 F3=1 F5=1 F7=1 Glue=1 ||| 0 +0 ||| b b c d ||| F1bad1=1 F5=1 F6=1 F7=1 Glue=3 ||| 0 +0 ||| b d c b ||| F1bad1=1 F2=1 F5=1 F7=1 Glue=1 ||| 0 +0 ||| a d c b ||| F1=1 F2=1 F5=1 F7=1 Glue=1 ||| 0 +0 ||| b b c d ||| F1bad1=1 F6=1 F7=1 F9=1 Glue=2 ||| 0 +0 ||| c c b d ||| F1bad2=1 F6=1 F7=1 F8=1 Glue=2 ||| 0 +0 ||| a b c d ||| F1=1 F6=1 F7=1 F9=1 Glue=2 ||| 0 +0 ||| a b c d ||| F1=1 F5=1 F6=1 F7=1 Glue=3 ||| 0 +0 ||| b c b d ||| F1bad1=1 F6=1 F7=1 F8=1 Glue=2 ||| 0 +0 ||| a c b d ||| F1=1 F6=1 F7=1 F8=1 Glue=2 ||| 0 +1 ||| c b c d ||| F1bad2=1 F5=1 F6=1 F7=1 Glue=3 ||| 0 +1 ||| c d c b e ||| F1bad2=1 F4=1 F5=1 F7=1 Glue=1 ||| 0 +1 ||| c b c d ||| F1bad2=1 F6=1 F7=1 F9=1 Glue=2 ||| 0 +1 ||| b d c b e ||| F1bad1=1 F4=1 F5=1 F7=1 Glue=1 ||| 0 +1 ||| c b c d ||| F1bad2=1 F3=1 F5=1 F7=1 Glue=1 ||| 0 +1 ||| a d c b e ||| F1=1 F4=1 F5=1 F7=1 Glue=1 ||| 0 +1 ||| b b c d ||| F1bad1=1 F3=1 F5=1 F7=1 Glue=1 ||| 0 +1 ||| c d c b ||| F1bad2=1 F2=1 F5=1 F7=1 Glue=1 ||| 0 +1 ||| a b c d ||| F1=1 F3=1 F5=1 F7=1 Glue=1 ||| 0 +1 ||| b b c d ||| F1bad1=1 F5=1 F6=1 F7=1 Glue=3 ||| 0 +1 ||| b d c b ||| F1bad1=1 F2=1 F5=1 F7=1 Glue=1 ||| 0 +1 ||| a d c b ||| F1=1 F2=1 F5=1 F7=1 Glue=1 ||| 0 +1 ||| b b c d ||| F1bad1=1 F6=1 F7=1 F9=1 Glue=2 ||| 0 +1 ||| c c b d ||| F1bad2=1 F6=1 F7=1 F8=1 Glue=2 ||| 0 +1 ||| a b c d ||| F1=1 F6=1 F7=1 F9=1 Glue=2 ||| 0 +1 ||| a b c d ||| F1=1 F5=1 F6=1 F7=1 Glue=3 ||| 0 +1 ||| b c b d ||| F1bad1=1 F6=1 F7=1 F8=1 Glue=2 ||| 0 +1 ||| a c b d ||| F1=1 F6=1 F7=1 F8=1 Glue=2 ||| 0 diff --git a/tests/system_tests/ftrans/gold.statistics b/tests/system_tests/ftrans/gold.statistics index 40cdfd4c..66d34c5f 100644 --- a/tests/system_tests/ftrans/gold.statistics +++ b/tests/system_tests/ftrans/gold.statistics @@ -1,5 +1,3 @@ -lm_nodes 13 -lm_edges 16 -lm_paths 4 --lm_trans CB --lm_viterbi 101 diff --git a/tests/system_tests/ftrans/gold.stdout b/tests/system_tests/ftrans/gold.stdout index b81534fc..171dbe98 100644 --- a/tests/system_tests/ftrans/gold.stdout +++ b/tests/system_tests/ftrans/gold.stdout @@ -1,4 +1,4 @@ -0 ||| CB ||| F4=1;Inv=1 ||| 101 -0 ||| BC ||| F3=0.4;Mono=1 ||| 6 -0 ||| B C ||| F1=1;F2=0.2;OtherFeat=1;Mono=1 ||| 3 -0 ||| C B ||| F1=1;F2=0.2;OtherFeat=1;Inv=1 ||| 2 +0 ||| CB ||| F4=1 Inv=1 ||| 101 +0 ||| BC ||| F3=0.4 Mono=1 ||| 6 +0 ||| B C ||| F1=1 F2=0.2 OtherFeat=1 Mono=1 ||| 3 +0 ||| C B ||| F1=1 F2=0.2 OtherFeat=1 Inv=1 ||| 2 diff --git a/tests/system_tests/hmm/gold.statistics b/tests/system_tests/hmm/gold.statistics index 3957cba4..a2373477 100644 --- a/tests/system_tests/hmm/gold.statistics +++ b/tests/system_tests/hmm/gold.statistics @@ -1,12 +1,9 @@ -lm_nodes 10 -lm_edges 40 -lm_paths 16807 --lm_trans it is quite understandable . --lm_viterbi -3.42891 +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 48062f98..ae5949d1 100644 --- a/tests/system_tests/lattice/gold.statistics +++ b/tests/system_tests/lattice/gold.statistics @@ -1,9 +1,6 @@ -lm_nodes 6 -lm_edges 10 -lm_paths 5 --lm_trans ab --lm_trans -0.225 +lm_nodes 6 +lm_edges 10 +lm_paths 5 -+lm_trans ab diff --git a/tests/system_tests/lattice/gold.stdout b/tests/system_tests/lattice/gold.stdout index 1a609df0..7b0bfdb2 100644 --- a/tests/system_tests/lattice/gold.stdout +++ b/tests/system_tests/lattice/gold.stdout @@ -1,5 +1,5 @@ -0 ||| ab ||| WordPenalty=-0.434294;SourceWordPenalty=-0.434294;Cost=0.1;LatticeCost=0.125 ||| -1.09359 -0 ||| cb ||| WordPenalty=-0.434294;SourceWordPenalty=-0.868589;Cost=0.3;LatticeCost=2.25 ||| -3.85288 -0 ||| a_b ||| WordPenalty=-0.434294;SourceWordPenalty=-0.868589;Cost=0.2;LatticeCost=2.5 ||| -4.00288 -0 ||| a b ||| WordPenalty=-0.868589;SourceWordPenalty=-0.868589;Glue=1;Cost=0.3;LatticeCost=2.5 ||| -4.53718 -0 ||| a' b ||| WordPenalty=-0.868589;SourceWordPenalty=-0.868589;Glue=1;Cost=0.3;LatticeCost=2.5 ||| -4.53718 +0 ||| ab ||| WordPenalty=-0.434294 SourceWordPenalty=-0.434294 Cost=0.1 LatticeCost=0.125 ||| -1.09359 +0 ||| cb ||| WordPenalty=-0.434294 SourceWordPenalty=-0.868589 Cost=0.3 LatticeCost=2.25 ||| -3.85288 +0 ||| a_b ||| WordPenalty=-0.434294 SourceWordPenalty=-0.868589 Cost=0.2 LatticeCost=2.5 ||| -4.00288 +0 ||| a' b ||| WordPenalty=-0.868589 SourceWordPenalty=-0.868589 Glue=1 Cost=0.3 LatticeCost=2.5 ||| -4.53718 +0 ||| a b ||| WordPenalty=-0.868589 SourceWordPenalty=-0.868589 Glue=1 Cost=0.3 LatticeCost=2.5 ||| -4.53718 diff --git a/tests/system_tests/mcle_gradient/gold.statistics b/tests/system_tests/mcle_gradient/gold.statistics index 94af9d7d..75bc94db 100644 --- a/tests/system_tests/mcle_gradient/gold.statistics +++ b/tests/system_tests/mcle_gradient/gold.statistics @@ -1,24 +1,18 @@ -lm_nodes 4 -lm_edges 8 -lm_paths 5 --lm_trans A --lm_trans 0.652536 constr_nodes 5 constr_edges 6 constr_paths 2 -lm_nodes 4 -lm_edges 8 -lm_paths 5 --lm_trans A --lm_trans 0.652536 constr_nodes 5 constr_edges 5 constr_paths 1 -lm_nodes 7 -lm_edges 17 -lm_paths 15 --lm_trans C A --lm_trans 0.74624 constr_nodes 8 constr_edges 13 constr_paths 6 diff --git a/tests/system_tests/mcle_gradient/gold.stdout b/tests/system_tests/mcle_gradient/gold.stdout index cc0bd08c..641b1129 100644 --- a/tests/system_tests/mcle_gradient/gold.stdout +++ b/tests/system_tests/mcle_gradient/gold.stdout @@ -1 +1 @@ -0 **OBJ**=3.05441;RewriteXY=-0.123601;SomeFeat=0.431589;F1=0.139951;F2=0.05909;F3=-0.116843;F4=0.106688;F5=0.0811144;F6=-0.257667;F7=-0.0224891;F8=0.118842;F9=-0.545223;F10=0.473137;F11=0.0176334;F12=-0.210479;F13=0.0162935 +0 **OBJ**=3.05441;RewriteXY=(-)-2.0907 Top=-inf SomeFeat=-0.840281 F1=-1.96646 F2=-2.82869 F3=(-)-2.14693 F4=-2.23785 F5=-2.51189 F6=(-)-1.35609 F7=(-)-3.79473 F8=-2.12996 F9=(-)-0.60656 F10=-0.74837 F11=-4.03796 F12=(-)-1.55837 F13=-4.11699 diff --git a/tests/system_tests/unsup-align/gold.statistics b/tests/system_tests/unsup-align/gold.statistics index 975c9d4e..09e75975 100644 --- a/tests/system_tests/unsup-align/gold.statistics +++ b/tests/system_tests/unsup-align/gold.statistics @@ -1,96 +1,72 @@ -lm_nodes 2 -lm_edges 3 -lm_paths 2 --lm_trans blue --lm_trans 0.4528 +lm_nodes 2 +lm_edges 3 +lm_paths 2 -+lm_trans blue constr_nodes 2 constr_edges 2 constr_paths 1 -lm_nodes 2 -lm_edges 4 -lm_paths 3 --lm_trans house --lm_trans 0.673643 +lm_nodes 2 +lm_edges 4 +lm_paths 3 -+lm_trans house constr_nodes 2 constr_edges 2 constr_paths 1 -lm_nodes 4 -lm_edges 16 -lm_paths 49 --lm_trans the the --lm_viterbi 1.42559 +lm_nodes 7 +lm_edges 20 +lm_paths 49 -+lm_trans the house constr_nodes 7 constr_edges 10 constr_paths 4 -lm_nodes 4 -lm_edges 12 -lm_paths 25 --lm_trans house house --lm_viterbi 1.34729 +lm_nodes 7 +lm_edges 16 +lm_paths 25 -+lm_trans house blue constr_nodes 7 constr_edges 10 constr_paths 4 -lm_nodes 4 -lm_edges 14 -lm_paths 36 --lm_trans the the --lm_viterbi 1.42559 +lm_nodes 7 +lm_edges 18 +lm_paths 36 -+lm_trans the the constr_nodes 7 constr_edges 10 constr_paths 4 -lm_nodes 2 -lm_edges 5 -lm_paths 4 --lm_trans the --lm_trans 0.712796 +lm_nodes 2 +lm_edges 5 +lm_paths 4 -+lm_trans the constr_nodes 2 constr_edges 2 constr_paths 1 -lm_nodes 4 -lm_edges 14 -lm_paths 36 --lm_trans the the --lm_viterbi 1.42559 +lm_nodes 7 +lm_edges 18 +lm_paths 36 -+lm_trans the the constr_nodes 7 constr_edges 10 constr_paths 4 -lm_nodes 4 -lm_edges 10 -lm_paths 16 --lm_trans thet thet --lm_trans 0 +lm_nodes 7 +lm_edges 14 +lm_paths 16 -+lm_trans thet thet constr_nodes 7 constr_edges 10 constr_paths 4 -- cgit v1.2.3