Fixed TargetBigram test by changing expected gold outputs (flipped glue score and sorted feature output)
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/1c423a2b Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/1c423a2b Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/1c423a2b Branch: refs/heads/7_confsystem Commit: 1c423a2b76ba1ecbdf45b5d2eac20d2270f0b853 Parents: 6de867e Author: Hieber, Felix <fhie...@amazon.de> Authored: Mon Sep 19 10:47:48 2016 +0200 Committer: Hieber, Felix <fhie...@amazon.de> Committed: Mon Sep 19 10:47:48 2016 +0200 ---------------------------------------------------------------------- .../apache/joshua/decoder/cky/TargetBigram.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/1c423a2b/joshua-core/src/test/java/org/apache/joshua/decoder/cky/TargetBigram.java ---------------------------------------------------------------------- diff --git a/joshua-core/src/test/java/org/apache/joshua/decoder/cky/TargetBigram.java b/joshua-core/src/test/java/org/apache/joshua/decoder/cky/TargetBigram.java index add96ef..6bba8c6 100644 --- a/joshua-core/src/test/java/org/apache/joshua/decoder/cky/TargetBigram.java +++ b/joshua-core/src/test/java/org/apache/joshua/decoder/cky/TargetBigram.java @@ -31,9 +31,9 @@ import com.typesafe.config.Config; public class TargetBigram { private static final String INPUT = "this is a test"; - private static final String GOLD_TOPN2 = "this is a test ||| tm_glue_0=4.000 TargetBigram_<s>_this=1.000 TargetBigram_UNK_</s>=1.000 TargetBigram_UNK_UNK=1.000 TargetBigram_is_UNK=1.000 TargetBigram_this_is=1.000 ||| 0.000"; - private static final String GOLD_TOPN3_THRESHOLD20 = "this is a test ||| tm_glue_0=4.000 TargetBigram_<s>_UNK=1.000 TargetBigram_UNK_</s>=1.000 TargetBigram_UNK_UNK=1.000 TargetBigram_UNK_a=1.000 TargetBigram_a_UNK=1.000 ||| 0.000"; - private static final String GOLD_THRESHOLD10 = "this is a test ||| tm_glue_0=4.000 TargetBigram_<s>_UNK=1.000 TargetBigram_UNK_</s>=1.000 TargetBigram_UNK_is=1.000 TargetBigram_a_UNK=1.000 TargetBigram_is_a=1.000 ||| 0.000"; + private static final String GOLD_TOPN2 = "this is a test ||| glue_0=-4.000000 TargetBigram_this_is=1.000000 TargetBigram_is_UNK=1.000000 TargetBigram_UNK_UNK=1.000000 TargetBigram_UNK_</s>=1.000000 TargetBigram_<s>_this=1.000000 ||| 0.000"; + private static final String GOLD_TOPN3_THRESHOLD20 = "this is a test ||| glue_0=-4.000000 TargetBigram_a_UNK=1.000000 TargetBigram_UNK_a=1.000000 TargetBigram_UNK_UNK=1.000000 TargetBigram_UNK_</s>=1.000000 TargetBigram_<s>_UNK=1.000000 ||| 0.000"; + private static final String GOLD_THRESHOLD10 = "this is a test ||| glue_0=-4.000000 TargetBigram_is_a=1.000000 TargetBigram_a_UNK=1.000000 TargetBigram_UNK_is=1.000000 TargetBigram_UNK_</s>=1.000000 TargetBigram_<s>_UNK=1.000000 ||| 0.000"; private static final String VOCAB_PATH = "src/test/resources/decoder/target-bigram/vocab"; private static final String CONF_TOPN2 = "output_format = %s ||| %f ||| %c \n feature_functions = [ { class = TargetBigram, vocab = " @@ -48,22 +48,22 @@ public class TargetBigram { @Test public void givenInput_whenDecodingWithTargetBigramAndTopN2_thenOutputCorrect() { setUp(CONF_TOPN2); - String output = translate(INPUT, decoder); - assertEquals(output.trim(), GOLD_TOPN2); + String output = translate(INPUT, decoder).trim(); + assertEquals(output, GOLD_TOPN2); } @Test public void givenInput_whenDecodingWithTargetBigramAndTopN3Threshold20_thenOutputCorrect() { setUp(CONF_TOPN3_THRESHOLD20); - String output = translate(INPUT, decoder); - assertEquals(output.trim(), GOLD_TOPN3_THRESHOLD20); + String output = translate(INPUT, decoder).trim(); + assertEquals(output, GOLD_TOPN3_THRESHOLD20); } @Test public void givenInput_whenDecodingWithTargetBigramThreshold10_thenOutputCorrect2() { setUp(CONF_THRESHOLD10); - String output = translate(INPUT, decoder); - assertEquals(output.trim(), GOLD_THRESHOLD10); + String output = translate(INPUT, decoder).trim(); + assertEquals(output, GOLD_THRESHOLD10); } public void setUp(String configuration) {