Merge cc621a2 into 56f0092

irit-melodi · May 21, 2015 · 189b4f5 · 189b4f5
2 parents 56f0092 + cc621a2
commit 189b4f5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/attelo/decoding/astar.py b/attelo/decoding/astar.py
@@ -453,11 +453,12 @@ class DiscourseBeamSearch(DiscourseSearch, BeamSearch):
 
 
 class Heuristic(Enum):
-    """
-    What sort of right frontier constraint to apply during decoding:
+    """Heuristic cost to guide A* search with
 
-        * simple: every relation is treated as subordinating
-        * full: (falls back to simple in case of unlabelled prediction)
+    * zero: see DiscourseState.h_zero
+    * max: see DiscourseState.h_best_overall
+    * best: see DiscourseState.h_best
+    * average: see DiscourseState.h_average
     """
     zero = 0
     max = 1

diff --git a/attelo/score.py b/attelo/score.py
@@ -207,7 +207,7 @@ def build_confusion_matrix(dpack, predictions):
     # we want the confusion matrices to have the same shape regardless
     # of what labels happen to be used in the particular fold
     # pylint: disable=no-member
-    labels = numpy.arange(1, len(dpack.labels) + 1)
+    labels = numpy.arange(0, len(dpack.labels))
     # pylint: enable=no-member
     return confusion_matrix(dpack.target, pred_target, labels)