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/17 10:46:16 UTC
[01/12] incubator-joshua git commit: fiddling with demo
Repository: incubator-joshua
Updated Branches:
refs/heads/master fcaf0bf8e -> 2e2ee09b7
fiddling with demo
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/c465e715
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/c465e715
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/c465e715
Branch: refs/heads/master
Commit: c465e71530eecead797f73c06da25f1c0cff28ed
Parents: 0663a9c
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Aug 2 09:08:42 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Aug 2 09:08:42 2016 -0400
----------------------------------------------------------------------
demo/apache_joshua_logo.png | Bin 0 -> 306617 bytes
demo/apache_joshua_logo_faded.png | Bin 0 -> 309216 bytes
demo/demo.js | 3 ++-
demo/index.html | 36 ++++++++++++++++-----------------
4 files changed, 19 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/c465e715/demo/apache_joshua_logo.png
----------------------------------------------------------------------
diff --git a/demo/apache_joshua_logo.png b/demo/apache_joshua_logo.png
new file mode 100644
index 0000000..f2d2423
Binary files /dev/null and b/demo/apache_joshua_logo.png differ
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/c465e715/demo/apache_joshua_logo_faded.png
----------------------------------------------------------------------
diff --git a/demo/apache_joshua_logo_faded.png b/demo/apache_joshua_logo_faded.png
new file mode 100644
index 0000000..28ad01f
Binary files /dev/null and b/demo/apache_joshua_logo_faded.png differ
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/c465e715/demo/demo.js
----------------------------------------------------------------------
diff --git a/demo/demo.js b/demo/demo.js
index e329617..aea4a01 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -224,8 +224,9 @@ function record_results(data, status) {
* Cleans out OOVs
*/
function clean_oovs(str) {
- str = str.replace(/(\S+)_OOV/g, "<span style='color:red'>$1</span>");
+ str = str.replace(/(\S+)_OOV/g, "<span class='oov'>$1</span>");
str = str.replace(/ ([\.\?,])/g, "$1");
+ str = str.replace(/" (.*?) "/g, "\"$1\"");
return str;
}
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/c465e715/demo/index.html
----------------------------------------------------------------------
diff --git a/demo/index.html b/demo/index.html
index 8340b6a..9c014cd 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -17,28 +17,31 @@
<style type="text/css">
/* Move down content because we have a fixed navbar that is 50px tall */
body {
- padding-top: 50px;
- padding-bottom: 20px;
- <!-- background-image: url("apache_joshua_logo.png"); -->
- <!-- background-repeat: no-repeat; -->
- <!-- background-position: -300px -300px; -->
+ background-image: url("apache_joshua_logo_faded.png");
+ background-repeat: no-repeat;
+ background-position: -300px -300px;
+ }
+
+ oov {
+ color: red;
+ font-weight: bold;
+ text-decoration: -300px -300px;
+ }
+
+ .navbar-brand {
+ font-weight: bold;
+ color: black
}
</style>
</head>
<body>
- <nav class="navbar navbar-inverse navbar-fixed-top">
+ <nav class="navbar navbar-static-top">
<div class="container">
<div class="navbar-header">
- <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
<a class="navbar-brand" href="#">
- Apache Joshua Machine Translation Toolkit
+ Apache Joshua Machine Translation Demonstration
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
@@ -56,11 +59,6 @@
</nav>
<!-- Main jumbotron for a primary marketing message or call to action -->
- <div class="page-header">
- <div class="container">
- <h1>Translation Console</h1>
- </div>
- </div>
<div class="container">
<div>
@@ -81,7 +79,7 @@
<div class="panel-body">
<div class="row">
- <div class="col-lg-8">
+ <div class="col-lg-12">
<fieldset class="form-group">
<textarea class="form-control" id="sourceTxt" rows="5" placeholder="Enter sentences one per line and type ^-return or \u2318-return to submit" autofocus="autofocus"></textarea>
</fieldset>
[06/12] 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/master
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>";
[07/12] incubator-joshua git commit: added alignment point in custom
rules
Posted by mj...@apache.org.
added alignment point in custom rules
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/81b33d22
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/81b33d22
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/81b33d22
Branch: refs/heads/master
Commit: 81b33d2218e51bc70f3ef42c2f0cd3c0d3059340
Parents: 84301b9
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Aug 2 12:38:27 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Aug 2 12:38:27 2016 -0400
----------------------------------------------------------------------
demo/demo.js | 4 ++--
src/main/java/org/apache/joshua/server/ServerThread.java | 9 ++++++---
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/81b33d22/demo/demo.js
----------------------------------------------------------------------
diff --git a/demo/demo.js b/demo/demo.js
index 38b20e1..131683b 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -158,8 +158,8 @@ $('#add_rule').click(function() {
var ruleStr = "add_rule [X] ||| " + sourcePhrase + " ||| " + targetPhrase;
// Add word-word alignment if unambiguous
- // if (sourcePhrase.split().length == 1 && targetPhrase.split().length == 1)
- // ruleStr += " ||| ||| 0-0";
+ if (sourcePhrase.split().length == 1 && targetPhrase.split().length == 1)
+ ruleStr += " ||| ||| 0-0";
sendMeta(ruleStr);
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/81b33d22/src/main/java/org/apache/joshua/server/ServerThread.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/server/ServerThread.java b/src/main/java/org/apache/joshua/server/ServerThread.java
index 0301e71..72caa5f 100644
--- a/src/main/java/org/apache/joshua/server/ServerThread.java
+++ b/src/main/java/org/apache/joshua/server/ServerThread.java
@@ -225,15 +225,18 @@ public class ServerThread extends Thread implements HttpHandler {
String source = argTokens[1];
String target = argTokens[2];
String featureStr = "";
+ String alignmentStr = "";
if (argTokens.length > 3)
featureStr = argTokens[3];
-
+ if (argTokens.length > 4)
+ alignmentStr = " ||| " + argTokens[4];
+
/* Prepend source and target side nonterminals for phrase-based decoding. Probably better
* handled in each grammar type's addRule() function.
*/
String ruleString = (joshuaConfiguration.search_algorithm.equals("stack"))
- ? String.format("%s ||| [X,1] %s ||| [X,1] %s ||| custom=1 %s", lhs, source, target, featureStr)
- : String.format("%s ||| %s ||| %s ||| custom=1 %s", lhs, source, target, featureStr);
+ ? String.format("%s ||| [X,1] %s ||| [X,1] %s ||| -1 %s %s", lhs, source, target, featureStr, alignmentStr)
+ : String.format("%s ||| %s ||| %s ||| -1 %s %s", lhs, source, target, featureStr, alignmentStr);
Rule rule = new HieroFormatReader().parseLine(ruleString);
decoder.addCustomRule(rule);
[08/12] incubator-joshua git commit: Merge branch 'master' into demo
Posted by mj...@apache.org.
Merge branch 'master' into demo
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/278be37e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/278be37e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/278be37e
Branch: refs/heads/master
Commit: 278be37e58ffa4fcd12382e8ba7c7a55a7a21b3b
Parents: 81b33d2 fcaf0bf
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Aug 16 07:15:06 2016 +0200
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Aug 16 07:15:06 2016 +0200
----------------------------------------------------------------------
README.md | 4 +-
.../apache/joshua/util/CommandLineParser.java | 738 -------------------
2 files changed, 3 insertions(+), 739 deletions(-)
----------------------------------------------------------------------
[03/12] incubator-joshua git commit: HTTP server now projects case
Posted by mj...@apache.org.
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/master
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);
[09/12] incubator-joshua git commit: added alignment for phrase-based
OOVs
Posted by mj...@apache.org.
added alignment for phrase-based OOVs
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/216d61db
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/216d61db
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/216d61db
Branch: refs/heads/master
Commit: 216d61db80b927315e211a8a75d328a09473cf5a
Parents: fcaf0bf
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Aug 16 07:17:08 2016 +0200
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Aug 16 07:17:08 2016 +0200
----------------------------------------------------------------------
src/main/java/org/apache/joshua/decoder/phrase/PhraseTable.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/216d61db/src/main/java/org/apache/joshua/decoder/phrase/PhraseTable.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/phrase/PhraseTable.java b/src/main/java/org/apache/joshua/decoder/phrase/PhraseTable.java
index 312781f..2c8a3e9 100644
--- a/src/main/java/org/apache/joshua/decoder/phrase/PhraseTable.java
+++ b/src/main/java/org/apache/joshua/decoder/phrase/PhraseTable.java
@@ -130,7 +130,7 @@ public class PhraseTable implements Grammar {
: sourceWord;
int nt_i = Vocabulary.id("[X]");
- Rule oovRule = new Rule(nt_i, new int[] { nt_i, sourceWord }, new int[] { -1, targetWord }, "", 1);
+ Rule oovRule = new Rule(nt_i, new int[] { nt_i, sourceWord }, new int[] { -1, targetWord }, "0-0", 1);
addRule(oovRule);
oovRule.estimateRuleCost(featureFunctions);
[11/12] incubator-joshua git commit: typo fix, added name function
Posted by mj...@apache.org.
typo fix, added name function
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/3e2e053d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/3e2e053d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/3e2e053d
Branch: refs/heads/master
Commit: 3e2e053db9cafcdc5b4885a0f6fa5e54a63bc468
Parents: 216d61d
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Aug 17 06:29:27 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Aug 17 06:29:27 2016 -0400
----------------------------------------------------------------------
.../java/org/apache/joshua/system/LmOovFeatureTest.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/3e2e053d/src/test/java/org/apache/joshua/system/LmOovFeatureTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/joshua/system/LmOovFeatureTest.java b/src/test/java/org/apache/joshua/system/LmOovFeatureTest.java
index e4cddfc..d6fc16d 100644
--- a/src/test/java/org/apache/joshua/system/LmOovFeatureTest.java
+++ b/src/test/java/org/apache/joshua/system/LmOovFeatureTest.java
@@ -55,7 +55,7 @@ public class LmOovFeatureTest {
}
@Test
- public void givenInputWithDifferntOovTypes_whenDecode_thenFeaturesAreAsExpected() throws IOException {
+ public void givenInputWithDifferentOovTypes_whenDecode_thenFeaturesAreAsExpected() throws IOException {
final String translation = decode(INPUT).toString().trim();
System.out.println(translation);
assertEquals(translation, EXPECTED_FEATURES);
@@ -65,5 +65,12 @@ public class LmOovFeatureTest {
final Sentence sentence = new Sentence(input, 0, joshuaConfig);
return decoder.decode(sentence);
}
-
+
+ public static void main(String[] args) throws Exception {
+
+ LmOovFeatureTest test = new LmOovFeatureTest();
+ test.setUp();
+ test.givenInputWithDifferentOovTypes_whenDecode_thenFeaturesAreAsExpected();
+ test.tearDown();
+ }
}
[05/12] 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/master
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() {
[02/12] incubator-joshua git commit: quick add rules for OOVs,
format fiddling
Posted by mj...@apache.org.
quick add rules for OOVs, format fiddling
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/1038a144
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/1038a144
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/1038a144
Branch: refs/heads/master
Commit: 1038a144468b48408f3eca1122efb3c8f84e4537
Parents: c465e71
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Aug 2 09:41:39 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Aug 2 09:41:39 2016 -0400
----------------------------------------------------------------------
demo/README.md | 2 +-
demo/demo.config | 3 +++
demo/demo.js | 6 ++++++
demo/index.html | 7 +++----
4 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/1038a144/demo/README.md
----------------------------------------------------------------------
diff --git a/demo/README.md b/demo/README.md
index 96a7876..d086532 100644
--- a/demo/README.md
+++ b/demo/README.md
@@ -9,7 +9,7 @@ There are two steps:
-feature-function OOVPenalty \
-feature-function "PhrasePenalty -owner custom" \
-weight-overwrite "OOVPenalty 1 PhrasePenalty -1" \
- -mark-oovs
+ -mark-oovs -lowercase -projectcase -output-format %S
Alternately, you can use the config file in this directory, which
contains all the above parameteres, and simply run it like this:
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/1038a144/demo/demo.config
----------------------------------------------------------------------
diff --git a/demo/demo.config b/demo/demo.config
index f10ec32..4c29c9a 100644
--- a/demo/demo.config
+++ b/demo/demo.config
@@ -1,6 +1,9 @@
server-type = http
server-port = 5674
mark-oovs = true
+lowercase = true
+project-case = true
+output-format = %S
feature-function = OOVPenalty
feature-function = PhrasePenalty -owner custom
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/1038a144/demo/demo.js
----------------------------------------------------------------------
diff --git a/demo/demo.js b/demo/demo.js
index aea4a01..a6a5711 100644
--- a/demo/demo.js
+++ b/demo/demo.js
@@ -218,6 +218,12 @@ function record_results(data, status) {
result += "</ul>";
$("#output").html(result);
+
+ $(".oov").click(function(e) {
+ var oov = e.target.innerHTML;
+ $("#addPhrase_source").val(oov);
+ $("#addPhrase_target").select();
+ });
};
/**
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/1038a144/demo/index.html
----------------------------------------------------------------------
diff --git a/demo/index.html b/demo/index.html
index 9c014cd..aa2acd9 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -9,7 +9,7 @@
<meta name="author" content="">
<link rel="icon" href="favicon.ico">
- <title>Apache Joshua Machine Translation Toolkit</title>
+ <title>Apache Joshua Machine Translation Demonstration</title>
<!-- Bootstrap core CSS -->
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
@@ -22,15 +22,14 @@
background-position: -300px -300px;
}
- oov {
+ .oov {
color: red;
font-weight: bold;
- text-decoration: -300px -300px;
+ text-decoration: underline;
}
.navbar-brand {
font-weight: bold;
- color: black
}
</style>
</head>
[12/12] incubator-joshua git commit: Merge branch 'demo'
Posted by mj...@apache.org.
Merge branch 'demo'
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/2e2ee09b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/2e2ee09b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/2e2ee09b
Branch: refs/heads/master
Commit: 2e2ee09b725f2182413219e406ba3fca9d71c00f
Parents: 3e2e053 47f4c96
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed Aug 17 06:46:07 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed Aug 17 06:46:07 2016 -0400
----------------------------------------------------------------------
demo/README.md | 2 +-
demo/apache_joshua_logo.png | Bin 0 -> 306617 bytes
demo/apache_joshua_logo_faded.png | Bin 0 -> 309216 bytes
demo/demo.config | 3 ++
demo/demo.js | 19 +++++++---
demo/index.html | 37 +++++++++----------
.../joshua/decoder/StructuredTranslation.java | 7 ++--
.../decoder/StructuredTranslationFactory.java | 4 +-
.../apache/joshua/decoder/io/JSONMessage.java | 2 +-
.../org/apache/joshua/server/ServerThread.java | 9 +++--
10 files changed, 46 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
[04/12] 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/master
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;
[10/12] incubator-joshua git commit: Merge branch 'master' into demo
Posted by mj...@apache.org.
Merge branch 'master' into demo
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/47f4c969
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/47f4c969
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/47f4c969
Branch: refs/heads/master
Commit: 47f4c969922d5b8339f6fba26d14aa8a228380ef
Parents: 278be37 216d61d
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Aug 16 07:17:20 2016 +0200
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Aug 16 07:17:20 2016 +0200
----------------------------------------------------------------------
src/main/java/org/apache/joshua/decoder/phrase/PhraseTable.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------