You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by mj...@apache.org on 2016/09/15 15:08:20 UTC
[1/5] incubator-joshua git commit: Fixed TooLongTest for 7
Repository: incubator-joshua
Updated Branches:
refs/heads/7 76f7e386e -> c26ef741b
Fixed TooLongTest for 7
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/0d99e4d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/0d99e4d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/0d99e4d4
Branch: refs/heads/7
Commit: 0d99e4d47f868d83afcb34379fbf984a5452dca1
Parents: 1091b9e
Author: Hieber, Felix <fh...@amazon.de>
Authored: Thu Sep 15 16:58:52 2016 +0200
Committer: Hieber, Felix <fh...@amazon.de>
Committed: Thu Sep 15 17:00:39 2016 +0200
----------------------------------------------------------------------
.../test/java/org/apache/joshua/decoder/cky/TooLongTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/0d99e4d4/joshua-core/src/test/java/org/apache/joshua/decoder/cky/TooLongTest.java
----------------------------------------------------------------------
diff --git a/joshua-core/src/test/java/org/apache/joshua/decoder/cky/TooLongTest.java b/joshua-core/src/test/java/org/apache/joshua/decoder/cky/TooLongTest.java
index ca97b95..ad7fb11 100644
--- a/joshua-core/src/test/java/org/apache/joshua/decoder/cky/TooLongTest.java
+++ b/joshua-core/src/test/java/org/apache/joshua/decoder/cky/TooLongTest.java
@@ -31,11 +31,11 @@ import org.testng.annotations.Test;
*/
public class TooLongTest {
private static final String INPUT1 = "as kingfishers draw fire";
- private static final String GOLD1 = "as kingfishers ||| tm_glue_0=2.000 ||| 0.000";
+ private static final String GOLD1 = "as kingfishers ||| glue_0=-2.000000 ||| 0.000";
private static final String INPUT2 = "dragonflies draw flame";
- private static final String GOLD2 = "dragonflies ||| tm_glue_0=1.000 ||| 0.000";
+ private static final String GOLD2 = "dragonflies ||| glue_0=-1.000000 ||| 0.000";
private static final String INPUT3 = "(((as tumbled over rim in roundy wells stones ring";
- private static final String GOLD3 = "(((as tumbled over rim in roundy wells stones ||| tm_glue_0=8.000 ||| 0.000";
+ private static final String GOLD3 = "(((as tumbled over rim in roundy wells stones ||| glue_0=-8.000000 ||| 0.000";
private static final String INPUT4 = "(((like each tucked string tells";
private static final String GOLD4 = "||| ||| 0.000";
[4/5] incubator-joshua git commit: fixed test for new feature ordering
Posted by mj...@apache.org.
fixed test for new feature ordering
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/14af199f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/14af199f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/14af199f
Branch: refs/heads/7
Commit: 14af199f670b5da614386879e84136b90467b5fb
Parents: 76f7e38
Author: Matt Post <po...@cs.jhu.edu>
Authored: Thu Sep 15 17:07:50 2016 +0200
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Thu Sep 15 17:07:50 2016 +0200
----------------------------------------------------------------------
.../joshua/decoder/ff/lm/berkeley_lm/LMGrammarBerkeleyTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/14af199f/joshua-core/src/test/java/org/apache/joshua/decoder/ff/lm/berkeley_lm/LMGrammarBerkeleyTest.java
----------------------------------------------------------------------
diff --git a/joshua-core/src/test/java/org/apache/joshua/decoder/ff/lm/berkeley_lm/LMGrammarBerkeleyTest.java b/joshua-core/src/test/java/org/apache/joshua/decoder/ff/lm/berkeley_lm/LMGrammarBerkeleyTest.java
index 253f57d..2d6aac3 100644
--- a/joshua-core/src/test/java/org/apache/joshua/decoder/ff/lm/berkeley_lm/LMGrammarBerkeleyTest.java
+++ b/joshua-core/src/test/java/org/apache/joshua/decoder/ff/lm/berkeley_lm/LMGrammarBerkeleyTest.java
@@ -35,8 +35,8 @@ import static org.testng.Assert.assertEquals;
public class LMGrammarBerkeleyTest {
private static final String INPUT = "the chat-rooms";
- private static final String EXPECTED_OUTPUT = "glue_0=-2.000000 lm_0=-7.152632\n";
- private static final String EXPECTED_OUTPUT_WITH_OOV = "glue_0=-2.000000 lm_0=-7.152632 lm_0_oov=0.000000\n";
+ private static final String EXPECTED_OUTPUT = "lm_0=-7.152632 glue_0=-2.000000\n";
+ private static final String EXPECTED_OUTPUT_WITH_OOV = "lm_0_oov=0.000000 lm_0=-7.152632 glue_0=-2.000000\n";
private static final String[] OPTIONS = "-v 1 -output-format %f".split(" ");
private JoshuaConfiguration joshuaConfig;
[5/5] incubator-joshua git commit: Merge branch '7_new' of
https://github.com/fhieber/incubator-joshua into 7
Posted by mj...@apache.org.
Merge branch '7_new' of https://github.com/fhieber/incubator-joshua into 7
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/c26ef741
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/c26ef741
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/c26ef741
Branch: refs/heads/7
Commit: c26ef741bbe804aabe79ca3ff95ac186b207e65f
Parents: 14af199 c6cd097
Author: Matt Post <po...@cs.jhu.edu>
Authored: Thu Sep 15 17:08:11 2016 +0200
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Thu Sep 15 17:08:11 2016 +0200
----------------------------------------------------------------------
.../org/apache/joshua/decoder/cky/SourceAnnotationsTest.java | 4 ++--
.../test/java/org/apache/joshua/decoder/cky/TooLongTest.java | 6 +++---
.../test/resources/decoder/source-annotations/joshua.config | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-joshua git commit: Merge remote-tracking branch
'upstream/7' into 7_new
Posted by mj...@apache.org.
Merge remote-tracking branch 'upstream/7' into 7_new
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/c6cd0974
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/c6cd0974
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/c6cd0974
Branch: refs/heads/7
Commit: c6cd09748312f0338c1002f2adb19fd8308fcb7d
Parents: 0d99e4d 76f7e38
Author: Hieber, Felix <fh...@amazon.de>
Authored: Thu Sep 15 17:05:10 2016 +0200
Committer: Hieber, Felix <fh...@amazon.de>
Committed: Thu Sep 15 17:05:10 2016 +0200
----------------------------------------------------------------------
.../src/test/java/org/apache/joshua/system/LmOovFeatureTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/5] incubator-joshua git commit: Fixed SourceAnnotations Test for 7
Posted by mj...@apache.org.
Fixed SourceAnnotations Test for 7
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/1091b9e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/1091b9e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/1091b9e8
Branch: refs/heads/7
Commit: 1091b9e8d49165a2ec9f20b62f3a15b37ffb4dda
Parents: eba33ba
Author: Hieber, Felix <fh...@amazon.de>
Authored: Thu Sep 15 16:57:01 2016 +0200
Committer: Hieber, Felix <fh...@amazon.de>
Committed: Thu Sep 15 17:00:39 2016 +0200
----------------------------------------------------------------------
.../org/apache/joshua/decoder/cky/SourceAnnotationsTest.java | 4 ++--
.../src/test/resources/decoder/source-annotations/joshua.config | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/1091b9e8/joshua-core/src/test/java/org/apache/joshua/decoder/cky/SourceAnnotationsTest.java
----------------------------------------------------------------------
diff --git a/joshua-core/src/test/java/org/apache/joshua/decoder/cky/SourceAnnotationsTest.java b/joshua-core/src/test/java/org/apache/joshua/decoder/cky/SourceAnnotationsTest.java
index 485cf9f..28fc9e3 100644
--- a/joshua-core/src/test/java/org/apache/joshua/decoder/cky/SourceAnnotationsTest.java
+++ b/joshua-core/src/test/java/org/apache/joshua/decoder/cky/SourceAnnotationsTest.java
@@ -30,8 +30,8 @@ import org.testng.annotations.Test;
public class SourceAnnotationsTest {
private static final String INPUT = "mis[tag=ADJ;num=PL;class=OOV] amigos me llaman";
- private static final String GOLD_WITHOUT_ANNOTATIONS = "my friends call me ||| tm_pt_0=-3.000 tm_glue_0=3.000 lm_0=-11.974 OOVPenalty=0.000 WordPenalty=-2.606 ||| -7.650";
- private static final String GOLD_WITH_ANNOTATIONS = "my friends call me ||| tm_pt_0=-3.000 tm_glue_0=3.000 lm_0=-111.513 OOVPenalty=0.000 WordPenalty=-2.606 ||| -107.189";
+ private static final String GOLD_WITHOUT_ANNOTATIONS = "my friends call me ||| pt_0=3.000000 lm_0=-11.973694 glue_0=-3.000000 WordPenalty=-2.605767 ||| -7.650";
+ private static final String GOLD_WITH_ANNOTATIONS = "my friends call me ||| pt_0=3.000000 lm_0=-111.512733 glue_0=-3.000000 WordPenalty=-2.605767 ||| -107.189";
private static final String JOSHUA_CONFIG_PATH = "src/test/resources/decoder/source-annotations/joshua.config";
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/1091b9e8/joshua-core/src/test/resources/decoder/source-annotations/joshua.config
----------------------------------------------------------------------
diff --git a/joshua-core/src/test/resources/decoder/source-annotations/joshua.config b/joshua-core/src/test/resources/decoder/source-annotations/joshua.config
index 788505e..12e99ec 100644
--- a/joshua-core/src/test/resources/decoder/source-annotations/joshua.config
+++ b/joshua-core/src/test/resources/decoder/source-annotations/joshua.config
@@ -121,8 +121,8 @@ lm_0 1.0
# we plan to add a sparse feature representation which will simplify
# this.
-tm_pt_0 0.049141264495762726
-tm_glue_0 0.1663815584150378
+pt_0 -0.049141264495762726
+glue_0 -0.1663815584150378
# The wordpenalty feature counts the number of words in each hypothesis.