From 2738a4d902757d60108dccb2ddbb778251be63e3 Mon Sep 17 00:00:00 2001 From: Chris Dyer Date: Thu, 28 Apr 2011 15:48:43 -0400 Subject: replace old sparse vector with much faster version, major speed improvements for cdec --- tests/system_tests/controlled_synparse/gold.stdout | 72 +++++++++++----------- tests/system_tests/ftrans/gold.stdout | 8 +-- tests/system_tests/lattice/gold.stdout | 10 +-- tests/system_tests/mcle_gradient/gold.stdout | 2 +- 4 files changed, 46 insertions(+), 46 deletions(-) (limited to 'tests') diff --git a/tests/system_tests/controlled_synparse/gold.stdout b/tests/system_tests/controlled_synparse/gold.stdout index fb981cd9..80b3e983 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 ||| Glue=3 F1bad2=1 F5=1 F6=1 F7=1 ||| 0 +0 ||| c d c b e ||| Glue=1 F1bad2=1 F4=1 F5=1 F7=1 ||| 0 +0 ||| c b c d ||| Glue=2 F1bad2=1 F9=1 F6=1 F7=1 ||| 0 +0 ||| b d c b e ||| Glue=1 F1bad1=1 F4=1 F5=1 F7=1 ||| 0 +0 ||| c b c d ||| Glue=1 F1bad2=1 F3=1 F5=1 F7=1 ||| 0 +0 ||| a d c b e ||| Glue=1 F1=1 F4=1 F5=1 F7=1 ||| 0 +0 ||| b b c d ||| Glue=1 F1bad1=1 F3=1 F5=1 F7=1 ||| 0 +0 ||| c d c b ||| Glue=1 F1bad2=1 F2=1 F5=1 F7=1 ||| 0 +0 ||| a b c d ||| Glue=1 F1=1 F3=1 F5=1 F7=1 ||| 0 +0 ||| b b c d ||| Glue=3 F1bad1=1 F5=1 F6=1 F7=1 ||| 0 +0 ||| b d c b ||| Glue=1 F1bad1=1 F2=1 F5=1 F7=1 ||| 0 +0 ||| a d c b ||| Glue=1 F1=1 F2=1 F5=1 F7=1 ||| 0 +0 ||| b b c d ||| Glue=2 F1bad1=1 F9=1 F6=1 F7=1 ||| 0 +0 ||| c c b d ||| Glue=2 F1bad2=1 F8=1 F6=1 F7=1 ||| 0 +0 ||| a b c d ||| Glue=2 F1=1 F9=1 F6=1 F7=1 ||| 0 +0 ||| a b c d ||| Glue=3 F1=1 F5=1 F6=1 F7=1 ||| 0 +0 ||| b c b d ||| Glue=2 F1bad1=1 F8=1 F6=1 F7=1 ||| 0 +0 ||| a c b d ||| Glue=2 F1=1 F8=1 F6=1 F7=1 ||| 0 +1 ||| c b c d ||| Glue=3 F1bad2=1 F5=1 F6=1 F7=1 ||| 0 +1 ||| c d c b e ||| Glue=1 F1bad2=1 F4=1 F5=1 F7=1 ||| 0 +1 ||| c b c d ||| Glue=2 F1bad2=1 F9=1 F6=1 F7=1 ||| 0 +1 ||| b d c b e ||| Glue=1 F1bad1=1 F4=1 F5=1 F7=1 ||| 0 +1 ||| c b c d ||| Glue=1 F1bad2=1 F3=1 F5=1 F7=1 ||| 0 +1 ||| a d c b e ||| Glue=1 F1=1 F4=1 F5=1 F7=1 ||| 0 +1 ||| b b c d ||| Glue=1 F1bad1=1 F3=1 F5=1 F7=1 ||| 0 +1 ||| c d c b ||| Glue=1 F1bad2=1 F2=1 F5=1 F7=1 ||| 0 +1 ||| a b c d ||| Glue=1 F1=1 F3=1 F5=1 F7=1 ||| 0 +1 ||| b b c d ||| Glue=3 F1bad1=1 F5=1 F6=1 F7=1 ||| 0 +1 ||| b d c b ||| Glue=1 F1bad1=1 F2=1 F5=1 F7=1 ||| 0 +1 ||| a d c b ||| Glue=1 F1=1 F2=1 F5=1 F7=1 ||| 0 +1 ||| b b c d ||| Glue=2 F1bad1=1 F9=1 F6=1 F7=1 ||| 0 +1 ||| c c b d ||| Glue=2 F1bad2=1 F8=1 F6=1 F7=1 ||| 0 +1 ||| a b c d ||| Glue=2 F1=1 F9=1 F6=1 F7=1 ||| 0 +1 ||| a b c d ||| Glue=3 F1=1 F5=1 F6=1 F7=1 ||| 0 +1 ||| b c b d ||| Glue=2 F1bad1=1 F8=1 F6=1 F7=1 ||| 0 +1 ||| a c b d ||| Glue=2 F1=1 F8=1 F6=1 F7=1 ||| 0 diff --git a/tests/system_tests/ftrans/gold.stdout b/tests/system_tests/ftrans/gold.stdout index 171dbe98..2000c512 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 ||| Inv=1 F4=1 ||| 101 +0 ||| BC ||| Mono=1 F3=0.4 ||| 6 +0 ||| B C ||| Mono=1 F1=1 OtherFeat=1 F2=0.2 ||| 3 +0 ||| C B ||| Inv=1 F2=0.2 F1=1 OtherFeat=1 ||| 2 diff --git a/tests/system_tests/lattice/gold.stdout b/tests/system_tests/lattice/gold.stdout index 7b0bfdb2..1adb51f1 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 ||| SourceWordPenalty=-0.434294 WordPenalty=-0.434294 Cost=0.1 LatticeCost=0.125 ||| -1.09359 +0 ||| cb ||| SourceWordPenalty=-0.868589 WordPenalty=-0.434294 Cost=0.3 LatticeCost=2.25 ||| -3.85288 +0 ||| a_b ||| SourceWordPenalty=-0.868589 WordPenalty=-0.434294 Cost=0.2 LatticeCost=2.5 ||| -4.00288 +0 ||| a' b ||| Glue=1 SourceWordPenalty=-0.868589 WordPenalty=-0.868589 Cost=0.3 LatticeCost=2.5 ||| -4.53718 +0 ||| a b ||| Glue=1 SourceWordPenalty=-0.868589 WordPenalty=-0.868589 Cost=0.3 LatticeCost=2.5 ||| -4.53718 diff --git a/tests/system_tests/mcle_gradient/gold.stdout b/tests/system_tests/mcle_gradient/gold.stdout index 641b1129..b06c46dd 100644 --- a/tests/system_tests/mcle_gradient/gold.stdout +++ b/tests/system_tests/mcle_gradient/gold.stdout @@ -1 +1 @@ -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 +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 -- cgit v1.2.3