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/12 13:20:16 UTC
[1/2] incubator-joshua git commit: updated kbest extraction test
Repository: incubator-joshua
Updated Branches:
refs/heads/7 bd09600be -> e5b506504
updated kbest extraction test
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/d18b20cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/d18b20cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/d18b20cd
Branch: refs/heads/7
Commit: d18b20cd7bcb34d1b1a4ee98b091671ee002ebcb
Parents: bd09600
Author: Matt Post <po...@cs.jhu.edu>
Authored: Mon Sep 12 15:17:44 2016 +0200
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Mon Sep 12 15:17:44 2016 +0200
----------------------------------------------------------------------
.../resources/kbest_extraction/glue-grammar | 2 +-
.../src/test/resources/kbest_extraction/grammar | 50 ++++++++++----------
.../resources/kbest_extraction/joshua.config | 4 +-
3 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/d18b20cd/joshua-core/src/test/resources/kbest_extraction/glue-grammar
----------------------------------------------------------------------
diff --git a/joshua-core/src/test/resources/kbest_extraction/glue-grammar b/joshua-core/src/test/resources/kbest_extraction/glue-grammar
index 6a1162f..5477420 100644
--- a/joshua-core/src/test/resources/kbest_extraction/glue-grammar
+++ b/joshua-core/src/test/resources/kbest_extraction/glue-grammar
@@ -1,3 +1,3 @@
[GOAL] ||| <s> ||| <s> ||| 0
-[GOAL] ||| [GOAL,1] [X,2] ||| [GOAL,1] [X,2] ||| -1
+[GOAL] ||| [GOAL,1] [X,2] ||| [GOAL,1] [X,2] ||| 1
[GOAL] ||| [GOAL,1] </s> ||| [GOAL,1] </s> ||| 0
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/d18b20cd/joshua-core/src/test/resources/kbest_extraction/grammar
----------------------------------------------------------------------
diff --git a/joshua-core/src/test/resources/kbest_extraction/grammar b/joshua-core/src/test/resources/kbest_extraction/grammar
index a03b2d9..31603b5 100644
--- a/joshua-core/src/test/resources/kbest_extraction/grammar
+++ b/joshua-core/src/test/resources/kbest_extraction/grammar
@@ -1,25 +1,25 @@
-[X] ||| a ||| A ||| 2
-[X] ||| a ||| B ||| 3
-[X] ||| a ||| C ||| 5
-[X] ||| a ||| D ||| 7
-[X] ||| a ||| E ||| 11
-[X] ||| b ||| A ||| 13
-[X] ||| b ||| B ||| 17
-[X] ||| b ||| C ||| 19
-[X] ||| b ||| D ||| 23
-[X] ||| b ||| E ||| 29
-[X] ||| c ||| A ||| 31
-[X] ||| c ||| B ||| 37
-[X] ||| c ||| C ||| 41
-[X] ||| c ||| D ||| 43
-[X] ||| c ||| E ||| 47
-[X] ||| d ||| A ||| 53
-[X] ||| d ||| B ||| 59
-[X] ||| d ||| C ||| 61
-[X] ||| d ||| D ||| 67
-[X] ||| d ||| E ||| 71
-[X] ||| e ||| A ||| 73
-[X] ||| e ||| B ||| 79
-[X] ||| e ||| C ||| 83
-[X] ||| e ||| D ||| 89
-[X] ||| e ||| E ||| 97
+[X] ||| a ||| A ||| -2
+[X] ||| a ||| B ||| -3
+[X] ||| a ||| C ||| -5
+[X] ||| a ||| D ||| -7
+[X] ||| a ||| E ||| -11
+[X] ||| b ||| A ||| -13
+[X] ||| b ||| B ||| -17
+[X] ||| b ||| C ||| -19
+[X] ||| b ||| D ||| -23
+[X] ||| b ||| E ||| -29
+[X] ||| c ||| A ||| -31
+[X] ||| c ||| B ||| -37
+[X] ||| c ||| C ||| -41
+[X] ||| c ||| D ||| -43
+[X] ||| c ||| E ||| -47
+[X] ||| d ||| A ||| -53
+[X] ||| d ||| B ||| -59
+[X] ||| d ||| C ||| -61
+[X] ||| d ||| D ||| -67
+[X] ||| d ||| E ||| -71
+[X] ||| e ||| A ||| -73
+[X] ||| e ||| B ||| -79
+[X] ||| e ||| C ||| -83
+[X] ||| e ||| D ||| -89
+[X] ||| e ||| E ||| -97
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/d18b20cd/joshua-core/src/test/resources/kbest_extraction/joshua.config
----------------------------------------------------------------------
diff --git a/joshua-core/src/test/resources/kbest_extraction/joshua.config b/joshua-core/src/test/resources/kbest_extraction/joshua.config
index 69ec9c9..080fc09 100644
--- a/joshua-core/src/test/resources/kbest_extraction/joshua.config
+++ b/joshua-core/src/test/resources/kbest_extraction/joshua.config
@@ -22,6 +22,6 @@ feature_function = OOVPenalty
# Model Weights ####
lm_0 1
-tm_pt_0 1
-tm_glue_0 1
+pt_0 1
+glue_0 1
OOVPenalty 10000
[2/2] incubator-joshua git commit: Updated phrase-based test case.
Posted by mj...@apache.org.
Updated phrase-based test case.
Output is better but something is still wrong.
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/e5b50650
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/e5b50650
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/e5b50650
Branch: refs/heads/7
Commit: e5b506504757a2306e26bae8aef4bdb455f93990
Parents: d18b20c
Author: Matt Post <po...@cs.jhu.edu>
Authored: Mon Sep 12 15:20:09 2016 +0200
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Mon Sep 12 15:20:09 2016 +0200
----------------------------------------------------------------------
.../joshua/decoder/ff/tm/format/MosesFormatReader.java | 2 +-
joshua-core/src/test/resources/phrase_decoder/config | 8 ++++----
.../src/test/resources/phrase_decoder/constrained.config | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/e5b50650/joshua-core/src/main/java/org/apache/joshua/decoder/ff/tm/format/MosesFormatReader.java
----------------------------------------------------------------------
diff --git a/joshua-core/src/main/java/org/apache/joshua/decoder/ff/tm/format/MosesFormatReader.java b/joshua-core/src/main/java/org/apache/joshua/decoder/ff/tm/format/MosesFormatReader.java
index 4de5bb1..4b549fb 100644
--- a/joshua-core/src/main/java/org/apache/joshua/decoder/ff/tm/format/MosesFormatReader.java
+++ b/joshua-core/src/main/java/org/apache/joshua/decoder/ff/tm/format/MosesFormatReader.java
@@ -78,7 +78,7 @@ public class MosesFormatReader extends HieroFormatReader {
String mosesFeatureString = fields[2];
for (String value: mosesFeatureString.split(" ")) {
float f = Float.parseFloat(value);
- hieroLine.append(String.format(" %f", f <= 0.0 ? -100 : -Math.log(f)));
+ hieroLine.append(String.format(" %f", f <= 0.0 ? -100 : Math.log(f)));
}
// alignments
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/e5b50650/joshua-core/src/test/resources/phrase_decoder/config
----------------------------------------------------------------------
diff --git a/joshua-core/src/test/resources/phrase_decoder/config b/joshua-core/src/test/resources/phrase_decoder/config
index 11e0108..5bf120f 100644
--- a/joshua-core/src/test/resources/phrase_decoder/config
+++ b/joshua-core/src/test/resources/phrase_decoder/config
@@ -22,8 +22,8 @@ OOVPenalty 1.0
Distortion 0.114849
WordPenalty -0.201544
PhrasePenalty -0.236965
-tm_pt_0 0.0370068
-tm_pt_1 0.0495759
-tm_pt_2 0.196742
-tm_pt_3 0.0745423
+pt_0 0.0370068
+pt_1 0.0495759
+pt_2 0.196742
+pt_3 0.0745423
lm_0 0.204412452147565
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/e5b50650/joshua-core/src/test/resources/phrase_decoder/constrained.config
----------------------------------------------------------------------
diff --git a/joshua-core/src/test/resources/phrase_decoder/constrained.config b/joshua-core/src/test/resources/phrase_decoder/constrained.config
index ffa988c..de75422 100644
--- a/joshua-core/src/test/resources/phrase_decoder/constrained.config
+++ b/joshua-core/src/test/resources/phrase_decoder/constrained.config
@@ -21,8 +21,8 @@ OOVPenalty 1.0
Distortion 0.114849
WordPenalty -0.201544
PhrasePenalty -0.236965
-tm_pt_0 0.0370068
-tm_pt_1 0.0495759
-tm_pt_2 0.196742
-tm_pt_3 0.0745423
+pt_0 0.0370068
+pt_1 0.0495759
+pt_2 0.196742
+pt_3 0.0745423
lm_0 0.204412452147565