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:38:41 UTC
incubator-joshua git commit: added alignment point in custom rules
Repository: incubator-joshua
Updated Branches:
refs/heads/demo 84301b9f0 -> 81b33d221
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/demo
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);