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/08/02 16:22:40 UTC
[1/4] incubator-joshua git commit: HTTP server now projects case
Repository: incubator-joshua
Updated Branches:
refs/heads/demo 1038a1444 -> 84301b9f0
HTTP server now projects case
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/aedeafd0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/aedeafd0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/aedeafd0
Branch: refs/heads/demo
Commit: aedeafd0df1a30ecf686193cd9446ba7e569e84f
Parents: 1038a14
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Aug 2 12:14:22 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Aug 2 12:14:22 2016 -0400
----------------------------------------------------------------------
demo/demo.js | 2 +-
.../java/org/apache/joshua/decoder/StructuredTranslation.java | 7 +++----
.../apache/joshua/decoder/StructuredTranslationFactory.java | 4 ++--
src/main/java/org/apache/joshua/decoder/io/JSONMessage.java | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/aedeafd0/demo/demo.js
----------------------------------------------------------------------
diff --git a/demo/demo.js b/demo/demo.js
index a6a5711..1662fe2 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -221,7 +221,7 @@ function record_results(data, status) {
$(".oov").click(function(e) {
var oov = e.target.innerHTML;
- $("#addPhrase_source").val(oov);
+ $("#addPhrase_source").val(oov.toLowerCase());
$("#addPhrase_target").select();
});
};
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/aedeafd0/src/main/java/org/apache/joshua/decoder/StructuredTranslation.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/StructuredTranslation.java b/src/main/java/org/apache/joshua/decoder/StructuredTranslation.java
index b44a7f0..887f2fc 100644
--- a/src/main/java/org/apache/joshua/decoder/StructuredTranslation.java
+++ b/src/main/java/org/apache/joshua/decoder/StructuredTranslation.java
@@ -88,7 +88,7 @@ public class StructuredTranslation {
* @return the formatted string
*/
public String getFormattedTranslationString() {
- throw new RuntimeException("Not yet implemented");
+ return maybeProjectCase(getTranslationString());
}
public List<String> getTranslationTokens() {
@@ -124,9 +124,8 @@ public class StructuredTranslation {
* If requested, projects source-side lettercase to target, and appends the alignment from
* to the source-side sentence in ||s.
*
- * @param hypothesis todo
- * @param state todo
- * @return source-side lettercase to target, and appends the alignment from to the source-side sentence in ||s
+ * @param hypothesis the string hypothesis
+ * @return source-side lettercase to target, and appends the alignment from to the source-side sentence
*/
private String maybeProjectCase(String hypothesis) {
String output = hypothesis;
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/aedeafd0/src/main/java/org/apache/joshua/decoder/StructuredTranslationFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/StructuredTranslationFactory.java b/src/main/java/org/apache/joshua/decoder/StructuredTranslationFactory.java
index 916a5a7..9be1f1a 100644
--- a/src/main/java/org/apache/joshua/decoder/StructuredTranslationFactory.java
+++ b/src/main/java/org/apache/joshua/decoder/StructuredTranslationFactory.java
@@ -33,6 +33,8 @@ import org.apache.joshua.decoder.ff.FeatureVector;
import org.apache.joshua.decoder.hypergraph.HyperGraph;
import org.apache.joshua.decoder.hypergraph.KBestExtractor.DerivationState;
import org.apache.joshua.decoder.segment_file.Sentence;
+import org.apache.joshua.decoder.segment_file.Token;
+import org.apache.joshua.util.FormatUtils;
/**
* This factory provides methods to create StructuredTranslation objects
@@ -112,6 +114,4 @@ public class StructuredTranslationFactory {
return asList(translationString.split("\\s+"));
}
}
-
-
}
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/aedeafd0/src/main/java/org/apache/joshua/decoder/io/JSONMessage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/io/JSONMessage.java b/src/main/java/org/apache/joshua/decoder/io/JSONMessage.java
index 90a550b..5056aaa 100644
--- a/src/main/java/org/apache/joshua/decoder/io/JSONMessage.java
+++ b/src/main/java/org/apache/joshua/decoder/io/JSONMessage.java
@@ -72,7 +72,7 @@ public class JSONMessage {
// }
public void addTranslation(Translation translation) {
- String viterbi = translation.getStructuredTranslations().get(0).getTranslationString();
+ String viterbi = translation.getStructuredTranslations().get(0).getFormattedTranslationString();
TranslationItem item = addTranslation(viterbi);
[2/4] incubator-joshua git commit: fixed to work with detokenized
output
Posted by mj...@apache.org.
fixed to work with detokenized 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/3387b16b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/3387b16b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/3387b16b
Branch: refs/heads/demo
Commit: 3387b16befb1e8121a05e7b3a13d041bdeb7260b
Parents: aedeafd
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Aug 2 12:19:44 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Aug 2 12:19:44 2016 -0400
----------------------------------------------------------------------
demo/demo.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/3387b16b/demo/demo.js
----------------------------------------------------------------------
diff --git a/demo/demo.js b/demo/demo.js
index 1662fe2..4904757 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -229,8 +229,8 @@ function record_results(data, status) {
/**
* Cleans out OOVs
*/
-function clean_oovs(str) {
- str = str.replace(/(\S+)_OOV/g, "<span class='oov'>$1</span>");
+function clean(str) {
+ str = str.replace(/(\S+?)_OOV/g, "<span class='oov'>$1</span>");
str = str.replace(/ ([\.\?,])/g, "$1");
str = str.replace(/" (.*?) "/g, "\"$1\"");
return str;
[3/4] incubator-joshua git commit: denormalizes output
Posted by mj...@apache.org.
denormalizes 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/ca6fc49d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/ca6fc49d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/ca6fc49d
Branch: refs/heads/demo
Commit: ca6fc49dc853ea07189e65b2df9e77f36bbfd7dd
Parents: 3387b16
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Aug 2 12:20:03 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Aug 2 12:20:03 2016 -0400
----------------------------------------------------------------------
src/main/java/org/apache/joshua/decoder/StructuredTranslation.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/ca6fc49d/src/main/java/org/apache/joshua/decoder/StructuredTranslation.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/StructuredTranslation.java b/src/main/java/org/apache/joshua/decoder/StructuredTranslation.java
index 887f2fc..cb48c0c 100644
--- a/src/main/java/org/apache/joshua/decoder/StructuredTranslation.java
+++ b/src/main/java/org/apache/joshua/decoder/StructuredTranslation.java
@@ -88,7 +88,7 @@ public class StructuredTranslation {
* @return the formatted string
*/
public String getFormattedTranslationString() {
- return maybeProjectCase(getTranslationString());
+ return DeNormalize.processSingleLine(maybeProjectCase(getTranslationString()));
}
public List<String> getTranslationTokens() {
[4/4] incubator-joshua git commit: remove sentence marker
Posted by mj...@apache.org.
remove sentence marker
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/84301b9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/84301b9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/84301b9f
Branch: refs/heads/demo
Commit: 84301b9f04b3ffeecf35432309b1ca762c692313
Parents: ca6fc49
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Aug 2 12:20:10 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Aug 2 12:20:10 2016 -0400
----------------------------------------------------------------------
demo/demo.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/84301b9f/demo/demo.js
----------------------------------------------------------------------
diff --git a/demo/demo.js b/demo/demo.js
index 4904757..38b20e1 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -212,8 +212,8 @@ function record_results(data, status) {
/* This version outputs the 1-best candidate of multiple input sentences */
$(data.data.translations).each(function(i, item) {
// result += item.totalScore + " " + item.hyp + "<br/>\n";
- result += "<li class=\"list-group-item\"><span class=\"badge\">" + (i + 1) + "</span>" + clean_oovs(item.translatedText) + "</li>";
- // result += "<li class=\"list-group-item\">" + clean_oovs(item.translatedText) + "</li>";
+ // result += "<li class=\"list-group-item\"><span class=\"badge\">" + (i + 1) + "</span>" + clean(item.translatedText) + "</li>";
+ result += "<li class=\"list-group-item\">" + clean(item.translatedText) + "</li>";
});
result += "</ul>";