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/22 21:47:40 UTC

[14/27] incubator-joshua git commit: bugfix: this is (probably) supposed to return the pruning estimate

bugfix: this is (probably) supposed to return the pruning estimate


Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/574cb36b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/574cb36b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/574cb36b

Branch: refs/heads/master
Commit: 574cb36b5e1b610e37eda81d6d76b4318c141a4c
Parents: 473b301
Author: Matt Post <po...@cs.jhu.edu>
Authored: Fri Aug 19 19:44:44 2016 -0500
Committer: Matt Post <po...@cs.jhu.edu>
Committed: Fri Aug 19 19:44:44 2016 -0500

----------------------------------------------------------------------
 .../org/apache/joshua/decoder/phrase/Candidate.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/574cb36b/src/main/java/org/apache/joshua/decoder/phrase/Candidate.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/phrase/Candidate.java b/src/main/java/org/apache/joshua/decoder/phrase/Candidate.java
index cb9cd6d..9c7b3d1 100644
--- a/src/main/java/org/apache/joshua/decoder/phrase/Candidate.java
+++ b/src/main/java/org/apache/joshua/decoder/phrase/Candidate.java
@@ -296,12 +296,12 @@ public class Candidate {
    * @return the sum of two costs: the HypoState cost + the transition cost
    */
   public float score() {
-    float score = getHypothesis().getScore() + future_delta;
-    /* 
-     * TODO: you can add this if it's been computed.
-     */
-    if (computedResult != null)
-      score += computedResult.getTransitionCost();
+    float score = computedResult.getPruningEstimate();
+
+//    float score = getHypothesis().getScore() + future_delta;
+//    if (computedResult != null)
+//      score += computedResult.getTransitionCost();
+    
     return score;
   }