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/22 03:08:15 UTC
[4/4] incubator-joshua git commit: Reverted commit
6d2213a20b74432fc7cb131c732f7507b74053e9,
removed FeatureVector from StructuredTranslation
Reverted commit 6d2213a20b74432fc7cb131c732f7507b74053e9, removed FeatureVector from StructuredTranslation
Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/c01ce779
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/c01ce779
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/c01ce779
Branch: refs/heads/master
Commit: c01ce779c18da9f4eb8411d2a22a3f429e51d2f9
Parents: 6bf0c84
Author: Matt Post <po...@cs.jhu.edu>
Authored: Tue Jun 21 23:08:06 2016 -0400
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Tue Jun 21 23:08:06 2016 -0400
----------------------------------------------------------------------
.../joshua/decoder/StructuredTranslation.java | 18 +++++-------------
.../decoder/StructuredTranslationFactory.java | 6 +++---
2 files changed, 8 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/c01ce779/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 2faacf2..fb97ee7 100644
--- a/src/main/java/org/apache/joshua/decoder/StructuredTranslation.java
+++ b/src/main/java/org/apache/joshua/decoder/StructuredTranslation.java
@@ -45,7 +45,7 @@ public class StructuredTranslation {
private final List<String> translationTokens;
private final float translationScore;
private final List<List<Integer>> translationWordAlignments;
- private final FeatureVector translationFeatures;
+ private final Map<String,Float> translationFeatures;
private final float extractionTime;
public StructuredTranslation(
@@ -54,7 +54,7 @@ public class StructuredTranslation {
final List<String> translationTokens,
final float translationScore,
final List<List<Integer>> translationWordAlignments,
- final FeatureVector translationFeatures,
+ final Map<String,Float> translationFeatures,
final float extractionTime) {
this.sourceSentence = sourceSentence;
this.translationString = translationString;
@@ -83,20 +83,12 @@ public class StructuredTranslation {
}
/**
- * Produces the translation formatted according to the value of {@value JoshuaConfiguration.output_format}.
- * Also includes formatting options such as {@value JoshuaConfiguration.project_case}.
+ * Returns the output string formatted according to {@value JoshuaConfiguration.output_format}.
*
* @return
*/
public String getFormattedTranslationString() {
- JoshuaConfiguration config = sourceSentence.config;
- String outputString = config.outputFormat
- .replace("%s", getTranslationString())
- .replace("%S", DeNormalize.processSingleLine(maybeProjectCase(getTranslationString())))
- .replace("%i", Integer.toString(getSentenceId()))
- .replace("%f", config.moses ? translationFeatures.mosesString() : translationFeatures.toString())
- .replace("%c", String.format("%.3f", getTranslationScore()));
- return outputString;
+ throw new RuntimeException("Not yet implemented");
}
public List<String> getTranslationTokens() {
@@ -116,7 +108,7 @@ public class StructuredTranslation {
}
public Map<String,Float> getTranslationFeatures() {
- return translationFeatures.getMap();
+ return translationFeatures;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/c01ce779/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 4389135..916a5a7 100644
--- a/src/main/java/org/apache/joshua/decoder/StructuredTranslationFactory.java
+++ b/src/main/java/org/apache/joshua/decoder/StructuredTranslationFactory.java
@@ -62,7 +62,7 @@ public class StructuredTranslationFactory {
extractTranslationTokens(translationString),
extractTranslationScore(hypergraph),
getViterbiWordAlignmentList(hypergraph),
- getViterbiFeatures(hypergraph, featureFunctions, sourceSentence),
+ getViterbiFeatures(hypergraph, featureFunctions, sourceSentence).getMap(),
(System.currentTimeMillis() - startTime) / 1000.0f);
}
@@ -73,7 +73,7 @@ public class StructuredTranslationFactory {
*/
public static StructuredTranslation fromEmptyOutput(final Sentence sourceSentence) {
return new StructuredTranslation(
- sourceSentence, "", emptyList(), 0, emptyList(), new FeatureVector(), 0f);
+ sourceSentence, "", emptyList(), 0, emptyList(), emptyMap(), 0f);
}
/**
@@ -93,7 +93,7 @@ public class StructuredTranslationFactory {
extractTranslationTokens(translationString),
derivationState.getModelCost(),
derivationState.getWordAlignmentList(),
- derivationState.getFeatures(),
+ derivationState.getFeatures().getMap(),
(System.currentTimeMillis() - startTime) / 1000.0f);
}