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/06/03 21:01:36 UTC
[05/14] incubator-joshua git commit: minor cleanup
minor cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/3f305f35
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/3f305f35
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/3f305f35
Branch: refs/heads/joshua_api
Commit: 3f305f359620e80d57b3b86d657a9ec2fe80ec33
Parents: f2f82c3
Author: Matt Post <po...@cs.jhu.edu>
Authored: Wed May 25 11:29:59 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Wed May 25 11:29:59 2016 -0400
----------------------------------------------------------------------
src/joshua/decoder/Decoder.java | 10 ++++------
src/joshua/decoder/JoshuaConfiguration.java | 13 -------------
src/joshua/decoder/chart_parser/DotChart.java | 3 ---
src/joshua/decoder/hypergraph/KBestExtractor.java | 5 -----
src/joshua/decoder/hypergraph/ViterbiExtractor.java | 2 --
.../decoder/hypergraph/WordAlignmentExtractor.java | 3 ---
6 files changed, 4 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/3f305f35/src/joshua/decoder/Decoder.java
----------------------------------------------------------------------
diff --git a/src/joshua/decoder/Decoder.java b/src/joshua/decoder/Decoder.java
index fc4ba89..414d547 100644
--- a/src/joshua/decoder/Decoder.java
+++ b/src/joshua/decoder/Decoder.java
@@ -182,9 +182,6 @@ public class Decoder {
/* Where to put translated sentences. */
private final Translations response;
- /* Sometimes we need to communicate with the client even when we didn't get a new sentence
- * (e.g., metadata)
- */
private OutputStream out;
RequestParallelizer(TranslationRequestStream request, Translations response) {
@@ -481,11 +478,12 @@ public class Decoder {
String text;
if (config.moses) {
KBestExtractor extractor = new KBestExtractor(sentence, hg, featureFunctions, weights, false, config);
+
final String mosesFormat = "%i ||| %s ||| %f ||| %c";
int k = 1;
for (DerivationState derivation: extractor) {
- if (k > config.topN)
+ if (k > config.topN || derivation == null)
break;
TranslationFactory factory = new TranslationFactory(sentence, derivation, config);
@@ -691,7 +689,7 @@ public class Decoder {
System.err
.println("You might be using an old version of the config file that is no longer supported");
System.err
- .println("Check joshua-decoder.org or email joshua_support@googlegroups.com for help");
+ .println("Check joshua-decoder.org or email user@joshua.incubator.apache.org for help");
System.exit(17);
}
@@ -699,7 +697,7 @@ public class Decoder {
}
Decoder.LOG(1, String.format("Read %d weights (%d of them dense)", weights.size(),
- DENSE_FEATURE_NAMES.size()));
+ DENSE_FEATURE_NAMES.size()));
// Do this before loading the grammars and the LM.
this.featureFunctions = new ArrayList<FeatureFunction>();
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/3f305f35/src/joshua/decoder/JoshuaConfiguration.java
----------------------------------------------------------------------
diff --git a/src/joshua/decoder/JoshuaConfiguration.java b/src/joshua/decoder/JoshuaConfiguration.java
index 3f20f46..8621382 100644
--- a/src/joshua/decoder/JoshuaConfiguration.java
+++ b/src/joshua/decoder/JoshuaConfiguration.java
@@ -214,14 +214,6 @@ public class JoshuaConfiguration {
*/
public String fragmentMapFile = null;
- /*
- * Whether to use soft syntactic constraint decoding /fuzzy matching, which allows that any
- * nonterminal may be substituted for any other nonterminal (except for OOV and GOAL)
- */
- public boolean fuzzy_matching = false;
-
- public static final String SOFT_SYNTACTIC_CONSTRAINT_DECODING_PROPERTY_NAME = "fuzzy_matching";
-
/***
* Phrase-based decoding parameters.
*/
@@ -568,11 +560,6 @@ public class JoshuaConfiguration {
// add the feature to the list of features for later processing
maxlen = Integer.parseInt(fds[1]);
- } else if (parameter
- .equals(normalize_key(SOFT_SYNTACTIC_CONSTRAINT_DECODING_PROPERTY_NAME))) {
- fuzzy_matching = Boolean.parseBoolean(fds[1]);
- logger.finest(String.format(fuzzy_matching + ": %s", fuzzy_matching));
-
} else if (parameter.equals(normalize_key("fragment-map"))) {
fragmentMapFile = fds[1];
Tree.readMapping(fragmentMapFile);
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/3f305f35/src/joshua/decoder/chart_parser/DotChart.java
----------------------------------------------------------------------
diff --git a/src/joshua/decoder/chart_parser/DotChart.java b/src/joshua/decoder/chart_parser/DotChart.java
index 796256e..b1a16da 100644
--- a/src/joshua/decoder/chart_parser/DotChart.java
+++ b/src/joshua/decoder/chart_parser/DotChart.java
@@ -19,13 +19,10 @@
package joshua.decoder.chart_parser;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import joshua.corpus.Vocabulary;
import joshua.decoder.ff.tm.Grammar;
import joshua.decoder.ff.tm.Rule;
import joshua.decoder.ff.tm.RuleCollection;
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/3f305f35/src/joshua/decoder/hypergraph/KBestExtractor.java
----------------------------------------------------------------------
diff --git a/src/joshua/decoder/hypergraph/KBestExtractor.java b/src/joshua/decoder/hypergraph/KBestExtractor.java
index b8f167c..4d40639 100644
--- a/src/joshua/decoder/hypergraph/KBestExtractor.java
+++ b/src/joshua/decoder/hypergraph/KBestExtractor.java
@@ -18,9 +18,6 @@
*/
package joshua.decoder.hypergraph;
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
import java.util.Arrays;
import java.util.Comparator;
import java.util.ArrayList;
@@ -38,8 +35,6 @@ import joshua.decoder.ff.fragmentlm.Tree;
import joshua.decoder.ff.state_maintenance.DPState;
import joshua.decoder.ff.tm.Rule;
import joshua.decoder.segment_file.Sentence;
-import joshua.decoder.segment_file.Token;
-import joshua.util.FormatUtils;
/**
* This class implements lazy k-best extraction on a hyper-graph.
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/3f305f35/src/joshua/decoder/hypergraph/ViterbiExtractor.java
----------------------------------------------------------------------
diff --git a/src/joshua/decoder/hypergraph/ViterbiExtractor.java b/src/joshua/decoder/hypergraph/ViterbiExtractor.java
index b70446a..8a76240 100644
--- a/src/joshua/decoder/hypergraph/ViterbiExtractor.java
+++ b/src/joshua/decoder/hypergraph/ViterbiExtractor.java
@@ -18,8 +18,6 @@
*/
package joshua.decoder.hypergraph;
-import static java.util.Collections.emptyList;
-
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/3f305f35/src/joshua/decoder/hypergraph/WordAlignmentExtractor.java
----------------------------------------------------------------------
diff --git a/src/joshua/decoder/hypergraph/WordAlignmentExtractor.java b/src/joshua/decoder/hypergraph/WordAlignmentExtractor.java
index cb2f059..15af246 100644
--- a/src/joshua/decoder/hypergraph/WordAlignmentExtractor.java
+++ b/src/joshua/decoder/hypergraph/WordAlignmentExtractor.java
@@ -18,9 +18,6 @@
*/
package joshua.decoder.hypergraph;
-import static java.util.Collections.emptyList;
-
-import java.util.List;
import java.util.Stack;
import joshua.decoder.ff.tm.Rule;