new version of cythonized code

4 files changed, 13126 insertions, 11110 deletions

diff --git a/python/cdec/_cdec.cpp b/python/cdec/_cdec.cpp
index ef203fd9..3ffa2dd5 100644
--- a/python/cdec/_cdec.cpp
+++ b/python/cdec/_cdec.cpp
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.19.1 on Fri Nov 15 21:03:05 2013 */
+/* Generated by Cython 0.20.1 on Mon Apr  7 01:23:34 2014 */
 
 #define PY_SSIZE_T_CLEAN
 #ifndef CYTHON_USE_PYLONG_INTERNALS
@@ -19,6 +19,7 @@
 #elif PY_VERSION_HEX < 0x02040000
     #error Cython requires Python 2.4+.
 #else
+#define CYTHON_ABI "0_20_1"
 #include <stddef.h> /* For offsetof */
 #ifndef offsetof
 #define offsetof(type, member) ( (size_t) & ((type*)0) -> member )
@@ -53,6 +54,9 @@
 #define CYTHON_COMPILING_IN_PYPY 0
 #define CYTHON_COMPILING_IN_CPYTHON 1
 #endif
+#if CYTHON_COMPILING_IN_PYPY
+#define Py_OptimizeFlag 0
+#endif
 #if PY_VERSION_HEX < 0x02050000
   typedef int Py_ssize_t;
   #define PY_SSIZE_T_MAX INT_MAX
@@ -60,7 +64,7 @@
   #define PY_FORMAT_SIZE_T ""
   #define CYTHON_FORMAT_SSIZE_T ""
   #define PyInt_FromSsize_t(z) PyInt_FromLong(z)
-  #define PyInt_AsSsize_t(o)   __Pyx_PyInt_AsInt(o)
+  #define PyInt_AsSsize_t(o)   __Pyx_PyInt_As_int(o)
   #define PyNumber_Index(o)    ((PyNumber_Check(o) && !PyFloat_Check(o)) ? PyNumber_Int(o) : \
                                 (PyErr_Format(PyExc_TypeError, \
                                               "expected index value, got %.200s", Py_TYPE(o)->tp_name), \
@@ -112,13 +116,15 @@
 #if PY_MAJOR_VERSION < 3
   #define __Pyx_BUILTIN_MODULE_NAME "__builtin__"
   #define __Pyx_PyCode_New(a, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos) \
-          PyCode_New(a, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)
+          PyCode_New(a+k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)
+  #define __Pyx_DefaultClassType PyClass_Type
 #else
   #define __Pyx_BUILTIN_MODULE_NAME "builtins"
   #define __Pyx_PyCode_New(a, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos) \
           PyCode_New(a, k, l, s, f, code, c, n, v, fv, cell, fn, name, fline, lnos)
+  #define __Pyx_DefaultClassType PyType_Type
 #endif
-#if PY_MAJOR_VERSION < 3 && PY_MINOR_VERSION < 6
+#if PY_VERSION_HEX < 0x02060000
   #define PyUnicode_FromString(s) PyUnicode_Decode(s, strlen(s), "UTF-8", "strict")
 #endif
 #if PY_MAJOR_VERSION >= 3
@@ -131,19 +137,44 @@
 #if PY_VERSION_HEX < 0x02060000
   #define Py_TPFLAGS_HAVE_VERSION_TAG 0
 #endif
+#if PY_VERSION_HEX < 0x02060000 && !defined(Py_TPFLAGS_IS_ABSTRACT)
+  #define Py_TPFLAGS_IS_ABSTRACT 0
+#endif
+#if PY_VERSION_HEX < 0x030400a1 && !defined(Py_TPFLAGS_HAVE_FINALIZE)
+  #define Py_TPFLAGS_HAVE_FINALIZE 0
+#endif
 #if PY_VERSION_HEX > 0x03030000 && defined(PyUnicode_KIND)
   #define CYTHON_PEP393_ENABLED 1
   #define __Pyx_PyUnicode_READY(op)       (likely(PyUnicode_IS_READY(op)) ? \
                                               0 : _PyUnicode_Ready((PyObject *)(op)))
   #define __Pyx_PyUnicode_GET_LENGTH(u)   PyUnicode_GET_LENGTH(u)
   #define __Pyx_PyUnicode_READ_CHAR(u, i) PyUnicode_READ_CHAR(u, i)
+  #define __Pyx_PyUnicode_KIND(u)         PyUnicode_KIND(u)
+  #define __Pyx_PyUnicode_DATA(u)         PyUnicode_DATA(u)
   #define __Pyx_PyUnicode_READ(k, d, i)   PyUnicode_READ(k, d, i)
 #else
   #define CYTHON_PEP393_ENABLED 0
   #define __Pyx_PyUnicode_READY(op)       (0)
   #define __Pyx_PyUnicode_GET_LENGTH(u)   PyUnicode_GET_SIZE(u)
   #define __Pyx_PyUnicode_READ_CHAR(u, i) ((Py_UCS4)(PyUnicode_AS_UNICODE(u)[i]))
-  #define __Pyx_PyUnicode_READ(k, d, i)   ((k=k), (Py_UCS4)(((Py_UNICODE*)d)[i]))
+  #define __Pyx_PyUnicode_KIND(u)         (sizeof(Py_UNICODE))
+  #define __Pyx_PyUnicode_DATA(u)         ((void*)PyUnicode_AS_UNICODE(u))
+  #define __Pyx_PyUnicode_READ(k, d, i)   ((void)(k), (Py_UCS4)(((Py_UNICODE*)d)[i]))
+#endif
+#if CYTHON_COMPILING_IN_PYPY
+  #define __Pyx_PyUnicode_Concat(a, b)      PyNumber_Add(a, b)
+  #define __Pyx_PyUnicode_ConcatSafe(a, b)  PyNumber_Add(a, b)
+#else
+  #define __Pyx_PyUnicode_Concat(a, b)      PyUnicode_Concat(a, b)
+  #define __Pyx_PyUnicode_ConcatSafe(a, b)  ((unlikely((a) == Py_None) || unlikely((b) == Py_None)) ? \
+      PyNumber_Add(a, b) : __Pyx_PyUnicode_Concat(a, b))
+#endif
+#define __Pyx_PyString_FormatSafe(a, b)  ((unlikely((a) == Py_None)) ? PyNumber_Remainder(a, b) : __Pyx_PyString_Format(a, b))
+#define __Pyx_PyUnicode_FormatSafe(a, b)  ((unlikely((a) == Py_None)) ? PyNumber_Remainder(a, b) : PyUnicode_Format(a, b))
+#if PY_MAJOR_VERSION >= 3
+  #define __Pyx_PyString_Format(a, b)  PyUnicode_Format(a, b)
+#else
+  #define __Pyx_PyString_Format(a, b)  PyString_Format(a, b)
 #endif
 #if PY_MAJOR_VERSION >= 3
   #define PyBaseString_Type            PyUnicode_Type
@@ -176,7 +207,7 @@
 #else
   #define __Pyx_PyBaseString_Check(obj) (PyString_CheckExact(obj) || PyUnicode_CheckExact(obj) || \
                                          PyString_Check(obj) || PyUnicode_Check(obj))
-  #define __Pyx_PyBaseString_CheckExact(obj) (Py_TYPE(obj) == &PyBaseString_Type)
+  #define __Pyx_PyBaseString_CheckExact(obj) (PyString_CheckExact(obj) || PyUnicode_CheckExact(obj))
 #endif
 #if PY_VERSION_HEX < 0x02060000
   #define PySet_Check(obj)             PyObject_TypeCheck(obj, &PySet_Type)
@@ -201,11 +232,12 @@
   #define PyInt_AsSsize_t              PyLong_AsSsize_t
   #define PyInt_AsUnsignedLongMask     PyLong_AsUnsignedLongMask
   #define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask
+  #define PyNumber_Int                 PyNumber_Long
 #endif
 #if PY_MAJOR_VERSION >= 3
   #define PyBoolObject                 PyLongObject
 #endif
-#if PY_VERSION_HEX < 0x03020000
+#if PY_VERSION_HEX < 0x030200A4
   typedef long Py_hash_t;
   #define __Pyx_PyInt_FromHash_t PyInt_FromLong
   #define __Pyx_PyInt_AsHash_t   PyInt_AsLong
@@ -264,7 +296,7 @@
 #ifndef CYTHON_RESTRICT
   #if defined(__GNUC__)
     #define CYTHON_RESTRICT __restrict__
-  #elif defined(_MSC_VER)
+  #elif defined(_MSC_VER) && _MSC_VER >= 1400
     #define CYTHON_RESTRICT __restrict
   #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
     #define CYTHON_RESTRICT restrict
@@ -376,8 +408,20 @@ typedef struct {PyObject **p; char *s; const Py_ssize_t n; const char* encoding;
 #define __PYX_DEFAULT_STRING_ENCODING ""
 #define __Pyx_PyObject_FromString __Pyx_PyBytes_FromString
 #define __Pyx_PyObject_FromStringAndSize __Pyx_PyBytes_FromStringAndSize
+#define __Pyx_fits_Py_ssize_t(v, type, is_signed)  (    \
+    (sizeof(type) < sizeof(Py_ssize_t))  ||             \
+    (sizeof(type) > sizeof(Py_ssize_t) &&               \
+          likely(v < (type)PY_SSIZE_T_MAX ||            \
+                 v == (type)PY_SSIZE_T_MAX)  &&         \
+          (!is_signed || likely(v > (type)PY_SSIZE_T_MIN ||       \
+                                v == (type)PY_SSIZE_T_MIN)))  ||  \
+    (sizeof(type) == sizeof(Py_ssize_t) &&              \
+          (is_signed || likely(v < (type)PY_SSIZE_T_MAX ||        \
+                               v == (type)PY_SSIZE_T_MAX)))  )
 static CYTHON_INLINE char* __Pyx_PyObject_AsString(PyObject*);
 static CYTHON_INLINE char* __Pyx_PyObject_AsStringAndSize(PyObject*, Py_ssize_t* length);
+#define __Pyx_PyByteArray_FromString(s) PyByteArray_FromStringAndSize((const char*)s, strlen((const char*)s))
+#define __Pyx_PyByteArray_FromStringAndSize(s, l) PyByteArray_FromStringAndSize((const char*)s, l)
 #define __Pyx_PyBytes_FromString        PyBytes_FromString
 #define __Pyx_PyBytes_FromStringAndSize PyBytes_FromStringAndSize
 static CYTHON_INLINE PyObject* __Pyx_PyUnicode_FromString(char*);
@@ -388,9 +432,11 @@ static CYTHON_INLINE PyObject* __Pyx_PyUnicode_FromString(char*);
     #define __Pyx_PyStr_FromString        __Pyx_PyUnicode_FromString
     #define __Pyx_PyStr_FromStringAndSize __Pyx_PyUnicode_FromStringAndSize
 #endif
+#define __Pyx_PyObject_AsSString(s)    ((signed char*) __Pyx_PyObject_AsString(s))
 #define __Pyx_PyObject_AsUString(s)    ((unsigned char*) __Pyx_PyObject_AsString(s))
 #define __Pyx_PyObject_FromUString(s)  __Pyx_PyObject_FromString((char*)s)
 #define __Pyx_PyBytes_FromUString(s)   __Pyx_PyBytes_FromString((char*)s)
+#define __Pyx_PyByteArray_FromUString(s)   __Pyx_PyByteArray_FromString((char*)s)
 #define __Pyx_PyStr_FromUString(s)     __Pyx_PyStr_FromString((char*)s)
 #define __Pyx_PyUnicode_FromUString(s) __Pyx_PyUnicode_FromString((char*)s)
 #if PY_MAJOR_VERSION < 3
@@ -412,7 +458,6 @@ static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject*);
 static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);
 static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);
 static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);
-static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject*);
 #if CYTHON_COMPILING_IN_CPYTHON
 #define __pyx_PyFloat_AsDouble(x) (PyFloat_CheckExact(x) ? PyFloat_AS_DOUBLE(x) : PyFloat_AsDouble(x))
 #else
@@ -421,7 +466,7 @@ static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject*);
 #define __pyx_PyFloat_AsFloat(x) ((float) __pyx_PyFloat_AsDouble(x))
 #if PY_MAJOR_VERSION < 3 && __PYX_DEFAULT_STRING_ENCODING_IS_ASCII
 static int __Pyx_sys_getdefaultencoding_not_ascii;
-static int __Pyx_init_sys_getdefaultencoding_params() {
+static int __Pyx_init_sys_getdefaultencoding_params(void) {
     PyObject* sys = NULL;
     PyObject* default_encoding = NULL;
     PyObject* ascii_chars_u = NULL;
@@ -446,7 +491,7 @@ static int __Pyx_init_sys_getdefaultencoding_params() {
         if (ascii_chars_b == NULL || strncmp(ascii_chars, PyBytes_AS_STRING(ascii_chars_b), 128) != 0) {
             PyErr_Format(
                 PyExc_ValueError,
-                "This module compiled with c_string_encoding=ascii, but default encoding '%s' is not a superset of ascii.",
+                "This module compiled with c_string_encoding=ascii, but default encoding '%.200s' is not a superset of ascii.",
                 default_encoding_c);
             goto bad;
         }
@@ -470,7 +515,7 @@ bad:
 #define __Pyx_PyUnicode_FromStringAndSize(c_str, size) PyUnicode_Decode(c_str, size, __PYX_DEFAULT_STRING_ENCODING, NULL)
 #if __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT
 static char* __PYX_DEFAULT_STRING_ENCODING;
-static int __Pyx_init_sys_getdefaultencoding_params() {
+static int __Pyx_init_sys_getdefaultencoding_params(void) {
     PyObject* sys = NULL;
     PyObject* default_encoding = NULL;
     char* default_encoding_c;
@@ -525,60 +570,61 @@ static const char *__pyx_f[] = {
   "hypergraph.pxi",
   "lattice.pxi",
   "mteval.pxi",
+  "stringsource",
   "_sa.pxd",
 };
 
 /*--- Type declarations ---*/
+struct __pyx_obj_4cdec_2sa_3_sa_FloatList;
+struct __pyx_obj_4cdec_2sa_3_sa_IntList;
 struct __pyx_obj_4cdec_2sa_3_sa_FeatureVector;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__;
+struct __pyx_obj_4cdec_2sa_3_sa_Phrase;
+struct __pyx_obj_4cdec_2sa_3_sa_Rule;
 struct __pyx_obj_4cdec_5_cdec_DenseVector;
-struct __pyx_obj_4cdec_5_cdec_SufficientStats;
-struct __pyx_obj_4cdec_5_cdec_TRule;
-struct __pyx_obj_4cdec_5_cdec_MRule;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__;
-struct __pyx_obj_4cdec_5_cdec_Metric;
-struct __pyx_obj_4cdec_2sa_3_sa_IntList;
 struct __pyx_obj_4cdec_5_cdec_SparseVector;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__;
 struct __pyx_obj_4cdec_5_cdec_NT;
-struct __pyx_obj_4cdec_5_cdec_Lattice;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config;
-struct __pyx_obj_4cdec_5_cdec_HypergraphEdge;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__;
-struct __pyx_obj_4cdec_2sa_3_sa_Rule;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines;
-struct __pyx_obj_4cdec_5_cdec_Scorer;
-struct __pyx_obj_4cdec_5_cdec_HypergraphNode;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features;
 struct __pyx_obj_4cdec_5_cdec_NTRef;
+struct __pyx_obj_4cdec_5_cdec_TRule;
+struct __pyx_obj_4cdec_5_cdec_MRule;
 struct __pyx_obj_4cdec_5_cdec_Grammar;
+struct __pyx_obj_4cdec_5_cdec_TextGrammar;
 struct __pyx_obj_4cdec_5_cdec_Hypergraph;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__;
+struct __pyx_obj_4cdec_5_cdec_HypergraphEdge;
+struct __pyx_obj_4cdec_5_cdec_HypergraphNode;
+struct __pyx_obj_4cdec_5_cdec_Lattice;
+struct __pyx_obj_4cdec_5_cdec_Candidate;
+struct __pyx_obj_4cdec_5_cdec_SufficientStats;
 struct __pyx_obj_4cdec_5_cdec_CandidateSet;
-struct __pyx_obj_4cdec_2sa_3_sa_FloatList;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__;
 struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr;
+struct __pyx_obj_4cdec_5_cdec_Scorer;
+struct __pyx_obj_4cdec_5_cdec_Metric;
+struct __pyx_obj_4cdec_5_cdec_Decoder;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase;
 struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__;
 struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__;
 struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__;
-struct __pyx_obj_4cdec_2sa_3_sa_Phrase;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__;
-struct __pyx_obj_4cdec_5_cdec_TextGrammar;
-struct __pyx_obj_4cdec_5_cdec_Decoder;
-struct __pyx_obj_4cdec_5_cdec_Candidate;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__;
 struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_17___get__;
 struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_18___iter__;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__;
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__;
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr;
 struct __pyx_opt_args_4cdec_5_cdec_as_str;
 
 /* "cdec/_cdec.pyx":6
@@ -593,6 +639,40 @@ struct __pyx_opt_args_4cdec_5_cdec_as_str {
   char *error_msg;
 };
 
+/* "cdec/sa/_sa.pxd":3
+ * from libc.stdio cimport FILE
+ * 
+ * cdef class FloatList:             # <<<<<<<<<<<<<<
+ *     cdef int size
+ *     cdef int increment
+ */
+struct __pyx_obj_4cdec_2sa_3_sa_FloatList {
+  PyObject_HEAD
+  struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList *__pyx_vtab;
+  int size;
+  int increment;
+  int len;
+  float *arr;
+};
+
+
+/* "cdec/sa/_sa.pxd":12
+ *     cdef void read_handle(self, FILE* f)
+ * 
+ * cdef class IntList:             # <<<<<<<<<<<<<<
+ *     cdef int size
+ *     cdef int increment
+ */
+struct __pyx_obj_4cdec_2sa_3_sa_IntList {
+  PyObject_HEAD
+  struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *__pyx_vtab;
+  int size;
+  int increment;
+  int len;
+  int *arr;
+};
+
+
 /* "cdec/sa/_sa.pxd":25
  *     cdef void read_handle(self, FILE* f)
  * 
@@ -607,23 +687,42 @@ struct __pyx_obj_4cdec_2sa_3_sa_FeatureVector {
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":90
- *         return candidate
+/* "cdec/sa/_sa.pxd":29
+ *     cdef FloatList values
  * 
- *     def __iter__(self):             # <<<<<<<<<<<<<<
- *         cdef unsigned i
- *         for i in range(len(self)):
+ * cdef class Phrase:             # <<<<<<<<<<<<<<
+ *     cdef int *syms
+ *     cdef int n, *varpos, n_vars
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ {
+struct __pyx_obj_4cdec_2sa_3_sa_Phrase {
   PyObject_HEAD
-  unsigned int __pyx_v_i;
-  struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self;
-  Py_ssize_t __pyx_t_0;
-  unsigned int __pyx_t_1;
+  struct __pyx_vtabstruct_4cdec_2sa_3_sa_Phrase *__pyx_vtab;
+  int *syms;
+  int n;
+  int *varpos;
+  int n_vars;
+};
+
+
+/* "cdec/sa/_sa.pxd":35
+ *     cdef public int chunklen(self, int k)
+ * 
+ * cdef class Rule:             # <<<<<<<<<<<<<<
+ *     cdef int lhs
+ *     cdef readonly Phrase f, e
+ */
+struct __pyx_obj_4cdec_2sa_3_sa_Rule {
+  PyObject_HEAD
+  int lhs;
+  struct __pyx_obj_4cdec_2sa_3_sa_Phrase *f;
+  struct __pyx_obj_4cdec_2sa_3_sa_Phrase *e;
+  struct __pyx_obj_4cdec_2sa_3_sa_FeatureVector *scores;
+  int n_scores;
+  PyObject *word_alignments;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":3
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":3
  * from cython.operator cimport preincrement as pinc
  * 
  * cdef class DenseVector:             # <<<<<<<<<<<<<<
@@ -637,21 +736,47 @@ struct __pyx_obj_4cdec_5_cdec_DenseVector {
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":26
- *             return fmap
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":48
+ *         return sparse
+ * 
+ * cdef class SparseVector:             # <<<<<<<<<<<<<<
+ *     cdef FastSparseVector[weight_t]* vector
  * 
- * cdef class SufficientStats:             # <<<<<<<<<<<<<<
- *     cdef mteval.SufficientStats* stats
- *     cdef mteval.EvaluationMetric* metric
  */
-struct __pyx_obj_4cdec_5_cdec_SufficientStats {
+struct __pyx_obj_4cdec_5_cdec_SparseVector {
   PyObject_HEAD
-  SufficientStats *stats;
-  EvaluationMetric *metric;
+  FastSparseVector<weight_t> *vector;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":49
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":8
+ *     return ' '.join(w.encode('utf8') if isinstance(w, unicode) else str(w) for w in phrase)
+ * 
+ * cdef class NT:             # <<<<<<<<<<<<<<
+ *     cdef public bytes cat
+ *     cdef public unsigned ref
+ */
+struct __pyx_obj_4cdec_5_cdec_NT {
+  PyObject_HEAD
+  PyObject *cat;
+  unsigned int ref;
+};
+
+
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":21
+ *         return '[%s]' % self.cat
+ * 
+ * cdef class NTRef:             # <<<<<<<<<<<<<<
+ *     cdef public unsigned ref
+ *     def __init__(self, unsigned ref):
+ */
+struct __pyx_obj_4cdec_5_cdec_NTRef {
+  PyObject_HEAD
+  unsigned int ref;
+};
+
+
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":49
  *     return TRule(lhs, f, e, scores, a)
  * 
  * cdef class TRule:             # <<<<<<<<<<<<<<
@@ -664,7 +789,7 @@ struct __pyx_obj_4cdec_5_cdec_TRule {
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":177
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":183
  *                 _phrase(self.f), _phrase(self.e), scores)
  * 
  * cdef class MRule(TRule):             # <<<<<<<<<<<<<<
@@ -676,97 +801,78 @@ struct __pyx_obj_4cdec_5_cdec_MRule {
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":44
- *         return self.stats.size()
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":199
+ *         super(MRule, self).__init__(lhs, rhs, e, scores, None)
  * 
- *     def __iter__(self):             # <<<<<<<<<<<<<<
- *         for i in range(len(self)):
- *             yield self[i]
- */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ {
-  PyObject_HEAD
-  PyObject *__pyx_v_i;
-  struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self;
-  Py_ssize_t __pyx_t_0;
-  PyObject *__pyx_t_1;
-  PyObject *(*__pyx_t_2)(PyObject *);
-};
-
-
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":176
- *         out.fields[i] = ss[i]
+ * cdef class Grammar:             # <<<<<<<<<<<<<<
+ *     cdef shared_ptr[grammar.Grammar]* grammar
  * 
- * cdef class Metric:             # <<<<<<<<<<<<<<
- *     cdef Scorer scorer
- *     def __cinit__(self):
  */
-struct __pyx_obj_4cdec_5_cdec_Metric {
+struct __pyx_obj_4cdec_5_cdec_Grammar {
   PyObject_HEAD
-  struct __pyx_obj_4cdec_5_cdec_Scorer *scorer;
+  boost::shared_ptr<Grammar> *grammar;
 };
 
 
-/* "cdec/sa/_sa.pxd":12
- *     cdef void read_handle(self, FILE* f)
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":223
+ *             self.grammar.get().SetGrammarName(name)
  * 
- * cdef class IntList:             # <<<<<<<<<<<<<<
- *     cdef int size
- *     cdef int increment
+ * cdef class TextGrammar(Grammar):             # <<<<<<<<<<<<<<
+ *     def __init__(self, rules):
+ *         """TextGrammar(rules) -> SCFG Grammar containing the rules."""
  */
-struct __pyx_obj_4cdec_2sa_3_sa_IntList {
-  PyObject_HEAD
-  struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *__pyx_vtab;
-  int size;
-  int increment;
-  int len;
-  int *arr;
+struct __pyx_obj_4cdec_5_cdec_TextGrammar {
+  struct __pyx_obj_4cdec_5_cdec_Grammar __pyx_base;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":48
- *         return sparse
- * 
- * cdef class SparseVector:             # <<<<<<<<<<<<<<
- *     cdef FastSparseVector[weight_t]* vector
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":4
+ * cimport kbest
  * 
+ * cdef class Hypergraph:             # <<<<<<<<<<<<<<
+ *     cdef hypergraph.Hypergraph* hg
+ *     cdef MT19937* rng
  */
-struct __pyx_obj_4cdec_5_cdec_SparseVector {
+struct __pyx_obj_4cdec_5_cdec_Hypergraph {
   PyObject_HEAD
-  FastSparseVector<weight_t> *vector;
+  struct __pyx_vtabstruct_4cdec_5_cdec_Hypergraph *__pyx_vtab;
+  Hypergraph *hg;
+  MT19937 *rng;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":216
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":196
+ *         return vector
  * 
- *     property tail_nodes:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef unsigned i
- *             for i in range(self.edge.tail_nodes_.size()):
+ * cdef class HypergraphEdge:             # <<<<<<<<<<<<<<
+ *     cdef hypergraph.Hypergraph* hg
+ *     cdef hypergraph.HypergraphEdge* edge
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ {
+struct __pyx_obj_4cdec_5_cdec_HypergraphEdge {
   PyObject_HEAD
-  unsigned int __pyx_v_i;
-  struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *__pyx_v_self;
-  unsigned int __pyx_t_0;
-  unsigned int __pyx_t_1;
+  struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphEdge *__pyx_vtab;
+  Hypergraph *hg;
+  Hypergraph::Edge *edge;
+  struct __pyx_obj_4cdec_5_cdec_TRule *trule;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":8
- *     return ' '.join(w.encode('utf8') if isinstance(w, unicode) else str(w) for w in phrase)
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":246
+ *         raise NotImplemented('comparison not implemented for HypergraphEdge')
  * 
- * cdef class NT:             # <<<<<<<<<<<<<<
- *     cdef public bytes cat
- *     cdef public unsigned ref
+ * cdef class HypergraphNode:             # <<<<<<<<<<<<<<
+ *     cdef hypergraph.Hypergraph* hg
+ *     cdef hypergraph.HypergraphNode* node
  */
-struct __pyx_obj_4cdec_5_cdec_NT {
+struct __pyx_obj_4cdec_5_cdec_HypergraphNode {
   PyObject_HEAD
-  PyObject *cat;
-  unsigned int ref;
+  struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphNode *__pyx_vtab;
+  Hypergraph *hg;
+  Hypergraph::Node *node;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":3
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":3
  * cimport lattice
  * 
  * cdef class Lattice:             # <<<<<<<<<<<<<<
@@ -779,116 +885,64 @@ struct __pyx_obj_4cdec_5_cdec_Lattice {
 };
 
 
-/* "cdec/_cdec.pyx":32
- *     SetSilent(yn)
- * 
- * def _make_config(config):             # <<<<<<<<<<<<<<
- *     for key, value in config.items():
- *         if isinstance(value, dict):
- */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config {
-  PyObject_HEAD
-  PyObject *__pyx_v_config;
-  PyObject *__pyx_v_info;
-  PyObject *__pyx_v_key;
-  PyObject *__pyx_v_name;
-  PyObject *__pyx_v_value;
-  PyObject *__pyx_t_0;
-  PyObject *__pyx_t_1;
-  Py_ssize_t __pyx_t_2;
-  PyObject *(*__pyx_t_3)(PyObject *);
-  Py_ssize_t __pyx_t_4;
-  PyObject *(*__pyx_t_5)(PyObject *);
-};
-
-
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":196
- *         return vector
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":12
+ *         return stats
  * 
- * cdef class HypergraphEdge:             # <<<<<<<<<<<<<<
- *     cdef hypergraph.Hypergraph* hg
- *     cdef hypergraph.HypergraphEdge* edge
+ * cdef class Candidate:             # <<<<<<<<<<<<<<
+ *     cdef mteval.const_Candidate* candidate
+ *     cdef public float score
  */
-struct __pyx_obj_4cdec_5_cdec_HypergraphEdge {
+struct __pyx_obj_4cdec_5_cdec_Candidate {
   PyObject_HEAD
-  struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphEdge *__pyx_vtab;
-  Hypergraph *hg;
-  Hypergraph::Edge *edge;
-  struct __pyx_obj_4cdec_5_cdec_TRule *trule;
+  const training::Candidate *candidate;
+  float score;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":5
- * import cdec.sa._sa as _sa
- * 
- * def _phrase(phrase):             # <<<<<<<<<<<<<<
- *     return ' '.join(w.encode('utf8') if isinstance(w, unicode) else str(w) for w in phrase)
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":26
+ *             return fmap
  * 
+ * cdef class SufficientStats:             # <<<<<<<<<<<<<<
+ *     cdef mteval.SufficientStats* stats
+ *     cdef mteval.EvaluationMetric* metric
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase {
+struct __pyx_obj_4cdec_5_cdec_SufficientStats {
   PyObject_HEAD
-  PyObject *__pyx_v_phrase;
+  SufficientStats *stats;
+  EvaluationMetric *metric;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":161
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":65
+ *         return result
  * 
- *     property edges:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef unsigned i
- *             for i in range(self.hg.edges_.size()):
+ * cdef class CandidateSet:             # <<<<<<<<<<<<<<
+ *     cdef shared_ptr[mteval.SegmentEvaluator]* scorer
+ *     cdef mteval.EvaluationMetric* metric
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ {
+struct __pyx_obj_4cdec_5_cdec_CandidateSet {
   PyObject_HEAD
-  unsigned int __pyx_v_i;
-  struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self;
-  size_t __pyx_t_0;
-  unsigned int __pyx_t_1;
+  boost::shared_ptr<SegmentEvaluator> *scorer;
+  EvaluationMetric *metric;
+  training::CandidateSet *cs;
 };
 
 
-/* "cdec/sa/_sa.pxd":35
- *     cdef public int chunklen(self, int k)
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":100
+ *         self.cs.AddKBestCandidates(hypergraph.hg[0], k, self.scorer.get())
  * 
- * cdef class Rule:             # <<<<<<<<<<<<<<
- *     cdef int lhs
- *     cdef readonly Phrase f, e
- */
-struct __pyx_obj_4cdec_2sa_3_sa_Rule {
-  PyObject_HEAD
-  int lhs;
-  struct __pyx_obj_4cdec_2sa_3_sa_Phrase *f;
-  struct __pyx_obj_4cdec_2sa_3_sa_Phrase *e;
-  struct __pyx_obj_4cdec_2sa_3_sa_FeatureVector *scores;
-  int n_scores;
-  PyObject *word_alignments;
-};
-
-
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":63
- *     def todot(self):
- *         """lattice.todot() -> Representation of the lattice in GraphViz dot format."""
- *         def lines():             # <<<<<<<<<<<<<<
- *             yield 'digraph lattice {'
- *             yield 'rankdir = LR;'
+ * cdef class SegmentEvaluator:             # <<<<<<<<<<<<<<
+ *     cdef shared_ptr[mteval.SegmentEvaluator]* scorer
+ *     cdef mteval.EvaluationMetric* metric
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines {
+struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator {
   PyObject_HEAD
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *__pyx_outer_scope;
-  PyObject *__pyx_v_delta;
-  PyObject *__pyx_v_i;
-  PyObject *__pyx_v_label;
-  PyObject *__pyx_v_weight;
-  Py_ssize_t __pyx_t_0;
-  PyObject *__pyx_t_1;
-  PyObject *(*__pyx_t_2)(PyObject *);
-  PyObject *__pyx_t_3;
-  Py_ssize_t __pyx_t_4;
-  PyObject *(*__pyx_t_5)(PyObject *);
+  boost::shared_ptr<SegmentEvaluator> *scorer;
+  EvaluationMetric *metric;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":121
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":121
  *         return CandidateSet(self)
  * 
  * cdef class Scorer:             # <<<<<<<<<<<<<<
@@ -902,164 +956,114 @@ struct __pyx_obj_4cdec_5_cdec_Scorer {
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":246
- *         raise NotImplemented('comparison not implemented for HypergraphEdge')
- * 
- * cdef class HypergraphNode:             # <<<<<<<<<<<<<<
- *     cdef hypergraph.Hypergraph* hg
- *     cdef hypergraph.HypergraphNode* node
- */
-struct __pyx_obj_4cdec_5_cdec_HypergraphNode {
-  PyObject_HEAD
-  struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphNode *__pyx_vtab;
-  Hypergraph *hg;
-  Hypergraph::Node *node;
-};
-
-
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":81
- *             del e_derivations
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":176
+ *         out.fields[i] = ss[i]
  * 
- *     def kbest_features(self, size):             # <<<<<<<<<<<<<<
- *         """hg.kbest_trees(size) -> List of k-best feature vectors in the hypergraph."""
- *         cdef kbest.KBestDerivations[FastSparseVector[weight_t], kbest.FeatureVectorTraversal]* derivations = new kbest.KBestDerivations[FastSparseVector[weight_t], kbest.FeatureVectorTraversal](self.hg[0], size)
+ * cdef class Metric:             # <<<<<<<<<<<<<<
+ *     cdef Scorer scorer
+ *     def __cinit__(self):
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features {
+struct __pyx_obj_4cdec_5_cdec_Metric {
   PyObject_HEAD
-  KBest::KBestDerivations<FastSparseVector<weight_t>,FeatureVectorTraversal>::Derivation *__pyx_v_derivation;
-  KBest::KBestDerivations<FastSparseVector<weight_t>,FeatureVectorTraversal> *__pyx_v_derivations;
-  struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_fmap;
-  unsigned int __pyx_v_k;
-  struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self;
-  PyObject *__pyx_v_size;
-  unsigned int __pyx_t_0;
-  long __pyx_t_1;
+  struct __pyx_obj_4cdec_5_cdec_Scorer *scorer;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":21
- *         return '[%s]' % self.cat
+/* "cdec/_cdec.pyx":43
+ *             yield key, str(value)
  * 
- * cdef class NTRef:             # <<<<<<<<<<<<<<
- *     cdef public unsigned ref
- *     def __init__(self, unsigned ref):
+ * cdef class Decoder:             # <<<<<<<<<<<<<<
+ *     cdef decoder.Decoder* dec
+ *     cdef DenseVector weights
  */
-struct __pyx_obj_4cdec_5_cdec_NTRef {
+struct __pyx_obj_4cdec_5_cdec_Decoder {
   PyObject_HEAD
-  unsigned int ref;
+  Decoder *dec;
+  struct __pyx_obj_4cdec_5_cdec_DenseVector *weights;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":193
- *         super(MRule, self).__init__(lhs, rhs, e, scores, None)
- * 
- * cdef class Grammar:             # <<<<<<<<<<<<<<
- *     cdef shared_ptr[grammar.Grammar]* grammar
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":32
+ *         self.vector[0][fid] = value
  * 
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         cdef unsigned fid
+ *         for fid in range(1, self.vector.size()):
  */
-struct __pyx_obj_4cdec_5_cdec_Grammar {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ {
   PyObject_HEAD
-  boost::shared_ptr<Grammar> *grammar;
+  unsigned int __pyx_v_fid;
+  struct __pyx_obj_4cdec_5_cdec_DenseVector *__pyx_v_self;
+  size_t __pyx_t_0;
+  unsigned int __pyx_t_1;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":4
- * cimport kbest
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":72
+ *         self.vector.set_value(fid, value)
  * 
- * cdef class Hypergraph:             # <<<<<<<<<<<<<<
- *     cdef hypergraph.Hypergraph* hg
- *     cdef MT19937* rng
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         cdef FastSparseVector[weight_t].const_iterator* it = new FastSparseVector[weight_t].const_iterator(self.vector[0], False)
+ *         cdef unsigned i
  */
-struct __pyx_obj_4cdec_5_cdec_Hypergraph {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ {
   PyObject_HEAD
-  struct __pyx_vtabstruct_4cdec_5_cdec_Hypergraph *__pyx_vtab;
-  Hypergraph *hg;
-  MT19937 *rng;
+  unsigned int __pyx_v_i;
+  FastSparseVector<weight_t>::const_iterator *__pyx_v_it;
+  struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self;
+  size_t __pyx_t_0;
+  unsigned int __pyx_t_1;
 };
 
 
-/* "cdec/_cdec.pyx":47
- *     cdef DenseVector weights
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":5
+ * import cdec.sa._sa as _sa
  * 
- *     def __init__(self, config_str=None, **config):             # <<<<<<<<<<<<<<
- *         """Decoder('formalism = scfg') -> initialize from configuration string
- *         Decoder(formalism='scfg') -> initialize from named parameters
- */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ {
-  PyObject_HEAD
-  PyObject *__pyx_v_config;
-};
-
-
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":65
- *         return result
+ * def _phrase(phrase):             # <<<<<<<<<<<<<<
+ *     return ' '.join(w.encode('utf8') if isinstance(w, unicode) else str(w) for w in phrase)
  * 
- * cdef class CandidateSet:             # <<<<<<<<<<<<<<
- *     cdef shared_ptr[mteval.SegmentEvaluator]* scorer
- *     cdef mteval.EvaluationMetric* metric
  */
-struct __pyx_obj_4cdec_5_cdec_CandidateSet {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase {
   PyObject_HEAD
-  boost::shared_ptr<SegmentEvaluator> *scorer;
-  EvaluationMetric *metric;
-  training::CandidateSet *cs;
+  PyObject *__pyx_v_phrase;
 };
 
 
-/* "cdec/sa/_sa.pxd":3
- * from libc.stdio cimport FILE
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":6
  * 
- * cdef class FloatList:             # <<<<<<<<<<<<<<
- *     cdef int size
- *     cdef int increment
- */
-struct __pyx_obj_4cdec_2sa_3_sa_FloatList {
-  PyObject_HEAD
-  struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList *__pyx_vtab;
-  int size;
-  int increment;
-  int len;
-  float *arr;
-};
-
-
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":62
- *             del derivations
+ * def _phrase(phrase):
+ *     return ' '.join(w.encode('utf8') if isinstance(w, unicode) else str(w) for w in phrase)             # <<<<<<<<<<<<<<
  * 
- *     def kbest_trees(self, size):             # <<<<<<<<<<<<<<
- *         """hg.kbest_trees(size) -> List of k-best trees in the hypergraph."""
- *         cdef kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal]* f_derivations = new kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal](self.hg[0], size)
+ * cdef class NT:
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr {
   PyObject_HEAD
-  KBest::KBestDerivations<std::vector<WordID>,ETreeTraversal>::Derivation *__pyx_v_e_derivation;
-  KBest::KBestDerivations<std::vector<WordID>,ETreeTraversal> *__pyx_v_e_derivations;
-  PyObject *__pyx_v_e_tree;
-  KBest::KBestDerivations<std::vector<WordID>,FTreeTraversal>::Derivation *__pyx_v_f_derivation;
-  KBest::KBestDerivations<std::vector<WordID>,FTreeTraversal> *__pyx_v_f_derivations;
-  PyObject *__pyx_v_f_tree;
-  unsigned int __pyx_v_k;
-  struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self;
-  PyObject *__pyx_v_size;
-  unsigned int __pyx_t_0;
-  long __pyx_t_1;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *__pyx_outer_scope;
+  PyObject *__pyx_v_w;
+  PyObject *__pyx_t_0;
+  Py_ssize_t __pyx_t_1;
+  PyObject *(*__pyx_t_2)(PyObject *);
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":61
- *             yield self[i]
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":137
  * 
- *     def todot(self):             # <<<<<<<<<<<<<<
- *         """lattice.todot() -> Representation of the lattice in GraphViz dot format."""
- *         def lines():
+ *     property a:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             cdef vector[grammar.AlignmentPoint]* a = &self.rule.get().a_
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ {
   PyObject_HEAD
-  struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self;
+  std::vector<AlignmentPoint> *__pyx_v_a;
+  unsigned int __pyx_v_i;
+  struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self;
+  size_t __pyx_t_0;
+  unsigned int __pyx_t_1;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":172
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":178
  *             self.rule.get().lhs_ = -TDConvert((<NT> lhs).cat)
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -1072,71 +1076,105 @@ struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__ {
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":100
- *         self.cs.AddKBestCandidates(hypergraph.hg[0], k, self.scorer.get())
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":179
  * 
- * cdef class SegmentEvaluator:             # <<<<<<<<<<<<<<
- *     cdef shared_ptr[mteval.SegmentEvaluator]* scorer
- *     cdef mteval.EvaluationMetric* metric
+ *     def __str__(self):
+ *         scores = ' '.join('%s=%s' % feat for feat in self.scores)             # <<<<<<<<<<<<<<
+ *         return '%s ||| %s ||| %s ||| %s' % (self.lhs,
+ *                 _phrase(self.f), _phrase(self.e), scores)
  */
-struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr {
   PyObject_HEAD
-  boost::shared_ptr<SegmentEvaluator> *scorer;
-  EvaluationMetric *metric;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__ *__pyx_outer_scope;
+  PyObject *__pyx_v_feat;
+  PyObject *__pyx_t_0;
+  Py_ssize_t __pyx_t_1;
+  PyObject *(*__pyx_t_2)(PyObject *);
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":260
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":205
+ *         del self.grammar
  * 
- *     property in_edges:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef unsigned i
- *             for i in range(self.node.in_edges_.size()):
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         cdef grammar.const_GrammarIter* root = self.grammar.get().GetRoot()
+ *         cdef grammar.const_RuleBin* rbin = root.GetRules()
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ {
   PyObject_HEAD
   unsigned int __pyx_v_i;
-  struct __pyx_obj_4cdec_5_cdec_HypergraphNode *__pyx_v_self;
-  size_t __pyx_t_0;
+  const RuleBin *__pyx_v_rbin;
+  const GrammarIter *__pyx_v_root;
+  struct __pyx_obj_4cdec_5_cdec_Grammar *__pyx_v_self;
+  struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_trule;
+  int __pyx_t_0;
   unsigned int __pyx_t_1;
 };
 
 
-/* "cdec/_cdec.pyx":56
- *                     'csplit', 'tagger', 'lexalign'):
- *                 raise InvalidConfig('formalism "%s" unknown' % formalism)
- *             config_str = '\n'.join('%s = %s' % kv for kv in _make_config(config))             # <<<<<<<<<<<<<<
- *         cdef istringstream* config_stream = new istringstream(config_str)
- *         self.dec = new decoder.Decoder(config_stream)
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":49
+ *         return unicode(hypergraph.JoshuaVisualizationString(self.hg[0]).c_str(), 'utf8')
+ * 
+ *     def kbest(self, size):             # <<<<<<<<<<<<<<
+ *         """hg.kbest(size) -> List of k-best hypotheses in the hypergraph."""
+ *         cdef kbest.KBestDerivations[vector[WordID], kbest.ESentenceTraversal]* derivations = new kbest.KBestDerivations[vector[WordID], kbest.ESentenceTraversal](self.hg[0], size)
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest {
   PyObject_HEAD
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *__pyx_outer_scope;
-  PyObject *__pyx_v_kv;
-  PyObject *__pyx_t_0;
-  Py_ssize_t __pyx_t_1;
-  PyObject *(*__pyx_t_2)(PyObject *);
+  KBest::KBestDerivations<std::vector<WordID>,ESentenceTraversal>::Derivation *__pyx_v_derivation;
+  KBest::KBestDerivations<std::vector<WordID>,ESentenceTraversal> *__pyx_v_derivations;
+  unsigned int __pyx_v_k;
+  struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self;
+  PyObject *__pyx_v_size;
+  unsigned int __pyx_t_0;
+  long __pyx_t_1;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":6
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":62
+ *             del derivations
  * 
- * def _phrase(phrase):
- *     return ' '.join(w.encode('utf8') if isinstance(w, unicode) else str(w) for w in phrase)             # <<<<<<<<<<<<<<
+ *     def kbest_trees(self, size):             # <<<<<<<<<<<<<<
+ *         """hg.kbest_trees(size) -> List of k-best trees in the hypergraph."""
+ *         cdef kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal]* f_derivations = new kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal](self.hg[0], size)
+ */
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees {
+  PyObject_HEAD
+  KBest::KBestDerivations<std::vector<WordID>,ETreeTraversal>::Derivation *__pyx_v_e_derivation;
+  KBest::KBestDerivations<std::vector<WordID>,ETreeTraversal> *__pyx_v_e_derivations;
+  PyObject *__pyx_v_e_tree;
+  KBest::KBestDerivations<std::vector<WordID>,FTreeTraversal>::Derivation *__pyx_v_f_derivation;
+  KBest::KBestDerivations<std::vector<WordID>,FTreeTraversal> *__pyx_v_f_derivations;
+  PyObject *__pyx_v_f_tree;
+  unsigned int __pyx_v_k;
+  struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self;
+  PyObject *__pyx_v_size;
+  unsigned int __pyx_t_0;
+  long __pyx_t_1;
+};
+
+
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":81
+ *             del e_derivations
  * 
- * cdef class NT:
+ *     def kbest_features(self, size):             # <<<<<<<<<<<<<<
+ *         """hg.kbest_trees(size) -> List of k-best feature vectors in the hypergraph."""
+ *         cdef kbest.KBestDerivations[FastSparseVector[weight_t], kbest.FeatureVectorTraversal]* derivations = new kbest.KBestDerivations[FastSparseVector[weight_t], kbest.FeatureVectorTraversal](self.hg[0], size)
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features {
   PyObject_HEAD
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *__pyx_outer_scope;
-  PyObject *__pyx_v_w;
-  PyObject *__pyx_t_0;
-  Py_ssize_t __pyx_t_1;
-  PyObject *(*__pyx_t_2)(PyObject *);
+  KBest::KBestDerivations<FastSparseVector<weight_t>,FeatureVectorTraversal>::Derivation *__pyx_v_derivation;
+  KBest::KBestDerivations<FastSparseVector<weight_t>,FeatureVectorTraversal> *__pyx_v_derivations;
+  struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_fmap;
+  unsigned int __pyx_v_k;
+  struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self;
+  PyObject *__pyx_v_size;
+  unsigned int __pyx_t_0;
+  long __pyx_t_1;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":97
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":97
  *             del derivations
  * 
  *     def sample(self, unsigned n):             # <<<<<<<<<<<<<<
@@ -1154,33 +1192,32 @@ struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample {
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":49
- *         return unicode(hypergraph.JoshuaVisualizationString(self.hg[0]).c_str(), 'utf8')
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":108
+ *             del hypos
  * 
- *     def kbest(self, size):             # <<<<<<<<<<<<<<
- *         """hg.kbest(size) -> List of k-best hypotheses in the hypergraph."""
- *         cdef kbest.KBestDerivations[vector[WordID], kbest.ESentenceTraversal]* derivations = new kbest.KBestDerivations[vector[WordID], kbest.ESentenceTraversal](self.hg[0], size)
+ *     def sample_trees(self, unsigned n):             # <<<<<<<<<<<<<<
+ *        """hg.sample_trees(n) -> Sample of n trees from the hypergraph."""
+ *        cdef vector[string]* trees = new vector[string]()
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees {
   PyObject_HEAD
-  KBest::KBestDerivations<std::vector<WordID>,ESentenceTraversal>::Derivation *__pyx_v_derivation;
-  KBest::KBestDerivations<std::vector<WordID>,ESentenceTraversal> *__pyx_v_derivations;
   unsigned int __pyx_v_k;
+  unsigned int __pyx_v_n;
   struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self;
-  PyObject *__pyx_v_size;
-  unsigned int __pyx_t_0;
-  long __pyx_t_1;
+  std::vector<std::string> *__pyx_v_trees;
+  size_t __pyx_t_0;
+  unsigned int __pyx_t_1;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":167
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":161
  * 
- *     property nodes:
+ *     property edges:
  *         def __get__(self):             # <<<<<<<<<<<<<<
  *             cdef unsigned i
- *             for i in range(self.hg.nodes_.size()):
+ *             for i in range(self.hg.edges_.size()):
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ {
   PyObject_HEAD
   unsigned int __pyx_v_i;
   struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self;
@@ -1189,83 +1226,55 @@ struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ {
 };
 
 
-/* "cdec/sa/_sa.pxd":29
- *     cdef FloatList values
- * 
- * cdef class Phrase:             # <<<<<<<<<<<<<<
- *     cdef int *syms
- *     cdef int n, *varpos, n_vars
- */
-struct __pyx_obj_4cdec_2sa_3_sa_Phrase {
-  PyObject_HEAD
-  struct __pyx_vtabstruct_4cdec_2sa_3_sa_Phrase *__pyx_vtab;
-  int *syms;
-  int n;
-  int *varpos;
-  int n_vars;
-};
-
-
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":199
- *         del self.grammar
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":167
  * 
- *     def __iter__(self):             # <<<<<<<<<<<<<<
- *         cdef grammar.const_GrammarIter* root = self.grammar.get().GetRoot()
- *         cdef grammar.const_RuleBin* rbin = root.GetRules()
+ *     property nodes:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             for i in range(self.hg.nodes_.size()):
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ {
   PyObject_HEAD
   unsigned int __pyx_v_i;
-  const RuleBin *__pyx_v_rbin;
-  const GrammarIter *__pyx_v_root;
-  struct __pyx_obj_4cdec_5_cdec_Grammar *__pyx_v_self;
-  struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_trule;
-  int __pyx_t_0;
+  struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self;
+  size_t __pyx_t_0;
   unsigned int __pyx_t_1;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":217
- *             self.grammar.get().SetGrammarName(name)
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":216
  * 
- * cdef class TextGrammar(Grammar):             # <<<<<<<<<<<<<<
- *     def __init__(self, rules):
- *         """TextGrammar(rules) -> SCFG Grammar containing the rules."""
- */
-struct __pyx_obj_4cdec_5_cdec_TextGrammar {
-  struct __pyx_obj_4cdec_5_cdec_Grammar __pyx_base;
-};
-
-
-/* "cdec/_cdec.pyx":43
- *             yield key, str(value)
- * 
- * cdef class Decoder:             # <<<<<<<<<<<<<<
- *     cdef decoder.Decoder* dec
- *     cdef DenseVector weights
+ *     property tail_nodes:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             for i in range(self.edge.tail_nodes_.size()):
  */
-struct __pyx_obj_4cdec_5_cdec_Decoder {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ {
   PyObject_HEAD
-  Decoder *dec;
-  struct __pyx_obj_4cdec_5_cdec_DenseVector *weights;
+  unsigned int __pyx_v_i;
+  struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *__pyx_v_self;
+  unsigned int __pyx_t_0;
+  unsigned int __pyx_t_1;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":12
- *         return stats
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":260
  * 
- * cdef class Candidate:             # <<<<<<<<<<<<<<
- *     cdef mteval.const_Candidate* candidate
- *     cdef public float score
+ *     property in_edges:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             for i in range(self.node.in_edges_.size()):
  */
-struct __pyx_obj_4cdec_5_cdec_Candidate {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ {
   PyObject_HEAD
-  const training::Candidate *candidate;
-  float score;
+  unsigned int __pyx_v_i;
+  struct __pyx_obj_4cdec_5_cdec_HypergraphNode *__pyx_v_self;
+  size_t __pyx_t_0;
+  unsigned int __pyx_t_1;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":266
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":266
  * 
  *     property out_edges:
  *         def __get__(self):             # <<<<<<<<<<<<<<
@@ -1281,7 +1290,7 @@ struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_17___get__ {
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":56
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":56
  *         return unicode(str(self), 'utf8')
  * 
  *     def __iter__(self):             # <<<<<<<<<<<<<<
@@ -1297,118 +1306,142 @@ struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_18___iter__ {
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":32
- *         self.vector[0][fid] = value
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":61
+ *             yield self[i]
  * 
- *     def __iter__(self):             # <<<<<<<<<<<<<<
- *         cdef unsigned fid
- *         for fid in range(1, self.vector.size()):
+ *     def todot(self):             # <<<<<<<<<<<<<<
+ *         """lattice.todot() -> Representation of the lattice in GraphViz dot format."""
+ *         def lines():
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot {
   PyObject_HEAD
-  unsigned int __pyx_v_fid;
-  struct __pyx_obj_4cdec_5_cdec_DenseVector *__pyx_v_self;
-  size_t __pyx_t_0;
-  unsigned int __pyx_t_1;
+  struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":173
- * 
- *     def __str__(self):
- *         scores = ' '.join('%s=%s' % feat for feat in self.scores)             # <<<<<<<<<<<<<<
- *         return '%s ||| %s ||| %s ||| %s' % (self.lhs,
- *                 _phrase(self.f), _phrase(self.e), scores)
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":63
+ *     def todot(self):
+ *         """lattice.todot() -> Representation of the lattice in GraphViz dot format."""
+ *         def lines():             # <<<<<<<<<<<<<<
+ *             yield 'digraph lattice {'
+ *             yield 'rankdir = LR;'
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines {
   PyObject_HEAD
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__ *__pyx_outer_scope;
-  PyObject *__pyx_v_feat;
-  PyObject *__pyx_t_0;
-  Py_ssize_t __pyx_t_1;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *__pyx_outer_scope;
+  PyObject *__pyx_v_delta;
+  PyObject *__pyx_v_i;
+  PyObject *__pyx_v_label;
+  PyObject *__pyx_v_weight;
+  Py_ssize_t __pyx_t_0;
+  PyObject *__pyx_t_1;
   PyObject *(*__pyx_t_2)(PyObject *);
+  PyObject *__pyx_t_3;
+  Py_ssize_t __pyx_t_4;
+  PyObject *(*__pyx_t_5)(PyObject *);
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":108
- *             del hypos
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":44
+ *         return self.stats.size()
  * 
- *     def sample_trees(self, unsigned n):             # <<<<<<<<<<<<<<
- *        """hg.sample_trees(n) -> Sample of n trees from the hypergraph."""
- *        cdef vector[string]* trees = new vector[string]()
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         for i in range(len(self)):
+ *             yield self[i]
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ {
   PyObject_HEAD
-  unsigned int __pyx_v_k;
-  unsigned int __pyx_v_n;
-  struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self;
-  std::vector<std::string> *__pyx_v_trees;
-  size_t __pyx_t_0;
-  unsigned int __pyx_t_1;
+  Py_ssize_t __pyx_v_i;
+  struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self;
+  Py_ssize_t __pyx_t_0;
+  Py_ssize_t __pyx_t_1;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":131
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":90
+ *         return candidate
  * 
- *     property a:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef unsigned i
- *             cdef vector[grammar.AlignmentPoint]* a = &self.rule.get().a_
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         cdef unsigned i
+ *         for i in range(len(self)):
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ {
   PyObject_HEAD
-  std::vector<AlignmentPoint> *__pyx_v_a;
   unsigned int __pyx_v_i;
-  struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self;
-  size_t __pyx_t_0;
+  struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self;
+  Py_ssize_t __pyx_t_0;
   unsigned int __pyx_t_1;
 };
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":72
- *         self.vector.set_value(fid, value)
+/* "cdec/_cdec.pyx":32
+ *     SetSilent(yn)
  * 
- *     def __iter__(self):             # <<<<<<<<<<<<<<
- *         cdef FastSparseVector[weight_t].const_iterator* it = new FastSparseVector[weight_t].const_iterator(self.vector[0], False)
- *         cdef unsigned i
+ * def _make_config(config):             # <<<<<<<<<<<<<<
+ *     for key, value in config.items():
+ *         if isinstance(value, dict):
  */
-struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ {
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config {
   PyObject_HEAD
-  unsigned int __pyx_v_i;
-  FastSparseVector<weight_t>::const_iterator *__pyx_v_it;
-  struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self;
-  size_t __pyx_t_0;
-  unsigned int __pyx_t_1;
+  PyObject *__pyx_v_config;
+  PyObject *__pyx_v_info;
+  PyObject *__pyx_v_key;
+  PyObject *__pyx_v_name;
+  PyObject *__pyx_v_value;
+  PyObject *__pyx_t_0;
+  PyObject *__pyx_t_1;
+  Py_ssize_t __pyx_t_2;
+  PyObject *(*__pyx_t_3)(PyObject *);
+  Py_ssize_t __pyx_t_4;
+  PyObject *(*__pyx_t_5)(PyObject *);
 };
 
 
-
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":246
- *         raise NotImplemented('comparison not implemented for HypergraphEdge')
+/* "cdec/_cdec.pyx":47
+ *     cdef DenseVector weights
  * 
- * cdef class HypergraphNode:             # <<<<<<<<<<<<<<
- *     cdef hypergraph.Hypergraph* hg
- *     cdef hypergraph.HypergraphNode* node
+ *     def __init__(self, config_str=None, **config):             # <<<<<<<<<<<<<<
+ *         """Decoder('formalism = scfg') -> initialize from configuration string
+ *         Decoder(formalism='scfg') -> initialize from named parameters
  */
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ {
+  PyObject_HEAD
+  PyObject *__pyx_v_config;
+};
 
-struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphNode {
-  PyObject *(*init)(struct __pyx_obj_4cdec_5_cdec_HypergraphNode *, Hypergraph *, unsigned int);
+
+/* "cdec/_cdec.pyx":56
+ *                     'csplit', 'tagger', 'lexalign'):
+ *                 raise InvalidConfig('formalism "%s" unknown' % formalism)
+ *             config_str = '\n'.join('%s = %s' % kv for kv in _make_config(config))             # <<<<<<<<<<<<<<
+ *         cdef istringstream* config_stream = new istringstream(config_str)
+ *         self.dec = new decoder.Decoder(config_stream)
+ */
+struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr {
+  PyObject_HEAD
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *__pyx_outer_scope;
+  PyObject *__pyx_v_kv;
+  PyObject *__pyx_t_0;
+  Py_ssize_t __pyx_t_1;
+  PyObject *(*__pyx_t_2)(PyObject *);
 };
-static struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphNode *__pyx_vtabptr_4cdec_5_cdec_HypergraphNode;
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":196
- *         return vector
+
+/* "cdec/sa/_sa.pxd":3
+ * from libc.stdio cimport FILE
  * 
- * cdef class HypergraphEdge:             # <<<<<<<<<<<<<<
- *     cdef hypergraph.Hypergraph* hg
- *     cdef hypergraph.HypergraphEdge* edge
+ * cdef class FloatList:             # <<<<<<<<<<<<<<
+ *     cdef int size
+ *     cdef int increment
  */
 
-struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphEdge {
-  PyObject *(*init)(struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *, Hypergraph *, unsigned int);
+struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList {
+  void (*set)(struct __pyx_obj_4cdec_2sa_3_sa_FloatList *, int, float);
+  void (*write_handle)(struct __pyx_obj_4cdec_2sa_3_sa_FloatList *, FILE *);
+  void (*read_handle)(struct __pyx_obj_4cdec_2sa_3_sa_FloatList *, FILE *);
 };
-static struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphEdge *__pyx_vtabptr_4cdec_5_cdec_HypergraphEdge;
+static struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList *__pyx_vtabptr_4cdec_2sa_3_sa_FloatList;
 
 
 /* "cdec/sa/_sa.pxd":12
@@ -1431,22 +1464,6 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *__pyx_vtabptr_4cdec_2sa_3_sa_IntList;
 
 
-/* "cdec/sa/_sa.pxd":3
- * from libc.stdio cimport FILE
- * 
- * cdef class FloatList:             # <<<<<<<<<<<<<<
- *     cdef int size
- *     cdef int increment
- */
-
-struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList {
-  void (*set)(struct __pyx_obj_4cdec_2sa_3_sa_FloatList *, int, float);
-  void (*write_handle)(struct __pyx_obj_4cdec_2sa_3_sa_FloatList *, FILE *);
-  void (*read_handle)(struct __pyx_obj_4cdec_2sa_3_sa_FloatList *, FILE *);
-};
-static struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList *__pyx_vtabptr_4cdec_2sa_3_sa_FloatList;
-
-
 /* "cdec/sa/_sa.pxd":29
  *     cdef FloatList values
  * 
@@ -1462,7 +1479,7 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_Phrase {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_Phrase *__pyx_vtabptr_4cdec_2sa_3_sa_Phrase;
 
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":4
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":4
  * cimport kbest
  * 
  * cdef class Hypergraph:             # <<<<<<<<<<<<<<
@@ -1474,6 +1491,34 @@ struct __pyx_vtabstruct_4cdec_5_cdec_Hypergraph {
   MT19937 *(*_rng)(struct __pyx_obj_4cdec_5_cdec_Hypergraph *);
 };
 static struct __pyx_vtabstruct_4cdec_5_cdec_Hypergraph *__pyx_vtabptr_4cdec_5_cdec_Hypergraph;
+
+
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":196
+ *         return vector
+ * 
+ * cdef class HypergraphEdge:             # <<<<<<<<<<<<<<
+ *     cdef hypergraph.Hypergraph* hg
+ *     cdef hypergraph.HypergraphEdge* edge
+ */
+
+struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphEdge {
+  PyObject *(*init)(struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *, Hypergraph *, unsigned int);
+};
+static struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphEdge *__pyx_vtabptr_4cdec_5_cdec_HypergraphEdge;
+
+
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":246
+ *         raise NotImplemented('comparison not implemented for HypergraphEdge')
+ * 
+ * cdef class HypergraphNode:             # <<<<<<<<<<<<<<
+ *     cdef hypergraph.Hypergraph* hg
+ *     cdef hypergraph.HypergraphNode* node
+ */
+
+struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphNode {
+  PyObject *(*init)(struct __pyx_obj_4cdec_5_cdec_HypergraphNode *, Hypergraph *, unsigned int);
+};
+static struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphNode *__pyx_vtabptr_4cdec_5_cdec_HypergraphNode;
 #ifndef CYTHON_REFNANNY
   #define CYTHON_REFNANNY 0
 #endif
@@ -1525,6 +1570,14 @@ static struct __pyx_vtabstruct_4cdec_5_cdec_Hypergraph *__pyx_vtabptr_4cdec_5_cd
   #define __Pyx_XGOTREF(r)
   #define __Pyx_XGIVEREF(r)
 #endif /* CYTHON_REFNANNY */
+#define __Pyx_XDECREF_SET(r, v) do {                            \
+        PyObject *tmp = (PyObject *) r;                         \
+        r = v; __Pyx_XDECREF(tmp);                              \
+    } while (0)
+#define __Pyx_DECREF_SET(r, v) do {                             \
+        PyObject *tmp = (PyObject *) r;                         \
+        r = v; __Pyx_DECREF(tmp);                               \
+    } while (0)
 #define __Pyx_CLEAR(r)    do { PyObject* tmp = ((PyObject*)(r)); r = NULL; __Pyx_DECREF(tmp);} while(0)
 #define __Pyx_XCLEAR(r)   do { if((r) != NULL) {PyObject* tmp = ((PyObject*)(r)); r = NULL; __Pyx_DECREF(tmp);}} while(0)
 
@@ -1545,6 +1598,12 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_GetAttrStr(PyObject* obj, PyObject
 
 static PyObject *__Pyx_GetBuiltinName(PyObject *name); /*proto*/
 
+#if CYTHON_COMPILING_IN_CPYTHON
+static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw); /*proto*/
+#else
+#define __Pyx_PyObject_Call(func, arg, kw) PyObject_Call(func, arg, kw)
+#endif
+
 static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
 static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
 
@@ -1555,13 +1614,37 @@ static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact,
 
 static CYTHON_INLINE int __Pyx_CheckKeywordStrings(PyObject *kwdict, const char* function_name, int kw_allowed); /*proto*/
 
-static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,
+static CYTHON_INLINE int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,
     const char *name, int exact); /*proto*/
 
 static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type); /*proto*/
 
+static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+
+static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+
+static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
+
 static CYTHON_INLINE void __Pyx_RaiseClosureNameError(const char *varname);
 
+#if PY_MAJOR_VERSION < 3
+#define __Pyx_PyString_Join __Pyx_PyBytes_Join
+#define __Pyx_PyBaseString_Join(s, v) (PyUnicode_CheckExact(s) ? PyUnicode_Join(s, v) : __Pyx_PyBytes_Join(s, v))
+#else
+#define __Pyx_PyString_Join PyUnicode_Join
+#define __Pyx_PyBaseString_Join PyUnicode_Join
+#endif
+#if CYTHON_COMPILING_IN_CPYTHON
+    #if PY_MAJOR_VERSION < 3
+    #define __Pyx_PyBytes_Join _PyString_Join
+    #else
+    #define __Pyx_PyBytes_Join _PyBytes_Join
+    #endif
+#else
+static CYTHON_INLINE PyObject* __Pyx_PyBytes_Join(PyObject* sep, PyObject* values); /*proto*/
+#endif
+
 static void __Pyx_RaiseDoubleKeywordsError(const char* func_name, PyObject* kw_name); /*proto*/
 
 static int __Pyx_ParseOptionalKeywords(PyObject *kwds, PyObject **argnames[], \
@@ -1606,7 +1689,7 @@ static PyObject* __Pyx_PyObject_CallMethodTuple(PyObject* obj, PyObject* method_
     if (unlikely(!args)) return NULL;
     method = __Pyx_PyObject_GetAttrStr(obj, method_name);
     if (unlikely(!method)) goto bad;
-    result = PyObject_Call(method, args, NULL);
+    result = __Pyx_PyObject_Call(method, args, NULL);
     Py_DECREF(method);
 bad:
     Py_DECREF(args);
@@ -1621,22 +1704,23 @@ bad:
 #define __Pyx_PyObject_CallMethod0(obj, name) \
     __Pyx_PyObject_CallMethodTuple(obj, name, (Py_INCREF(__pyx_empty_tuple), __pyx_empty_tuple))
 
-static CYTHON_INLINE PyObject* __Pyx_PyObject_Append(PyObject* L, PyObject* x); /*proto*/
-
-#define __Pyx_GetItemInt(o, i, size, to_py_func, is_list, wraparound, boundscheck) \
-    (((size) <= sizeof(Py_ssize_t)) ? \
-    __Pyx_GetItemInt_Fast(o, i, is_list, wraparound, boundscheck) : \
-    __Pyx_GetItemInt_Generic(o, to_py_func(i)))
-#define __Pyx_GetItemInt_List(o, i, size, to_py_func, is_list, wraparound, boundscheck) \
-    (((size) <= sizeof(Py_ssize_t)) ? \
-    __Pyx_GetItemInt_List_Fast(o, i, wraparound, boundscheck) : \
-    __Pyx_GetItemInt_Generic(o, to_py_func(i)))
+static CYTHON_INLINE int __Pyx_PyObject_Append(PyObject* L, PyObject* x); /*proto*/
+
+#define __Pyx_GetItemInt(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck) \
+    (__Pyx_fits_Py_ssize_t(i, type, is_signed) ? \
+    __Pyx_GetItemInt_Fast(o, (Py_ssize_t)i, is_list, wraparound, boundscheck) : \
+    (is_list ? (PyErr_SetString(PyExc_IndexError, "list index out of range"), (PyObject*)NULL) : \
+               __Pyx_GetItemInt_Generic(o, to_py_func(i))))
+#define __Pyx_GetItemInt_List(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck) \
+    (__Pyx_fits_Py_ssize_t(i, type, is_signed) ? \
+    __Pyx_GetItemInt_List_Fast(o, (Py_ssize_t)i, wraparound, boundscheck) : \
+    (PyErr_SetString(PyExc_IndexError, "list index out of range"), (PyObject*)NULL))
 static CYTHON_INLINE PyObject *__Pyx_GetItemInt_List_Fast(PyObject *o, Py_ssize_t i,
                                                               int wraparound, int boundscheck);
-#define __Pyx_GetItemInt_Tuple(o, i, size, to_py_func, is_list, wraparound, boundscheck) \
-    (((size) <= sizeof(Py_ssize_t)) ? \
-    __Pyx_GetItemInt_Tuple_Fast(o, i, wraparound, boundscheck) : \
-    __Pyx_GetItemInt_Generic(o, to_py_func(i)))
+#define __Pyx_GetItemInt_Tuple(o, i, type, is_signed, to_py_func, is_list, wraparound, boundscheck) \
+    (__Pyx_fits_Py_ssize_t(i, type, is_signed) ? \
+    __Pyx_GetItemInt_Tuple_Fast(o, (Py_ssize_t)i, wraparound, boundscheck) : \
+    (PyErr_SetString(PyExc_IndexError, "tuple index out of range"), (PyObject*)NULL))
 static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Tuple_Fast(PyObject *o, Py_ssize_t i,
                                                               int wraparound, int boundscheck);
 static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j);
@@ -1654,7 +1738,8 @@ static int __Pyx_IternextUnpackEndCheck(PyObject *retval, Py_ssize_t expected);
 static CYTHON_INLINE PyObject *__Pyx_GetModuleGlobalName(PyObject *name); /*proto*/
 
 static void __Pyx_WriteUnraisable(const char *name, int clineno,
-                                  int lineno, const char *filename); /*proto*/
+                                  int lineno, const char *filename,
+                                  int full_traceback); /*proto*/
 
 static CYTHON_INLINE int __Pyx_PyDict_Contains(PyObject* item, PyObject* dict, int eq) {
     int result = PyDict_Contains(dict, item);
@@ -1664,6 +1749,8 @@ static CYTHON_INLINE int __Pyx_PyDict_Contains(PyObject* item, PyObject* dict, i
 #define __Pyx_PyIter_Next(obj) __Pyx_PyIter_Next2(obj, NULL)
 static CYTHON_INLINE PyObject *__Pyx_PyIter_Next2(PyObject *, PyObject *); /*proto*/
 
+static PyTypeObject* __Pyx_FetchCommonType(PyTypeObject* type);
+
 #define __Pyx_CyFunction_USED 1
 #include <structmember.h>
 #define __Pyx_CYFUNCTION_STATICMETHOD  0x01
@@ -1679,28 +1766,30 @@ static CYTHON_INLINE PyObject *__Pyx_PyIter_Next2(PyObject *, PyObject *); /*pro
     ((__pyx_CyFunctionObject *) (f))->defaults_getter = (g)
 typedef struct {
     PyCFunctionObject func;
-    int flags;
     PyObject *func_dict;
     PyObject *func_weakreflist;
     PyObject *func_name;
     PyObject *func_qualname;
     PyObject *func_doc;
+    PyObject *func_globals;
     PyObject *func_code;
     PyObject *func_closure;
     PyObject *func_classobj; /* No-args super() class cell */
     void *defaults;
     int defaults_pyobjects;
+    int flags;
     PyObject *defaults_tuple;   /* Const defaults tuple */
     PyObject *defaults_kwdict;  /* Const kwonly defaults dict */
     PyObject *(*defaults_getter)(PyObject *);
     PyObject *func_annotations; /* function annotations dict */
 } __pyx_CyFunctionObject;
 static PyTypeObject *__pyx_CyFunctionType = 0;
-#define __Pyx_CyFunction_NewEx(ml, flags, qualname, self, module, code) \
-    __Pyx_CyFunction_New(__pyx_CyFunctionType, ml, flags, qualname, self, module, code)
+#define __Pyx_CyFunction_NewEx(ml, flags, qualname, self, module, globals, code) \
+    __Pyx_CyFunction_New(__pyx_CyFunctionType, ml, flags, qualname, self, module, globals, code)
 static PyObject *__Pyx_CyFunction_New(PyTypeObject *, PyMethodDef *ml,
                                       int flags, PyObject* qualname,
-                                      PyObject *self, PyObject *module,
+                                      PyObject *self,
+                                      PyObject *module, PyObject *globals,
                                       PyObject* code);
 static CYTHON_INLINE void *__Pyx_CyFunction_InitDefaults(PyObject *m,
                                                          size_t size,
@@ -1715,6 +1804,43 @@ static int __Pyx_CyFunction_init(void);
 
 static PyObject* __Pyx_PyDict_GetItemDefault(PyObject* d, PyObject* key, PyObject* default_value); /*proto*/
 
+#include <string.h>
+
+static CYTHON_INLINE int __Pyx_PyBytes_Equals(PyObject* s1, PyObject* s2, int equals); /*proto*/
+
+static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int equals); /*proto*/
+
+#if PY_MAJOR_VERSION >= 3
+#define __Pyx_PyString_Equals __Pyx_PyUnicode_Equals
+#else
+#define __Pyx_PyString_Equals __Pyx_PyBytes_Equals
+#endif
+
+#if CYTHON_COMPILING_IN_CPYTHON && (PY_VERSION_HEX >= 0x03020000 || PY_MAJOR_VERSION < 3 && PY_VERSION_HEX >= 0x02070000)
+static CYTHON_INLINE PyObject* __Pyx_PyObject_LookupSpecial(PyObject* obj, PyObject* attr_name) {
+    PyObject *res;
+    PyTypeObject *tp = Py_TYPE(obj);
+#if PY_MAJOR_VERSION < 3
+    if (unlikely(PyInstance_Check(obj)))
+        return __Pyx_PyObject_GetAttrStr(obj, attr_name);
+#endif
+    res = _PyType_Lookup(tp, attr_name);
+    if (likely(res)) {
+        descrgetfunc f = Py_TYPE(res)->tp_descr_get;
+        if (!f) {
+            Py_INCREF(res);
+        } else {
+            res = f(res, obj, (PyObject *)tp);
+        }
+    } else {
+        PyErr_SetObject(PyExc_AttributeError, attr_name);
+    }
+    return res;
+}
+#else
+#define __Pyx_PyObject_LookupSpecial(o,n) __Pyx_PyObject_GetAttrStr(o,n)
+#endif
+
 static double __Pyx__PyObject_AsDouble(PyObject* obj); /* proto */
 #if CYTHON_COMPILING_IN_PYPY
 #define __Pyx_PyObject_AsDouble(obj) \
@@ -1727,23 +1853,24 @@ static double __Pyx__PyObject_AsDouble(PyObject* obj); /* proto */
  PyFloat_AS_DOUBLE(obj) : __Pyx__PyObject_AsDouble(obj))
 #endif
 
-static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
-
-#include <string.h>
-
 static int __Pyx_SetVtable(PyObject *dict, void *vtable); /*proto*/
 
 static void* __Pyx_GetVtable(PyObject *dict); /*proto*/
 
-static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
-static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
+static PyObject *__Pyx_CalculateMetaclass(PyTypeObject *metaclass, PyObject *bases);
 
-static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level); /*proto*/
+static PyObject *__Pyx_Py3MetaclassPrepare(PyObject *metaclass, PyObject *bases, PyObject *name, PyObject *qualname,
+                                           PyObject *mkw, PyObject *modname, PyObject *doc); /*proto*/
+static PyObject *__Pyx_Py3ClassCreate(PyObject *metaclass, PyObject *name, PyObject *bases, PyObject *dict,
+                                      PyObject *mkw, int calculate_metaclass, int allow_py2_metaclass); /*proto*/
+
+static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_int(unsigned int value);
 
-static PyObject *__Pyx_FindPy2Metaclass(PyObject *bases); /*proto*/
+static CYTHON_INLINE unsigned int __Pyx_PyInt_As_unsigned_int(PyObject *);
 
-static PyObject *__Pyx_CreateClass(PyObject *bases, PyObject *dict, PyObject *name,
-                                   PyObject *qualname, PyObject *modname); /*proto*/
+static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *);
+
+static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level); /*proto*/
 
 #ifndef __Pyx_CppExn2PyErr
 #include <new>
@@ -1784,43 +1911,19 @@ static void __Pyx_CppExn2PyErr() {
 }
 #endif
 
-static CYTHON_INLINE WordID __Pyx_PyInt_from_py_WordID(PyObject *);
-
-static PyObject* __Pyx_Globals(void); /*proto*/
-
-static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject *);
-
-static CYTHON_INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject *);
+static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value);
 
-static CYTHON_INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject *);
+static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value);
 
-static CYTHON_INLINE char __Pyx_PyInt_AsChar(PyObject *);
+static CYTHON_INLINE WordID __Pyx_PyInt_As_WordID(PyObject *);
 
-static CYTHON_INLINE short __Pyx_PyInt_AsShort(PyObject *);
+static CYTHON_INLINE PyObject* __Pyx_PyInt_From_short(short value);
 
-static CYTHON_INLINE int __Pyx_PyInt_AsInt(PyObject *);
+static CYTHON_INLINE PyObject *__Pyx_GetAttr(PyObject *, PyObject *); /*proto*/
 
-static CYTHON_INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject *);
-
-static CYTHON_INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject *);
-
-static CYTHON_INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject *);
-
-static CYTHON_INLINE int __Pyx_PyInt_AsLongDouble(PyObject *);
-
-static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject *);
-
-static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject *);
-
-static CYTHON_INLINE long __Pyx_PyInt_AsLong(PyObject *);
-
-static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject *);
-
-static CYTHON_INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject *);
-
-static CYTHON_INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject *);
+static PyObject* __Pyx_Globals(void); /*proto*/
 
-static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *);
 
 #define __Pyx_Generator_USED
 #include <structmember.h>
@@ -1837,7 +1940,7 @@ typedef struct {
     PyObject *classobj;
     PyObject *yieldfrom;
     int resume_label;
-    char is_running;  // using T_BOOL for property below requires char value
+    char is_running;
 } __pyx_GeneratorObject;
 static __pyx_GeneratorObject *__Pyx_Generator_New(__pyx_generator_body_t body,
                                                   PyObject *closure);
@@ -1923,51 +2026,51 @@ static int (*__pyx_f_4cdec_2sa_3_sa_sym_getindex)(int); /*proto*/
 /* Module declarations from 'cdec.mteval' */
 
 /* Module declarations from 'cdec._cdec' */
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec_TRule = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec_MRule = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_22___iter__ = 0;
 static PyTypeObject *__pyx_ptype_4cdec_5_cdec_DenseVector = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec_SufficientStats = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_21___iter__ = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec_Metric = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec_Candidate = 0;
 static PyTypeObject *__pyx_ptype_4cdec_5_cdec_SparseVector = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_15___get__ = 0;
 static PyTypeObject *__pyx_ptype_4cdec_5_cdec_NT = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec_Lattice = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_23__make_config = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec_HypergraphEdge = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_2__phrase = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_13___get__ = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_20_lines = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec_Scorer = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec_HypergraphNode = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_10_kbest_features = 0;
 static PyTypeObject *__pyx_ptype_4cdec_5_cdec_NTRef = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec_TRule = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec_MRule = 0;
 static PyTypeObject *__pyx_ptype_4cdec_5_cdec_Grammar = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec_TextGrammar = 0;
 static PyTypeObject *__pyx_ptype_4cdec_5_cdec_Hypergraph = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_24___init__ = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec_HypergraphEdge = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec_HypergraphNode = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec_Lattice = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec_Candidate = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec_SufficientStats = 0;
 static PyTypeObject *__pyx_ptype_4cdec_5_cdec_CandidateSet = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_19_todot = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_5___str__ = 0;
 static PyTypeObject *__pyx_ptype_4cdec_5_cdec_SegmentEvaluator = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_16___get__ = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_25_genexpr = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec_Scorer = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec_Metric = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec_Decoder = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct____iter__ = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_1___iter__ = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_2__phrase = 0;
 static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_3_genexpr = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_11_sample = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_4___get__ = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_5___str__ = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_6_genexpr = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_7___iter__ = 0;
 static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_8_kbest = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_10_kbest_features = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_11_sample = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_12_sample_trees = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_13___get__ = 0;
 static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_14___get__ = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_7___iter__ = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec_TextGrammar = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec_Decoder = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct____iter__ = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_15___get__ = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_16___get__ = 0;
 static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_17___get__ = 0;
 static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_18___iter__ = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_6_genexpr = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_12_sample_trees = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_4___get__ = 0;
-static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_1___iter__ = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_19_todot = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_20_lines = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_21___iter__ = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_22___iter__ = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_23__make_config = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_24___init__ = 0;
+static PyTypeObject *__pyx_ptype_4cdec_5_cdec___pyx_scope_struct_25_genexpr = 0;
 static PyObject *__pyx_f_4cdec_5_cdec_as_str(PyObject *, struct __pyx_opt_args_4cdec_5_cdec_as_str *__pyx_optional_args); /*proto*/
 static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(struct __pyx_obj_4cdec_2sa_3_sa_Rule *); /*proto*/
 static struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_f_4cdec_5_cdec_as_stats(PyObject *, PyObject *); /*proto*/
@@ -1998,7 +2101,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_10__iter__(struct __pyx_obj
 static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_13dot(struct __pyx_obj_4cdec_5_cdec_DenseVector *__pyx_v_self, struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_other); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_15tosparse(struct __pyx_obj_4cdec_5_cdec_DenseVector *__pyx_v_self); /* proto */
 static int __pyx_pf_4cdec_5_cdec_12SparseVector___init__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self); /* proto */
-static void __pyx_pf_4cdec_5_cdec_12SparseVector_2__dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self); /* proto */
+static void __pyx_pf_4cdec_5_cdec_12SparseVector_2__dealloc__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_4copy(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_6__getitem__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self, char *__pyx_v_fname); /* proto */
 static int __pyx_pf_4cdec_5_cdec_12SparseVector_8__setitem__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self, char *__pyx_v_fname, float __pyx_v_value); /* proto */
@@ -2033,8 +2136,8 @@ static int __pyx_pf_4cdec_5_cdec_5NTRef___init__(struct __pyx_obj_4cdec_5_cdec_N
 static PyObject *__pyx_pf_4cdec_5_cdec_5NTRef_2__str__(struct __pyx_obj_4cdec_5_cdec_NTRef *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_5NTRef_3ref___get__(struct __pyx_obj_4cdec_5_cdec_NTRef *__pyx_v_self); /* proto */
 static int __pyx_pf_4cdec_5_cdec_5NTRef_3ref_2__set__(struct __pyx_obj_4cdec_5_cdec_NTRef *__pyx_v_self, PyObject *__pyx_v_value); /* proto */
-static int __pyx_pf_4cdec_5_cdec_5TRule___init__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self, PyObject *__pyx_v_lhs, PyObject *__pyx_v_f, PyObject *__pyx_v_e, PyObject *__pyx_v_scores, PyObject *__pyx_v_a); /* proto */
-static void __pyx_pf_4cdec_5_cdec_5TRule_2__dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self); /* proto */
+static int __pyx_pf_4cdec_5_cdec_5TRule___init__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self, PyObject *__pyx_v_lhs, PyObject *__pyx_v_f, PyObject *__pyx_v_e, PyObject *__pyx_v_scores, PyObject *__pyx_v_a, PyObject *__pyx_v_text); /* proto */
+static void __pyx_pf_4cdec_5_cdec_5TRule_2__dealloc__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_5arity___get__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1f___get__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self); /* proto */
 static int __pyx_pf_4cdec_5_cdec_5TRule_1f_2__set__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self, PyObject *__pyx_v_f); /* proto */
@@ -2049,7 +2152,7 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_3lhs_2__set__(struct __pyx_obj_4cdec_5_c
 static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_7__str___genexpr(PyObject *__pyx_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_4__str__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self); /* proto */
 static int __pyx_pf_4cdec_5_cdec_5MRule___init__(struct __pyx_obj_4cdec_5_cdec_MRule *__pyx_v_self, PyObject *__pyx_v_lhs, PyObject *__pyx_v_rhs, PyObject *__pyx_v_scores); /* proto */
-static void __pyx_pf_4cdec_5_cdec_7Grammar___dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_Grammar *__pyx_v_self); /* proto */
+static void __pyx_pf_4cdec_5_cdec_7Grammar___dealloc__(struct __pyx_obj_4cdec_5_cdec_Grammar *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_7Grammar_2__iter__(struct __pyx_obj_4cdec_5_cdec_Grammar *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_7Grammar_4name___get__(struct __pyx_obj_4cdec_5_cdec_Grammar *__pyx_v_self); /* proto */
 static int __pyx_pf_4cdec_5_cdec_7Grammar_4name_2__set__(struct __pyx_obj_4cdec_5_cdec_Grammar *__pyx_v_self, PyObject *__pyx_v_name); /* proto */
@@ -2094,7 +2197,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_3cat___get__(struct __py
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode___richcmp__(struct __pyx_obj_4cdec_5_cdec_HypergraphNode *__pyx_v_x, struct __pyx_obj_4cdec_5_cdec_HypergraphNode *__pyx_v_y, int __pyx_v_op); /* proto */
 static int __pyx_pf_4cdec_5_cdec_7Lattice___cinit__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self); /* proto */
 static int __pyx_pf_4cdec_5_cdec_7Lattice_2__init__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self, PyObject *__pyx_v_inp); /* proto */
-static void __pyx_pf_4cdec_5_cdec_7Lattice_4__dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self); /* proto */
+static void __pyx_pf_4cdec_5_cdec_7Lattice_4__dealloc__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_6__getitem__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self, int __pyx_v_index); /* proto */
 static int __pyx_pf_4cdec_5_cdec_7Lattice_8__setitem__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self, int __pyx_v_index, PyObject *__pyx_v_arcs); /* proto */
 static Py_ssize_t __pyx_pf_4cdec_5_cdec_7Lattice_10__len__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self); /* proto */
@@ -2108,7 +2211,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_9Candidate_5words___get__(struct __pyx_ob
 static PyObject *__pyx_pf_4cdec_5_cdec_9Candidate_4fmap___get__(struct __pyx_obj_4cdec_5_cdec_Candidate *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_9Candidate_5score___get__(struct __pyx_obj_4cdec_5_cdec_Candidate *__pyx_v_self); /* proto */
 static int __pyx_pf_4cdec_5_cdec_9Candidate_5score_2__set__(struct __pyx_obj_4cdec_5_cdec_Candidate *__pyx_v_self, PyObject *__pyx_v_value); /* proto */
-static void __pyx_pf_4cdec_5_cdec_15SufficientStats___dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self); /* proto */
+static void __pyx_pf_4cdec_5_cdec_15SufficientStats___dealloc__(struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_5score___get__(struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_6detail___get__(struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self); /* proto */
 static Py_ssize_t __pyx_pf_4cdec_5_cdec_15SufficientStats_2__len__(struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self); /* proto */
@@ -2117,16 +2220,16 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_7__getitem__(struct __p
 static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_9__iadd__(struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self, struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_other); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_11__add__(PyObject *__pyx_v_x, PyObject *__pyx_v_y); /* proto */
 static int __pyx_pf_4cdec_5_cdec_12CandidateSet___cinit__(struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self, struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator *__pyx_v_evaluator); /* proto */
-static void __pyx_pf_4cdec_5_cdec_12CandidateSet_2__dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self); /* proto */
+static void __pyx_pf_4cdec_5_cdec_12CandidateSet_2__dealloc__(struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self); /* proto */
 static Py_ssize_t __pyx_pf_4cdec_5_cdec_12CandidateSet_4__len__(struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_12CandidateSet_6__getitem__(struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self, int __pyx_v_k); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_12CandidateSet_8__iter__(struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_12CandidateSet_11add_kbest(struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self, struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_hypergraph, unsigned int __pyx_v_k); /* proto */
-static void __pyx_pf_4cdec_5_cdec_16SegmentEvaluator___dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator *__pyx_v_self); /* proto */
+static void __pyx_pf_4cdec_5_cdec_16SegmentEvaluator___dealloc__(struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_16SegmentEvaluator_2evaluate(struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator *__pyx_v_self, PyObject *__pyx_v_sentence); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_16SegmentEvaluator_4candidate_set(struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator *__pyx_v_self); /* proto */
 static int __pyx_pf_4cdec_5_cdec_6Scorer___cinit__(struct __pyx_obj_4cdec_5_cdec_Scorer *__pyx_v_self, PyObject *__pyx_v_name); /* proto */
-static void __pyx_pf_4cdec_5_cdec_6Scorer_2__dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_Scorer *__pyx_v_self); /* proto */
+static void __pyx_pf_4cdec_5_cdec_6Scorer_2__dealloc__(struct __pyx_obj_4cdec_5_cdec_Scorer *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_5_cdec_Scorer *__pyx_v_self, PyObject *__pyx_v_refs); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_6__str__(struct __pyx_obj_4cdec_5_cdec_Scorer *__pyx_v_self); /* proto */
 static int __pyx_pf_4cdec_5_cdec_6Metric___cinit__(struct __pyx_obj_4cdec_5_cdec_Metric *__pyx_v_self); /* proto */
@@ -2137,371 +2240,377 @@ static PyObject *__pyx_pf_4cdec_5_cdec_2set_silent(CYTHON_UNUSED PyObject *__pyx
 static PyObject *__pyx_pf_4cdec_5_cdec_4_make_config(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_config); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_8__init___genexpr(PyObject *__pyx_self); /* proto */
 static int __pyx_pf_4cdec_5_cdec_7Decoder___init__(struct __pyx_obj_4cdec_5_cdec_Decoder *__pyx_v_self, PyObject *__pyx_v_config_str, PyObject *__pyx_v_config); /* proto */
-static void __pyx_pf_4cdec_5_cdec_7Decoder_2__dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_Decoder *__pyx_v_self); /* proto */
+static void __pyx_pf_4cdec_5_cdec_7Decoder_2__dealloc__(struct __pyx_obj_4cdec_5_cdec_Decoder *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_7weights___get__(struct __pyx_obj_4cdec_5_cdec_Decoder *__pyx_v_self); /* proto */
 static int __pyx_pf_4cdec_5_cdec_7Decoder_7weights_2__set__(struct __pyx_obj_4cdec_5_cdec_Decoder *__pyx_v_self, PyObject *__pyx_v_weights); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_9formalism___get__(struct __pyx_obj_4cdec_5_cdec_Decoder *__pyx_v_self); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(struct __pyx_obj_4cdec_5_cdec_Decoder *__pyx_v_self, PyObject *__pyx_v_weights); /* proto */
 static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_6translate(struct __pyx_obj_4cdec_5_cdec_Decoder *__pyx_v_self, PyObject *__pyx_v_sentence, PyObject *__pyx_v_grammar); /* proto */
-static PyObject *__pyx_tp_new_4cdec_5_cdec_TRule(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec_MRule(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_22___iter__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
 static PyObject *__pyx_tp_new_4cdec_5_cdec_DenseVector(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec_SufficientStats(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_21___iter__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec_Metric(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec_Candidate(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
 static PyObject *__pyx_tp_new_4cdec_5_cdec_SparseVector(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_15___get__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
 static PyObject *__pyx_tp_new_4cdec_5_cdec_NT(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec_Lattice(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_23__make_config(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec_HypergraphEdge(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_2__phrase(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_13___get__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_20_lines(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec_Scorer(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec_HypergraphNode(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_10_kbest_features(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
 static PyObject *__pyx_tp_new_4cdec_5_cdec_NTRef(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec_TRule(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec_MRule(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
 static PyObject *__pyx_tp_new_4cdec_5_cdec_Grammar(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec_TextGrammar(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
 static PyObject *__pyx_tp_new_4cdec_5_cdec_Hypergraph(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_24___init__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec_HypergraphEdge(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec_HypergraphNode(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec_Lattice(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec_Candidate(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec_SufficientStats(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
 static PyObject *__pyx_tp_new_4cdec_5_cdec_CandidateSet(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_19_todot(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_5___str__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
 static PyObject *__pyx_tp_new_4cdec_5_cdec_SegmentEvaluator(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_16___get__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_25_genexpr(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec_Scorer(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec_Metric(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec_Decoder(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct____iter__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_1___iter__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_2__phrase(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
 static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_3_genexpr(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_11_sample(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_4___get__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_5___str__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_6_genexpr(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_7___iter__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
 static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_8_kbest(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_10_kbest_features(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_11_sample(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_12_sample_trees(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_13___get__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
 static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_14___get__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_7___iter__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec_TextGrammar(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec_Decoder(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct____iter__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_15___get__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_16___get__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
 static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_17___get__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
 static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_18___iter__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_6_genexpr(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_12_sample_trees(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_4___get__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_1___iter__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
-static char __pyx_k_1[] = "Cannot convert type %s to str";
-static char __pyx_k_3[] = "cannot take the dot product of %s and SparseVector";
-static char __pyx_k_4[] = "comparison not implemented for SparseVector";
-static char __pyx_k_7[] = " ";
-static char __pyx_k_8[] = "[%s,%d]";
-static char __pyx_k_9[] = "[%s]";
-static char __pyx_k_10[] = "[%d]";
-static char __pyx_k_11[] = "%s=%s";
-static char __pyx_k_12[] = "%s ||| %s ||| %s ||| %s";
-static char __pyx_k_13[] = "the grammar should contain TRule objects";
-static char __pyx_k_15[] = "cannot intersect hypergraph with %s";
-static char __pyx_k_16[] = "csplit_preserve_full_word";
-static char __pyx_k_17[] = "cannot reweight hypergraph with %s";
-static char __pyx_k_18[] = "comparison not implemented for HypergraphEdge";
-static char __pyx_k_20[] = "comparison not implemented for HypergraphNode";
-static char __pyx_k_22[] = "cannot create lattice from %s";
-static char __pyx_k_23[] = "lattice index out of range";
-static char __pyx_k_26[] = "digraph lattice {";
-  static char __pyx_k_27[] = "rankdir = LR;";
-  static char __pyx_k_28[] = "node [shape=circle];";
-  static char __pyx_k_29[] = "%d -> %d [label=\"%s\"];";
-  static char __pyx_k_30[] = "\"";
-  static char __pyx_k_31[] = "\\\"";
-  static char __pyx_k_33[] = "%d [shape=doublecircle]";
-static char __pyx_k_34[] = "}";
-static char __pyx_k_37[] = "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi";
-static char __pyx_k_38[] = "Lattice.todot.<locals>.lines";
-static char __pyx_k_39[] = "cdec._cdec";
-static char __pyx_k_40[] = "\n";
-static char __pyx_k_42[] = "sufficient stats vector index out of range";
-static char __pyx_k_44[] = "candidate set index out of range";
-static char __pyx_k_46[] = "%s %s";
-static char __pyx_k_47[] = "%s = %s";
-static char __pyx_k_48[] = "formalism \"%s\" unknown";
-static char __pyx_k_49[] = "cannot initialize weights with %s";
-static char __pyx_k_50[] = "#";
-static char __pyx_k_53[] = "Cannot translate input type %s";
-static char __pyx_k_54[] = "cdec.sa._sa";
-static char __pyx_k_55[] = "*";
-static char __pyx_k_58[] = "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi";
-static char __pyx_k_66[] = "/home/pks/src/cdec-dtrain/python/cdec/_cdec.pyx";
-static char __pyx_k__a[] = "a";
-static char __pyx_k__e[] = "e";
-static char __pyx_k__f[] = "f";
-static char __pyx_k__i[] = "i";
-static char __pyx_k__k[] = "k";
-static char __pyx_k__pb[] = "pb";
-static char __pyx_k__yn[] = "yn";
-static char __pyx_k__CER[] = "CER";
-static char __pyx_k__SSK[] = "SSK";
-static char __pyx_k__TER[] = "TER";
-static char __pyx_k___sa[] = "_sa";
-static char __pyx_k__cat[] = "cat";
-static char __pyx_k__dot[] = "dot";
-static char __pyx_k__fst[] = "fst";
-static char __pyx_k__get[] = "get";
-static char __pyx_k__hyp[] = "hyp";
-static char __pyx_k__inp[] = "inp";
-static char __pyx_k__key[] = "key";
-static char __pyx_k__lhs[] = "lhs";
-static char __pyx_k__plf[] = "plf";
-static char __pyx_k__ref[] = "ref";
-static char __pyx_k__rhs[] = "rhs";
-static char __pyx_k__BLEU[] = "BLEU";
-static char __pyx_k__QCRI[] = "QCRI";
-static char __pyx_k__args[] = "args";
-static char __pyx_k__eval[] = "eval";
-static char __pyx_k__info[] = "info";
-static char __pyx_k__join[] = "join";
-static char __pyx_k__name[] = "name";
-static char __pyx_k__open[] = "open";
-static char __pyx_k__refs[] = "refs";
-static char __pyx_k__scfg[] = "scfg";
-static char __pyx_k__self[] = "self";
-static char __pyx_k__send[] = "send";
-static char __pyx_k__span[] = "span";
-static char __pyx_k__utf8[] = "utf8";
-static char __pyx_k__close[] = "close";
-static char __pyx_k__delta[] = "delta";
-static char __pyx_k__items[] = "items";
-static char __pyx_k__label[] = "label";
-static char __pyx_k__lines[] = "lines";
-static char __pyx_k__range[] = "range";
-static char __pyx_k__rules[] = "rules";
-static char __pyx_k__score[] = "score";
-static char __pyx_k__split[] = "split";
-static char __pyx_k__strip[] = "strip";
-static char __pyx_k__super[] = "super";
-static char __pyx_k__throw[] = "throw";
-static char __pyx_k__value[] = "value";
-static char __pyx_k__append[] = "append";
-static char __pyx_k__config[] = "config";
-static char __pyx_k__csplit[] = "csplit";
-static char __pyx_k__encode[] = "encode";
-static char __pyx_k__format[] = "format";
-static char __pyx_k__phrase[] = "phrase";
-static char __pyx_k__scores[] = "scores";
-static char __pyx_k__tagger[] = "tagger";
-static char __pyx_k__weight[] = "weight";
-static char __pyx_k___phrase[] = "_phrase";
-static char __pyx_k__density[] = "density";
-static char __pyx_k__genexpr[] = "genexpr";
-static char __pyx_k__grammar[] = "grammar";
-static char __pyx_k__replace[] = "replace";
-static char __pyx_k__IBM_BLEU[] = "IBM_BLEU";
-static char __pyx_k__KeyError[] = "KeyError";
-static char __pyx_k____dict__[] = "__dict__";
-static char __pyx_k____exit__[] = "__exit__";
-static char __pyx_k____init__[] = "__init__";
-static char __pyx_k____main__[] = "__main__";
-static char __pyx_k____name__[] = "__name__";
-static char __pyx_k____test__[] = "__test__";
-static char __pyx_k__encoding[] = "encoding";
-static char __pyx_k__evaluate[] = "evaluate";
-static char __pyx_k__in_edges[] = "in_edges";
-static char __pyx_k__lexalign[] = "lexalign";
-static char __pyx_k__lextrans[] = "lextrans";
-static char __pyx_k__sentence[] = "sentence";
-static char __pyx_k__Exception[] = "Exception";
-static char __pyx_k__QCRI_BLEU[] = "QCRI_BLEU";
-static char __pyx_k__TypeError[] = "TypeError";
-static char __pyx_k____class__[] = "__class__";
-static char __pyx_k____enter__[] = "__enter__";
-static char __pyx_k__enumerate[] = "enumerate";
-static char __pyx_k__evaluator[] = "evaluator";
-static char __pyx_k__formalism[] = "formalism";
-static char __pyx_k__IndexError[] = "IndexError";
-static char __pyx_k__ValueError[] = "ValueError";
-static char __pyx_k____import__[] = "__import__";
-static char __pyx_k____module__[] = "__module__";
-static char __pyx_k__alignments[] = "alignments";
-static char __pyx_k__beam_alpha[] = "beam_alpha";
-static char __pyx_k__config_str[] = "config_str";
-static char __pyx_k__hypergraph[] = "hypergraph";
-static char __pyx_k__set_silent[] = "set_silent";
-static char __pyx_k__startswith[] = "startswith";
-static char __pyx_k__ParseFailed[] = "ParseFailed";
-static char __pyx_k____qualname__[] = "__qualname__";
-static char __pyx_k___make_config[] = "_make_config";
-static char __pyx_k__InvalidConfig[] = "InvalidConfig";
-static char __pyx_k____metaclass__[] = "__metaclass__";
-static char __pyx_k__NotImplemented[] = "NotImplemented";
-static char __pyx_k____pyx_vtable__[] = "__pyx_vtable__";
-static PyObject *__pyx_kp_s_10;
-static PyObject *__pyx_kp_s_11;
-static PyObject *__pyx_kp_s_12;
-static PyObject *__pyx_kp_s_13;
-static PyObject *__pyx_kp_s_15;
-static PyObject *__pyx_n_s_16;
-static PyObject *__pyx_kp_s_17;
-static PyObject *__pyx_kp_s_18;
-static PyObject *__pyx_kp_s_20;
-static PyObject *__pyx_kp_s_22;
-static PyObject *__pyx_kp_s_23;
-static PyObject *__pyx_kp_s_26;
-static PyObject *__pyx_kp_s_27;
-static PyObject *__pyx_kp_s_28;
-static PyObject *__pyx_kp_s_29;
-static PyObject *__pyx_kp_s_3;
-static PyObject *__pyx_kp_s_30;
-static PyObject *__pyx_kp_s_31;
-static PyObject *__pyx_kp_s_33;
-static PyObject *__pyx_kp_s_34;
-static PyObject *__pyx_kp_s_37;
-static PyObject *__pyx_n_s_38;
-static PyObject *__pyx_n_s_39;
-static PyObject *__pyx_kp_s_4;
-static PyObject *__pyx_kp_s_40;
-static PyObject *__pyx_kp_s_42;
-static PyObject *__pyx_kp_s_44;
-static PyObject *__pyx_kp_s_46;
-static PyObject *__pyx_kp_s_47;
-static PyObject *__pyx_kp_s_48;
-static PyObject *__pyx_kp_s_49;
-static PyObject *__pyx_kp_s_50;
-static PyObject *__pyx_kp_s_53;
-static PyObject *__pyx_n_s_54;
-static PyObject *__pyx_n_s_55;
-static PyObject *__pyx_kp_s_58;
-static PyObject *__pyx_kp_s_66;
-static PyObject *__pyx_kp_s_7;
-static PyObject *__pyx_kp_s_8;
-static PyObject *__pyx_kp_s_9;
-static PyObject *__pyx_n_s__BLEU;
-static PyObject *__pyx_n_s__CER;
-static PyObject *__pyx_n_s__Exception;
-static PyObject *__pyx_n_s__IBM_BLEU;
-static PyObject *__pyx_n_s__IndexError;
-static PyObject *__pyx_n_s__InvalidConfig;
-static PyObject *__pyx_n_s__KeyError;
-static PyObject *__pyx_n_s__NotImplemented;
-static PyObject *__pyx_n_s__ParseFailed;
-static PyObject *__pyx_n_s__QCRI;
-static PyObject *__pyx_n_s__QCRI_BLEU;
-static PyObject *__pyx_n_s__SSK;
-static PyObject *__pyx_n_s__TER;
-static PyObject *__pyx_n_s__TypeError;
-static PyObject *__pyx_n_s__ValueError;
-static PyObject *__pyx_n_s____class__;
-static PyObject *__pyx_n_s____dict__;
-static PyObject *__pyx_n_s____enter__;
-static PyObject *__pyx_n_s____exit__;
-static PyObject *__pyx_n_s____import__;
-static PyObject *__pyx_n_s____init__;
-static PyObject *__pyx_n_s____main__;
-static PyObject *__pyx_n_s____metaclass__;
-static PyObject *__pyx_n_s____module__;
-static PyObject *__pyx_n_s____name__;
-static PyObject *__pyx_n_s____pyx_vtable__;
-static PyObject *__pyx_n_s____qualname__;
-static PyObject *__pyx_n_s____test__;
-static PyObject *__pyx_n_s___make_config;
-static PyObject *__pyx_n_s___phrase;
-static PyObject *__pyx_n_s___sa;
-static PyObject *__pyx_n_s__a;
-static PyObject *__pyx_n_s__alignments;
-static PyObject *__pyx_n_s__append;
-static PyObject *__pyx_n_s__args;
-static PyObject *__pyx_n_s__beam_alpha;
-static PyObject *__pyx_n_s__cat;
-static PyObject *__pyx_n_s__close;
-static PyObject *__pyx_n_s__config;
-static PyObject *__pyx_n_s__config_str;
-static PyObject *__pyx_n_s__csplit;
-static PyObject *__pyx_n_s__delta;
-static PyObject *__pyx_n_s__density;
-static PyObject *__pyx_n_s__dot;
-static PyObject *__pyx_n_s__e;
-static PyObject *__pyx_n_s__encode;
-static PyObject *__pyx_n_s__encoding;
-static PyObject *__pyx_n_s__enumerate;
-static PyObject *__pyx_n_s__eval;
-static PyObject *__pyx_n_s__evaluate;
-static PyObject *__pyx_n_s__evaluator;
-static PyObject *__pyx_n_s__f;
-static PyObject *__pyx_n_s__formalism;
-static PyObject *__pyx_n_s__format;
-static PyObject *__pyx_n_s__fst;
-static PyObject *__pyx_n_s__genexpr;
-static PyObject *__pyx_n_s__get;
-static PyObject *__pyx_n_s__grammar;
-static PyObject *__pyx_n_s__hyp;
-static PyObject *__pyx_n_s__hypergraph;
-static PyObject *__pyx_n_s__i;
-static PyObject *__pyx_n_s__in_edges;
-static PyObject *__pyx_n_s__info;
-static PyObject *__pyx_n_s__inp;
-static PyObject *__pyx_n_s__items;
-static PyObject *__pyx_n_s__join;
-static PyObject *__pyx_n_s__k;
-static PyObject *__pyx_n_s__key;
-static PyObject *__pyx_n_s__label;
-static PyObject *__pyx_n_s__lexalign;
-static PyObject *__pyx_n_s__lextrans;
-static PyObject *__pyx_n_s__lhs;
-static PyObject *__pyx_n_s__lines;
-static PyObject *__pyx_n_s__name;
-static PyObject *__pyx_n_s__open;
-static PyObject *__pyx_n_s__pb;
-static PyObject *__pyx_n_s__phrase;
-static PyObject *__pyx_n_s__plf;
-static PyObject *__pyx_n_s__range;
-static PyObject *__pyx_n_s__ref;
-static PyObject *__pyx_n_s__refs;
-static PyObject *__pyx_n_s__replace;
-static PyObject *__pyx_n_s__rhs;
-static PyObject *__pyx_n_s__rules;
-static PyObject *__pyx_n_s__scfg;
-static PyObject *__pyx_n_s__score;
-static PyObject *__pyx_n_s__scores;
-static PyObject *__pyx_n_s__self;
-static PyObject *__pyx_n_s__send;
-static PyObject *__pyx_n_s__sentence;
-static PyObject *__pyx_n_s__set_silent;
-static PyObject *__pyx_n_s__span;
-static PyObject *__pyx_n_s__split;
-static PyObject *__pyx_n_s__startswith;
-static PyObject *__pyx_n_s__strip;
-static PyObject *__pyx_n_s__super;
-static PyObject *__pyx_n_s__tagger;
-static PyObject *__pyx_n_s__throw;
-static PyObject *__pyx_n_s__utf8;
-static PyObject *__pyx_n_s__value;
-static PyObject *__pyx_n_s__weight;
-static PyObject *__pyx_n_s__yn;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_19_todot(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_20_lines(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_21___iter__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_22___iter__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_23__make_config(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_24___init__(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_25_genexpr(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/
+static char __pyx_k_a[] = "a";
+static char __pyx_k_d[] = "[%d]";
+static char __pyx_k_e[] = "e";
+static char __pyx_k_f[] = "f";
+static char __pyx_k_i[] = "i";
+static char __pyx_k_k[] = "k";
+static char __pyx_k_s[] = "[%s]";
+static char __pyx_k__4[] = " ";
+static char __pyx_k_pb[] = "pb";
+static char __pyx_k_sa[] = "_sa";
+static char __pyx_k_yn[] = "yn";
+static char __pyx_k_CER[] = "CER";
+static char __pyx_k_SSK[] = "SSK";
+static char __pyx_k_TER[] = "TER";
+static char __pyx_k__10[] = "\"";
+static char __pyx_k__11[] = "\\\"";
+static char __pyx_k__13[] = "}";
+static char __pyx_k__16[] = "\n";
+static char __pyx_k__20[] = "#";
+static char __pyx_k__23[] = "*";
+static char __pyx_k_cat[] = "cat";
+static char __pyx_k_doc[] = "__doc__";
+static char __pyx_k_dot[] = "dot";
+static char __pyx_k_fst[] = "fst";
+static char __pyx_k_get[] = "get";
+static char __pyx_k_hyp[] = "hyp";
+static char __pyx_k_inp[] = "inp";
+static char __pyx_k_key[] = "key";
+static char __pyx_k_lhs[] = "lhs";
+static char __pyx_k_plf[] = "plf";
+static char __pyx_k_ref[] = "ref";
+static char __pyx_k_rhs[] = "rhs";
+static char __pyx_k_s_d[] = "[%s,%d]";
+static char __pyx_k_s_s[] = "%s=%s";
+static char __pyx_k_BLEU[] = "BLEU";
+static char __pyx_k_QCRI[] = "QCRI";
+static char __pyx_k_args[] = "args";
+static char __pyx_k_dict[] = "__dict__";
+static char __pyx_k_eval[] = "eval";
+static char __pyx_k_exit[] = "__exit__";
+static char __pyx_k_info[] = "info";
+static char __pyx_k_init[] = "__init__";
+static char __pyx_k_join[] = "join";
+static char __pyx_k_main[] = "__main__";
+static char __pyx_k_name[] = "name";
+static char __pyx_k_open[] = "open";
+static char __pyx_k_refs[] = "refs";
+static char __pyx_k_scfg[] = "scfg";
+static char __pyx_k_self[] = "self";
+static char __pyx_k_send[] = "send";
+static char __pyx_k_span[] = "span";
+static char __pyx_k_test[] = "__test__";
+static char __pyx_k_text[] = "text";
+static char __pyx_k_utf8[] = "utf8";
+static char __pyx_k_class[] = "__class__";
+static char __pyx_k_close[] = "close";
+static char __pyx_k_delta[] = "delta";
+static char __pyx_k_enter[] = "__enter__";
+static char __pyx_k_items[] = "items";
+static char __pyx_k_label[] = "label";
+static char __pyx_k_lines[] = "lines";
+static char __pyx_k_range[] = "range";
+static char __pyx_k_rules[] = "rules";
+static char __pyx_k_s_s_2[] = "%s %s";
+static char __pyx_k_s_s_3[] = "%s = %s";
+static char __pyx_k_score[] = "score";
+static char __pyx_k_split[] = "split";
+static char __pyx_k_strip[] = "strip";
+static char __pyx_k_super[] = "super";
+static char __pyx_k_throw[] = "throw";
+static char __pyx_k_value[] = "value";
+static char __pyx_k_append[] = "append";
+static char __pyx_k_config[] = "config";
+static char __pyx_k_csplit[] = "csplit";
+static char __pyx_k_encode[] = "encode";
+static char __pyx_k_format[] = "format";
+static char __pyx_k_import[] = "__import__";
+static char __pyx_k_module[] = "__module__";
+static char __pyx_k_name_2[] = "__name__";
+static char __pyx_k_phrase[] = "_phrase";
+static char __pyx_k_scores[] = "scores";
+static char __pyx_k_tagger[] = "tagger";
+static char __pyx_k_weight[] = "weight";
+static char __pyx_k_density[] = "density";
+static char __pyx_k_genexpr[] = "genexpr";
+static char __pyx_k_grammar[] = "grammar";
+static char __pyx_k_prepare[] = "__prepare__";
+static char __pyx_k_replace[] = "replace";
+static char __pyx_k_s_s_s_s[] = "%s ||| %s ||| %s ||| %s";
+static char __pyx_k_IBM_BLEU[] = "IBM_BLEU";
+static char __pyx_k_KeyError[] = "KeyError";
+static char __pyx_k_encoding[] = "encoding";
+static char __pyx_k_evaluate[] = "evaluate";
+static char __pyx_k_in_edges[] = "in_edges";
+static char __pyx_k_lexalign[] = "lexalign";
+static char __pyx_k_lextrans[] = "lextrans";
+static char __pyx_k_phrase_2[] = "phrase";
+static char __pyx_k_qualname[] = "__qualname__";
+static char __pyx_k_sentence[] = "sentence";
+static char __pyx_k_Exception[] = "Exception";
+static char __pyx_k_QCRI_BLEU[] = "QCRI_BLEU";
+static char __pyx_k_TypeError[] = "TypeError";
+static char __pyx_k_enumerate[] = "enumerate";
+static char __pyx_k_evaluator[] = "evaluator";
+static char __pyx_k_formalism[] = "formalism";
+static char __pyx_k_metaclass[] = "__metaclass__";
+static char __pyx_k_IndexError[] = "IndexError";
+static char __pyx_k_ValueError[] = "ValueError";
+static char __pyx_k_alignments[] = "alignments";
+static char __pyx_k_beam_alpha[] = "beam_alpha";
+static char __pyx_k_cdec__cdec[] = "cdec._cdec";
+static char __pyx_k_config_str[] = "config_str";
+static char __pyx_k_hypergraph[] = "hypergraph";
+static char __pyx_k_pyx_vtable[] = "__pyx_vtable__";
+static char __pyx_k_rankdir_LR[] = "rankdir = LR;";
+static char __pyx_k_set_silent[] = "set_silent";
+static char __pyx_k_startswith[] = "startswith";
+static char __pyx_k_ParseFailed[] = "ParseFailed";
+static char __pyx_k_cdec_sa__sa[] = "cdec.sa._sa";
+static char __pyx_k_d_d_label_s[] = "%d -> %d [label=\"%s\"];";
+static char __pyx_k_make_config[] = "_make_config";
+static char __pyx_k_InvalidConfig[] = "InvalidConfig";
+static char __pyx_k_NotImplemented[] = "NotImplemented";
+static char __pyx_k_digraph_lattice[] = "digraph lattice {";
+static char __pyx_k_node_shape_circle[] = "node [shape=circle];";
+static char __pyx_k_todot_locals_lines[] = "todot.<locals>.lines";
+static char __pyx_k_formalism_s_unknown[] = "formalism \"%s\" unknown";
+static char __pyx_k_d_shape_doublecircle[] = "%d [shape=doublecircle]";
+static char __pyx_k_csplit_preserve_full_word[] = "csplit_preserve_full_word";
+static char __pyx_k_lattice_index_out_of_range[] = "lattice index out of range";
+static char __pyx_k_Cannot_convert_type_s_to_str[] = "Cannot convert type %s to str";
+static char __pyx_k_cannot_create_lattice_from_s[] = "cannot create lattice from %s";
+static char __pyx_k_Cannot_translate_input_type_s[] = "Cannot translate input type %s";
+static char __pyx_k_cannot_reweight_hypergraph_with[] = "cannot reweight hypergraph with %s";
+static char __pyx_k_usr0_home_cdyer_cdec_python_cde[] = "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi";
+static char __pyx_k_candidate_set_index_out_of_range[] = "candidate set index out of range";
+static char __pyx_k_cannot_initialize_weights_with_s[] = "cannot initialize weights with %s";
+static char __pyx_k_cannot_intersect_hypergraph_with[] = "cannot intersect hypergraph with %s";
+static char __pyx_k_cannot_take_the_dot_product_of_s[] = "cannot take the dot product of %s and SparseVector";
+static char __pyx_k_comparison_not_implemented_for_H[] = "comparison not implemented for HypergraphEdge";
+static char __pyx_k_comparison_not_implemented_for_S[] = "comparison not implemented for SparseVector";
+static char __pyx_k_sufficient_stats_vector_index_ou[] = "sufficient stats vector index out of range";
+static char __pyx_k_the_grammar_should_contain_TRule[] = "the grammar should contain TRule objects";
+static char __pyx_k_usr0_home_cdyer_cdec_python_cde_2[] = "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi";
+static char __pyx_k_usr0_home_cdyer_cdec_python_cde_3[] = "/usr0/home/cdyer/cdec/python/cdec/_cdec.pyx";
+static char __pyx_k_comparison_not_implemented_for_H_2[] = "comparison not implemented for HypergraphNode";
+static PyObject *__pyx_n_s_BLEU;
+static PyObject *__pyx_n_s_CER;
+static PyObject *__pyx_kp_s_Cannot_translate_input_type_s;
+static PyObject *__pyx_n_s_Exception;
+static PyObject *__pyx_n_s_IBM_BLEU;
+static PyObject *__pyx_n_s_IndexError;
+static PyObject *__pyx_n_s_InvalidConfig;
+static PyObject *__pyx_n_s_KeyError;
+static PyObject *__pyx_n_s_NotImplemented;
+static PyObject *__pyx_n_s_ParseFailed;
+static PyObject *__pyx_n_s_QCRI;
+static PyObject *__pyx_n_s_QCRI_BLEU;
+static PyObject *__pyx_n_s_SSK;
+static PyObject *__pyx_n_s_TER;
+static PyObject *__pyx_n_s_TypeError;
+static PyObject *__pyx_n_s_ValueError;
+static PyObject *__pyx_kp_s__10;
+static PyObject *__pyx_kp_s__11;
+static PyObject *__pyx_kp_s__13;
+static PyObject *__pyx_kp_s__16;
+static PyObject *__pyx_kp_s__20;
+static PyObject *__pyx_n_s__23;
+static PyObject *__pyx_kp_s__4;
+static PyObject *__pyx_n_s_a;
+static PyObject *__pyx_n_s_alignments;
+static PyObject *__pyx_n_s_append;
+static PyObject *__pyx_n_s_args;
+static PyObject *__pyx_n_s_beam_alpha;
+static PyObject *__pyx_kp_s_candidate_set_index_out_of_range;
+static PyObject *__pyx_kp_s_cannot_create_lattice_from_s;
+static PyObject *__pyx_kp_s_cannot_initialize_weights_with_s;
+static PyObject *__pyx_kp_s_cannot_intersect_hypergraph_with;
+static PyObject *__pyx_kp_s_cannot_reweight_hypergraph_with;
+static PyObject *__pyx_kp_s_cannot_take_the_dot_product_of_s;
+static PyObject *__pyx_n_s_cat;
+static PyObject *__pyx_n_s_cdec__cdec;
+static PyObject *__pyx_n_s_cdec_sa__sa;
+static PyObject *__pyx_n_s_class;
+static PyObject *__pyx_n_s_close;
+static PyObject *__pyx_kp_s_comparison_not_implemented_for_H;
+static PyObject *__pyx_kp_s_comparison_not_implemented_for_H_2;
+static PyObject *__pyx_kp_s_comparison_not_implemented_for_S;
+static PyObject *__pyx_n_s_config;
+static PyObject *__pyx_n_s_config_str;
+static PyObject *__pyx_n_s_csplit;
+static PyObject *__pyx_n_s_csplit_preserve_full_word;
+static PyObject *__pyx_kp_s_d;
+static PyObject *__pyx_kp_s_d_d_label_s;
+static PyObject *__pyx_kp_s_d_shape_doublecircle;
+static PyObject *__pyx_n_s_delta;
+static PyObject *__pyx_n_s_density;
+static PyObject *__pyx_n_s_dict;
+static PyObject *__pyx_kp_s_digraph_lattice;
+static PyObject *__pyx_n_s_doc;
+static PyObject *__pyx_n_s_dot;
+static PyObject *__pyx_n_s_e;
+static PyObject *__pyx_n_s_encode;
+static PyObject *__pyx_n_s_encoding;
+static PyObject *__pyx_n_s_enter;
+static PyObject *__pyx_n_s_enumerate;
+static PyObject *__pyx_n_s_eval;
+static PyObject *__pyx_n_s_evaluate;
+static PyObject *__pyx_n_s_evaluator;
+static PyObject *__pyx_n_s_exit;
+static PyObject *__pyx_n_s_f;
+static PyObject *__pyx_n_s_formalism;
+static PyObject *__pyx_kp_s_formalism_s_unknown;
+static PyObject *__pyx_n_s_format;
+static PyObject *__pyx_n_s_fst;
+static PyObject *__pyx_n_s_genexpr;
+static PyObject *__pyx_n_s_get;
+static PyObject *__pyx_n_s_grammar;
+static PyObject *__pyx_n_s_hyp;
+static PyObject *__pyx_n_s_hypergraph;
+static PyObject *__pyx_n_s_i;
+static PyObject *__pyx_n_s_import;
+static PyObject *__pyx_n_s_in_edges;
+static PyObject *__pyx_n_s_info;
+static PyObject *__pyx_n_s_init;
+static PyObject *__pyx_n_s_inp;
+static PyObject *__pyx_n_s_items;
+static PyObject *__pyx_n_s_join;
+static PyObject *__pyx_n_s_k;
+static PyObject *__pyx_n_s_key;
+static PyObject *__pyx_n_s_label;
+static PyObject *__pyx_kp_s_lattice_index_out_of_range;
+static PyObject *__pyx_n_s_lexalign;
+static PyObject *__pyx_n_s_lextrans;
+static PyObject *__pyx_n_s_lhs;
+static PyObject *__pyx_n_s_lines;
+static PyObject *__pyx_n_s_main;
+static PyObject *__pyx_n_s_make_config;
+static PyObject *__pyx_n_s_metaclass;
+static PyObject *__pyx_n_s_module;
+static PyObject *__pyx_n_s_name;
+static PyObject *__pyx_n_s_name_2;
+static PyObject *__pyx_kp_s_node_shape_circle;
+static PyObject *__pyx_n_s_open;
+static PyObject *__pyx_n_s_pb;
+static PyObject *__pyx_n_s_phrase;
+static PyObject *__pyx_n_s_phrase_2;
+static PyObject *__pyx_n_s_plf;
+static PyObject *__pyx_n_s_prepare;
+static PyObject *__pyx_n_s_pyx_vtable;
+static PyObject *__pyx_n_s_qualname;
+static PyObject *__pyx_n_s_range;
+static PyObject *__pyx_kp_s_rankdir_LR;
+static PyObject *__pyx_n_s_ref;
+static PyObject *__pyx_n_s_refs;
+static PyObject *__pyx_n_s_replace;
+static PyObject *__pyx_n_s_rhs;
+static PyObject *__pyx_n_s_rules;
+static PyObject *__pyx_kp_s_s;
+static PyObject *__pyx_kp_s_s_d;
+static PyObject *__pyx_kp_s_s_s;
+static PyObject *__pyx_kp_s_s_s_2;
+static PyObject *__pyx_kp_s_s_s_3;
+static PyObject *__pyx_kp_s_s_s_s_s;
+static PyObject *__pyx_n_s_sa;
+static PyObject *__pyx_n_s_scfg;
+static PyObject *__pyx_n_s_score;
+static PyObject *__pyx_n_s_scores;
+static PyObject *__pyx_n_s_self;
+static PyObject *__pyx_n_s_send;
+static PyObject *__pyx_n_s_sentence;
+static PyObject *__pyx_n_s_set_silent;
+static PyObject *__pyx_n_s_span;
+static PyObject *__pyx_n_s_split;
+static PyObject *__pyx_n_s_startswith;
+static PyObject *__pyx_n_s_strip;
+static PyObject *__pyx_kp_s_sufficient_stats_vector_index_ou;
+static PyObject *__pyx_n_s_super;
+static PyObject *__pyx_n_s_tagger;
+static PyObject *__pyx_n_s_test;
+static PyObject *__pyx_n_s_text;
+static PyObject *__pyx_kp_s_the_grammar_should_contain_TRule;
+static PyObject *__pyx_n_s_throw;
+static PyObject *__pyx_n_s_todot_locals_lines;
+static PyObject *__pyx_kp_s_usr0_home_cdyer_cdec_python_cde;
+static PyObject *__pyx_kp_s_usr0_home_cdyer_cdec_python_cde_2;
+static PyObject *__pyx_kp_s_usr0_home_cdyer_cdec_python_cde_3;
+static PyObject *__pyx_n_s_utf8;
+static PyObject *__pyx_n_s_value;
+static PyObject *__pyx_n_s_weight;
+static PyObject *__pyx_n_s_yn;
 static PyObject *__pyx_int_0;
 static PyObject *__pyx_int_1;
-static PyObject *__pyx_k_tuple_2;
-static PyObject *__pyx_k_tuple_5;
-static PyObject *__pyx_k_tuple_6;
-static PyObject *__pyx_k_tuple_14;
-static PyObject *__pyx_k_tuple_19;
-static PyObject *__pyx_k_tuple_21;
-static PyObject *__pyx_k_tuple_24;
-static PyObject *__pyx_k_tuple_25;
-static PyObject *__pyx_k_tuple_32;
-static PyObject *__pyx_k_tuple_35;
-static PyObject *__pyx_k_tuple_41;
-static PyObject *__pyx_k_tuple_43;
-static PyObject *__pyx_k_tuple_45;
-static PyObject *__pyx_k_tuple_51;
-static PyObject *__pyx_k_tuple_52;
-static PyObject *__pyx_k_tuple_56;
-static PyObject *__pyx_k_tuple_59;
-static PyObject *__pyx_k_tuple_60;
-static PyObject *__pyx_k_tuple_61;
-static PyObject *__pyx_k_tuple_62;
-static PyObject *__pyx_k_tuple_63;
-static PyObject *__pyx_k_tuple_64;
-static PyObject *__pyx_k_tuple_67;
-static PyObject *__pyx_k_codeobj_36;
-static PyObject *__pyx_k_codeobj_57;
-static PyObject *__pyx_k_codeobj_65;
-static PyObject *__pyx_k_codeobj_68;
+static PyObject *__pyx_tuple_;
+static PyObject *__pyx_tuple__2;
+static PyObject *__pyx_tuple__3;
+static PyObject *__pyx_tuple__5;
+static PyObject *__pyx_tuple__6;
+static PyObject *__pyx_tuple__7;
+static PyObject *__pyx_tuple__8;
+static PyObject *__pyx_tuple__9;
+static PyObject *__pyx_tuple__12;
+static PyObject *__pyx_tuple__14;
+static PyObject *__pyx_tuple__17;
+static PyObject *__pyx_tuple__18;
+static PyObject *__pyx_tuple__19;
+static PyObject *__pyx_tuple__21;
+static PyObject *__pyx_tuple__22;
+static PyObject *__pyx_tuple__24;
+static PyObject *__pyx_tuple__26;
+static PyObject *__pyx_tuple__27;
+static PyObject *__pyx_tuple__28;
+static PyObject *__pyx_tuple__29;
+static PyObject *__pyx_tuple__30;
+static PyObject *__pyx_tuple__31;
+static PyObject *__pyx_tuple__33;
+static PyObject *__pyx_codeobj__15;
+static PyObject *__pyx_codeobj__25;
+static PyObject *__pyx_codeobj__32;
+static PyObject *__pyx_codeobj__34;
 
 /* "cdec/_cdec.pyx":6
  * cimport decoder
@@ -2512,7 +2621,7 @@ static PyObject *__pyx_k_codeobj_68;
  */
 
 static PyObject *__pyx_f_4cdec_5_cdec_as_str(PyObject *__pyx_v_data, struct __pyx_opt_args_4cdec_5_cdec_as_str *__pyx_optional_args) {
-  char *__pyx_v_error_msg = ((char *)__pyx_k_1);
+  char *__pyx_v_error_msg = ((char *)__pyx_k_Cannot_convert_type_s_to_str);
   PyObject *__pyx_v_ret = 0;
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -2549,12 +2658,12 @@ static PyObject *__pyx_f_4cdec_5_cdec_as_str(PyObject *__pyx_v_data, struct __py
  *     elif isinstance(data, str):
  *         ret = data
  */
-    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_data, __pyx_n_s__encode); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_data, __pyx_n_s_encode); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_k_tuple_2), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (!(likely(PyBytes_CheckExact(__pyx_t_4))||((__pyx_t_4) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected bytes, got %.200s", Py_TYPE(__pyx_t_4)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (!(likely(PyBytes_CheckExact(__pyx_t_4))||((__pyx_t_4) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "bytes", Py_TYPE(__pyx_t_4)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __pyx_v_ret = ((PyObject*)__pyx_t_4);
     __pyx_t_4 = 0;
     goto __pyx_L3;
@@ -2578,9 +2687,11 @@ static PyObject *__pyx_f_4cdec_5_cdec_as_str(PyObject *__pyx_v_data, struct __py
  *     else:
  *         raise TypeError(error_msg.format(type(data)))
  */
-    if (!(likely(PyBytes_CheckExact(__pyx_v_data))||((__pyx_v_data) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected bytes, got %.200s", Py_TYPE(__pyx_v_data)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_INCREF(__pyx_v_data);
-    __pyx_v_ret = ((PyObject*)__pyx_v_data);
+    if (!(likely(PyBytes_CheckExact(__pyx_v_data))||((__pyx_v_data) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "bytes", Py_TYPE(__pyx_v_data)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __pyx_v_data;
+    __Pyx_INCREF(__pyx_t_4);
+    __pyx_v_ret = ((PyObject*)__pyx_t_4);
+    __pyx_t_4 = 0;
     goto __pyx_L3;
   }
   /*else*/ {
@@ -2593,27 +2704,27 @@ static PyObject *__pyx_f_4cdec_5_cdec_as_str(PyObject *__pyx_v_data, struct __py
  * 
  */
     __pyx_t_4 = __Pyx_PyBytes_FromString(__pyx_v_error_msg); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_4));
-    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_t_4), __pyx_n_s__format); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_4);
+    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_format); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_INCREF(((PyObject *)Py_TYPE(__pyx_v_data)));
     PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)Py_TYPE(__pyx_v_data)));
     __Pyx_GIVEREF(((PyObject *)Py_TYPE(__pyx_v_data)));
-    __pyx_t_5 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
     PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_5);
     __Pyx_GIVEREF(__pyx_t_5);
     __pyx_t_5 = 0;
-    __pyx_t_5 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_5 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
-    __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_Raise(__pyx_t_5, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -2627,13 +2738,20 @@ static PyObject *__pyx_f_4cdec_5_cdec_as_str(PyObject *__pyx_v_data, struct __py
  * 
  * include "vectors.pxi"
  */
-  __Pyx_XDECREF(((PyObject *)__pyx_r));
-  __Pyx_INCREF(((PyObject *)__pyx_v_ret));
+  __Pyx_XDECREF(__pyx_r);
+  __Pyx_INCREF(__pyx_v_ret);
   __pyx_r = __pyx_v_ret;
   goto __pyx_L0;
 
-  __pyx_r = ((PyObject*)Py_None); __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "cdec/_cdec.pyx":6
+ * cimport decoder
+ * 
+ * cdef bytes as_str(data, char* error_msg='Cannot convert type %s to str'):             # <<<<<<<<<<<<<<
+ *     cdef bytes ret
+ *     if isinstance(data, unicode):
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_3);
   __Pyx_XDECREF(__pyx_t_4);
@@ -2647,6 +2765,14 @@ static PyObject *__pyx_f_4cdec_5_cdec_as_str(PyObject *__pyx_v_data, struct __py
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":7
+ *     cdef bint owned # if True, do not manage memory
+ * 
+ *     def __init__(self):             # <<<<<<<<<<<<<<
+ *         """DenseVector() -> Dense weight/feature vector."""
+ *         self.vector = new vector[weight_t]()
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_11DenseVector_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_11DenseVector___init__[] = "DenseVector() -> Dense weight/feature vector.";
@@ -2661,18 +2787,12 @@ static int __pyx_pw_4cdec_5_cdec_11DenseVector_1__init__(PyObject *__pyx_v_self,
     __Pyx_RaiseArgtupleInvalid("__init__", 1, 0, 0, PyTuple_GET_SIZE(__pyx_args)); return -1;}
   if (unlikely(__pyx_kwds) && unlikely(PyDict_Size(__pyx_kwds) > 0) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "__init__", 0))) return -1;
   __pyx_r = __pyx_pf_4cdec_5_cdec_11DenseVector___init__(((struct __pyx_obj_4cdec_5_cdec_DenseVector *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":7
- *     cdef bint owned # if True, do not manage memory
- * 
- *     def __init__(self):             # <<<<<<<<<<<<<<
- *         """DenseVector() -> Dense weight/feature vector."""
- *         self.vector = new vector[weight_t]()
- */
-
 static int __pyx_pf_4cdec_5_cdec_11DenseVector___init__(struct __pyx_obj_4cdec_5_cdec_DenseVector *__pyx_v_self) {
   int __pyx_r;
   __Pyx_RefNannyDeclarations
@@ -2682,7 +2802,7 @@ static int __pyx_pf_4cdec_5_cdec_11DenseVector___init__(struct __pyx_obj_4cdec_5
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":9
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":9
  *     def __init__(self):
  *         """DenseVector() -> Dense weight/feature vector."""
  *         self.vector = new vector[weight_t]()             # <<<<<<<<<<<<<<
@@ -2697,7 +2817,7 @@ static int __pyx_pf_4cdec_5_cdec_11DenseVector___init__(struct __pyx_obj_4cdec_5
   }
   __pyx_v_self->vector = __pyx_t_1;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":10
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":10
  *         """DenseVector() -> Dense weight/feature vector."""
  *         self.vector = new vector[weight_t]()
  *         self.owned = False             # <<<<<<<<<<<<<<
@@ -2706,6 +2826,15 @@ static int __pyx_pf_4cdec_5_cdec_11DenseVector___init__(struct __pyx_obj_4cdec_5
  */
   __pyx_v_self->owned = 0;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":7
+ *     cdef bint owned # if True, do not manage memory
+ * 
+ *     def __init__(self):             # <<<<<<<<<<<<<<
+ *         """DenseVector() -> Dense weight/feature vector."""
+ *         self.vector = new vector[weight_t]()
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -2716,29 +2845,31 @@ static int __pyx_pf_4cdec_5_cdec_11DenseVector___init__(struct __pyx_obj_4cdec_5
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":12
+ *         self.owned = False
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         if not self.owned:
+ *             del self.vector
+ */
+
 /* Python wrapper */
 static void __pyx_pw_4cdec_5_cdec_11DenseVector_3__dealloc__(PyObject *__pyx_v_self); /*proto*/
 static void __pyx_pw_4cdec_5_cdec_11DenseVector_3__dealloc__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__ (wrapper)", 0);
   __pyx_pf_4cdec_5_cdec_11DenseVector_2__dealloc__(((struct __pyx_obj_4cdec_5_cdec_DenseVector *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":12
- *         self.owned = False
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         if not self.owned:
- *             del self.vector
- */
-
 static void __pyx_pf_4cdec_5_cdec_11DenseVector_2__dealloc__(struct __pyx_obj_4cdec_5_cdec_DenseVector *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":13
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":13
  * 
  *     def __dealloc__(self):
  *         if not self.owned:             # <<<<<<<<<<<<<<
@@ -2748,7 +2879,7 @@ static void __pyx_pf_4cdec_5_cdec_11DenseVector_2__dealloc__(struct __pyx_obj_4c
   __pyx_t_1 = ((!(__pyx_v_self->owned != 0)) != 0);
   if (__pyx_t_1) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":14
+    /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":14
  *     def __dealloc__(self):
  *         if not self.owned:
  *             del self.vector             # <<<<<<<<<<<<<<
@@ -2760,9 +2891,26 @@ static void __pyx_pf_4cdec_5_cdec_11DenseVector_2__dealloc__(struct __pyx_obj_4c
   }
   __pyx_L3:;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":12
+ *         self.owned = False
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         if not self.owned:
+ *             del self.vector
+ */
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":16
+ *             del self.vector
+ * 
+ *     def __len__(self):             # <<<<<<<<<<<<<<
+ *         return self.vector.size()
+ * 
+ */
+
 /* Python wrapper */
 static Py_ssize_t __pyx_pw_4cdec_5_cdec_11DenseVector_5__len__(PyObject *__pyx_v_self); /*proto*/
 static Py_ssize_t __pyx_pw_4cdec_5_cdec_11DenseVector_5__len__(PyObject *__pyx_v_self) {
@@ -2770,24 +2918,18 @@ static Py_ssize_t __pyx_pw_4cdec_5_cdec_11DenseVector_5__len__(PyObject *__pyx_v
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_11DenseVector_4__len__(((struct __pyx_obj_4cdec_5_cdec_DenseVector *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":16
- *             del self.vector
- * 
- *     def __len__(self):             # <<<<<<<<<<<<<<
- *         return self.vector.size()
- * 
- */
-
 static Py_ssize_t __pyx_pf_4cdec_5_cdec_11DenseVector_4__len__(struct __pyx_obj_4cdec_5_cdec_DenseVector *__pyx_v_self) {
   Py_ssize_t __pyx_r;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":17
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":17
  * 
  *     def __len__(self):
  *         return self.vector.size()             # <<<<<<<<<<<<<<
@@ -2797,12 +2939,28 @@ static Py_ssize_t __pyx_pf_4cdec_5_cdec_11DenseVector_4__len__(struct __pyx_obj_
   __pyx_r = __pyx_v_self->vector->size();
   goto __pyx_L0;
 
-  __pyx_r = 0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":16
+ *             del self.vector
+ * 
+ *     def __len__(self):             # <<<<<<<<<<<<<<
+ *         return self.vector.size()
+ * 
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":19
+ *         return self.vector.size()
+ * 
+ *     def __getitem__(self, char* fname):             # <<<<<<<<<<<<<<
+ *         cdef int fid = FDConvert(fname)
+ *         if 0 <= fid < self.vector.size():
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_11DenseVector_7__getitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_fname); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_11DenseVector_7__getitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_fname) {
@@ -2823,18 +2981,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_11DenseVector_7__getitem__(PyObject *__py
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_11DenseVector_6__getitem__(((struct __pyx_obj_4cdec_5_cdec_DenseVector *)__pyx_v_self), ((char *)__pyx_v_fname));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":19
- *         return self.vector.size()
- * 
- *     def __getitem__(self, char* fname):             # <<<<<<<<<<<<<<
- *         cdef int fid = FDConvert(fname)
- *         if 0 <= fid < self.vector.size():
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_6__getitem__(struct __pyx_obj_4cdec_5_cdec_DenseVector *__pyx_v_self, char *__pyx_v_fname) {
   int __pyx_v_fid;
   PyObject *__pyx_r = NULL;
@@ -2848,7 +3000,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_6__getitem__(struct __pyx_o
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__getitem__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":20
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":20
  * 
  *     def __getitem__(self, char* fname):
  *         cdef int fid = FDConvert(fname)             # <<<<<<<<<<<<<<
@@ -2857,7 +3009,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_6__getitem__(struct __pyx_o
  */
   __pyx_v_fid = FD::Convert(__pyx_v_fname);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":21
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":21
  *     def __getitem__(self, char* fname):
  *         cdef int fid = FDConvert(fname)
  *         if 0 <= fid < self.vector.size():             # <<<<<<<<<<<<<<
@@ -2871,7 +3023,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_6__getitem__(struct __pyx_o
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":22
+    /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":22
  *         cdef int fid = FDConvert(fname)
  *         if 0 <= fid < self.vector.size():
  *             return self.vector[0][fid]             # <<<<<<<<<<<<<<
@@ -2884,11 +3036,9 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_6__getitem__(struct __pyx_o
     __pyx_r = __pyx_t_3;
     __pyx_t_3 = 0;
     goto __pyx_L0;
-    goto __pyx_L3;
   }
-  __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":23
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":23
  *         if 0 <= fid < self.vector.size():
  *             return self.vector[0][fid]
  *         raise KeyError(fname)             # <<<<<<<<<<<<<<
@@ -2896,21 +3046,28 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_6__getitem__(struct __pyx_o
  *     def __setitem__(self, char* fname, float value):
  */
   __pyx_t_3 = __Pyx_PyBytes_FromString(__pyx_v_fname); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+  __Pyx_GOTREF(__pyx_t_3);
   __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
-  PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_t_3));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_3));
+  PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3);
+  __Pyx_GIVEREF(__pyx_t_3);
   __pyx_t_3 = 0;
-  __pyx_t_3 = PyObject_Call(__pyx_builtin_KeyError, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_KeyError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_Raise(__pyx_t_3, 0, 0, 0);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":19
+ *         return self.vector.size()
+ * 
+ *     def __getitem__(self, char* fname):             # <<<<<<<<<<<<<<
+ *         cdef int fid = FDConvert(fname)
+ *         if 0 <= fid < self.vector.size():
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_3);
   __Pyx_XDECREF(__pyx_t_4);
@@ -2922,6 +3079,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_6__getitem__(struct __pyx_o
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":25
+ *         raise KeyError(fname)
+ * 
+ *     def __setitem__(self, char* fname, float value):             # <<<<<<<<<<<<<<
+ *         cdef int fid = FDConvert(fname)
+ *         if fid < 0: raise KeyError(fname)
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_11DenseVector_9__setitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_fname, PyObject *__pyx_arg_value); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_11DenseVector_9__setitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_fname, PyObject *__pyx_arg_value) {
@@ -2946,18 +3111,12 @@ static int __pyx_pw_4cdec_5_cdec_11DenseVector_9__setitem__(PyObject *__pyx_v_se
   return -1;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_11DenseVector_8__setitem__(((struct __pyx_obj_4cdec_5_cdec_DenseVector *)__pyx_v_self), ((char *)__pyx_v_fname), ((float)__pyx_v_value));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":25
- *         raise KeyError(fname)
- * 
- *     def __setitem__(self, char* fname, float value):             # <<<<<<<<<<<<<<
- *         cdef int fid = FDConvert(fname)
- *         if fid < 0: raise KeyError(fname)
- */
-
 static int __pyx_pf_4cdec_5_cdec_11DenseVector_8__setitem__(struct __pyx_obj_4cdec_5_cdec_DenseVector *__pyx_v_self, char *__pyx_v_fname, float __pyx_v_value) {
   int __pyx_v_fid;
   int __pyx_r;
@@ -2970,7 +3129,7 @@ static int __pyx_pf_4cdec_5_cdec_11DenseVector_8__setitem__(struct __pyx_obj_4cd
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__setitem__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":26
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":26
  * 
  *     def __setitem__(self, char* fname, float value):
  *         cdef int fid = FDConvert(fname)             # <<<<<<<<<<<<<<
@@ -2979,7 +3138,7 @@ static int __pyx_pf_4cdec_5_cdec_11DenseVector_8__setitem__(struct __pyx_obj_4cd
  */
   __pyx_v_fid = FD::Convert(__pyx_v_fname);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":27
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":27
  *     def __setitem__(self, char* fname, float value):
  *         cdef int fid = FDConvert(fname)
  *         if fid < 0: raise KeyError(fname)             # <<<<<<<<<<<<<<
@@ -2989,23 +3148,21 @@ static int __pyx_pf_4cdec_5_cdec_11DenseVector_8__setitem__(struct __pyx_obj_4cd
   __pyx_t_1 = ((__pyx_v_fid < 0) != 0);
   if (__pyx_t_1) {
     __pyx_t_2 = __Pyx_PyBytes_FromString(__pyx_v_fname); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_GOTREF(__pyx_t_2);
     __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_t_2));
-    __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+    PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
+    __Pyx_GIVEREF(__pyx_t_2);
     __pyx_t_2 = 0;
-    __pyx_t_2 = PyObject_Call(__pyx_builtin_KeyError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_KeyError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __Pyx_Raise(__pyx_t_2, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     {__pyx_filename = __pyx_f[1]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    goto __pyx_L3;
   }
-  __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":28
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":28
  *         cdef int fid = FDConvert(fname)
  *         if fid < 0: raise KeyError(fname)
  *         if self.vector.size() <= fid:             # <<<<<<<<<<<<<<
@@ -3015,7 +3172,7 @@ static int __pyx_pf_4cdec_5_cdec_11DenseVector_8__setitem__(struct __pyx_obj_4cd
   __pyx_t_1 = ((__pyx_v_self->vector->size() <= __pyx_v_fid) != 0);
   if (__pyx_t_1) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":29
+    /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":29
  *         if fid < 0: raise KeyError(fname)
  *         if self.vector.size() <= fid:
  *             self.vector.resize(fid + 1)             # <<<<<<<<<<<<<<
@@ -3027,7 +3184,7 @@ static int __pyx_pf_4cdec_5_cdec_11DenseVector_8__setitem__(struct __pyx_obj_4cd
   }
   __pyx_L4:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":30
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":30
  *         if self.vector.size() <= fid:
  *             self.vector.resize(fid + 1)
  *         self.vector[0][fid] = value             # <<<<<<<<<<<<<<
@@ -3036,6 +3193,15 @@ static int __pyx_pf_4cdec_5_cdec_11DenseVector_8__setitem__(struct __pyx_obj_4cd
  */
   ((__pyx_v_self->vector[0])[__pyx_v_fid]) = __pyx_v_value;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":25
+ *         raise KeyError(fname)
+ * 
+ *     def __setitem__(self, char* fname, float value):             # <<<<<<<<<<<<<<
+ *         cdef int fid = FDConvert(fname)
+ *         if fid < 0: raise KeyError(fname)
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -3049,6 +3215,14 @@ static int __pyx_pf_4cdec_5_cdec_11DenseVector_8__setitem__(struct __pyx_obj_4cd
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_11DenseVector_12generator(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":32
+ *         self.vector[0][fid] = value
+ * 
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         cdef unsigned fid
+ *         for fid in range(1, self.vector.size()):
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_11DenseVector_11__iter__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_11DenseVector_11__iter__(PyObject *__pyx_v_self) {
@@ -3056,18 +3230,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_11DenseVector_11__iter__(PyObject *__pyx_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__iter__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_11DenseVector_10__iter__(((struct __pyx_obj_4cdec_5_cdec_DenseVector *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":32
- *         self.vector[0][fid] = value
- * 
- *     def __iter__(self):             # <<<<<<<<<<<<<<
- *         cdef unsigned fid
- *         for fid in range(1, self.vector.size()):
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_10__iter__(struct __pyx_obj_4cdec_5_cdec_DenseVector *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -3092,6 +3260,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_10__iter__(struct __pyx_obj
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -3128,7 +3297,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_11DenseVector_12generator(__pyx_Generator
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":34
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":34
  *     def __iter__(self):
  *         cdef unsigned fid
  *         for fid in range(1, self.vector.size()):             # <<<<<<<<<<<<<<
@@ -3139,7 +3308,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_11DenseVector_12generator(__pyx_Generator
   for (__pyx_t_2 = 1; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_cur_scope->__pyx_v_fid = __pyx_t_2;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":35
+    /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":35
  *         cdef unsigned fid
  *         for fid in range(1, self.vector.size()):
  *             yield str(FDConvert(fid).c_str()), self.vector[0][fid]             # <<<<<<<<<<<<<<
@@ -3147,15 +3316,15 @@ static PyObject *__pyx_gb_4cdec_5_cdec_11DenseVector_12generator(__pyx_Generator
  *     def dot(self, SparseVector other):
  */
     __pyx_t_3 = __Pyx_PyBytes_FromString(FD::Convert(__pyx_cur_scope->__pyx_v_fid).c_str()); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+    __Pyx_GOTREF(__pyx_t_3);
     __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
-    PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_t_3));
-    __Pyx_GIVEREF(((PyObject *)__pyx_t_3));
+    PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3);
+    __Pyx_GIVEREF(__pyx_t_3);
     __pyx_t_3 = 0;
-    __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_t_4 = PyFloat_FromDouble(((__pyx_cur_scope->__pyx_v_self->vector[0])[__pyx_cur_scope->__pyx_v_fid])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
     __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -3166,7 +3335,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_11DenseVector_12generator(__pyx_Generator
     __Pyx_GIVEREF(__pyx_t_4);
     __pyx_t_3 = 0;
     __pyx_t_4 = 0;
-    __pyx_r = ((PyObject *)__pyx_t_5);
+    __pyx_r = __pyx_t_5;
     __pyx_t_5 = 0;
     __pyx_cur_scope->__pyx_t_0 = __pyx_t_1;
     __pyx_cur_scope->__pyx_t_1 = __pyx_t_2;
@@ -3180,6 +3349,16 @@ static PyObject *__pyx_gb_4cdec_5_cdec_11DenseVector_12generator(__pyx_Generator
     __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
     if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":32
+ *         self.vector[0][fid] = value
+ * 
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         cdef unsigned fid
+ *         for fid in range(1, self.vector.size()):
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -3195,6 +3374,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_11DenseVector_12generator(__pyx_Generator
   return NULL;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":37
+ *             yield str(FDConvert(fid).c_str()), self.vector[0][fid]
+ * 
+ *     def dot(self, SparseVector other):             # <<<<<<<<<<<<<<
+ *         """vector.dot(SparseVector other) -> Dot product of the two vectors."""
+ *         return other.dot(self)
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_11DenseVector_14dot(PyObject *__pyx_v_self, PyObject *__pyx_v_other); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_11DenseVector_13dot[] = "vector.dot(SparseVector other) -> Dot product of the two vectors.";
@@ -3207,6 +3394,8 @@ static PyObject *__pyx_pw_4cdec_5_cdec_11DenseVector_14dot(PyObject *__pyx_v_sel
   __Pyx_RefNannySetupContext("dot (wrapper)", 0);
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_4cdec_5_cdec_SparseVector, 1, "other", 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_5_cdec_11DenseVector_13dot(((struct __pyx_obj_4cdec_5_cdec_DenseVector *)__pyx_v_self), ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_other));
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __pyx_r = NULL;
@@ -3215,14 +3404,6 @@ static PyObject *__pyx_pw_4cdec_5_cdec_11DenseVector_14dot(PyObject *__pyx_v_sel
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":37
- *             yield str(FDConvert(fid).c_str()), self.vector[0][fid]
- * 
- *     def dot(self, SparseVector other):             # <<<<<<<<<<<<<<
- *         """vector.dot(SparseVector other) -> Dot product of the two vectors."""
- *         return other.dot(self)
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_13dot(struct __pyx_obj_4cdec_5_cdec_DenseVector *__pyx_v_self, struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_other) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -3234,7 +3415,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_13dot(struct __pyx_obj_4cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("dot", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":39
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":39
  *     def dot(self, SparseVector other):
  *         """vector.dot(SparseVector other) -> Dot product of the two vectors."""
  *         return other.dot(self)             # <<<<<<<<<<<<<<
@@ -3242,23 +3423,30 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_13dot(struct __pyx_obj_4cde
  *     def tosparse(self):
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_other), __pyx_n_s__dot); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_other), __pyx_n_s_dot); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_INCREF(((PyObject *)__pyx_v_self));
   PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_self));
   __Pyx_GIVEREF(((PyObject *)__pyx_v_self));
-  __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_r = __pyx_t_3;
   __pyx_t_3 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":37
+ *             yield str(FDConvert(fid).c_str()), self.vector[0][fid]
+ * 
+ *     def dot(self, SparseVector other):             # <<<<<<<<<<<<<<
+ *         """vector.dot(SparseVector other) -> Dot product of the two vectors."""
+ *         return other.dot(self)
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -3271,6 +3459,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_13dot(struct __pyx_obj_4cde
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":41
+ *         return other.dot(self)
+ * 
+ *     def tosparse(self):             # <<<<<<<<<<<<<<
+ *         """vector.tosparse() -> Equivalent SparseVector."""
+ *         cdef SparseVector sparse = SparseVector.__new__(SparseVector)
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_11DenseVector_16tosparse(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_11DenseVector_15tosparse[] = "vector.tosparse() -> Equivalent SparseVector.";
@@ -3279,18 +3475,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_11DenseVector_16tosparse(PyObject *__pyx_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("tosparse (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_11DenseVector_15tosparse(((struct __pyx_obj_4cdec_5_cdec_DenseVector *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":41
- *         return other.dot(self)
- * 
- *     def tosparse(self):             # <<<<<<<<<<<<<<
- *         """vector.tosparse() -> Equivalent SparseVector."""
- *         cdef SparseVector sparse = SparseVector.__new__(SparseVector)
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_15tosparse(struct __pyx_obj_4cdec_5_cdec_DenseVector *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_sparse = 0;
   PyObject *__pyx_r = NULL;
@@ -3301,20 +3491,20 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_15tosparse(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("tosparse", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":43
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":43
  *     def tosparse(self):
  *         """vector.tosparse() -> Equivalent SparseVector."""
  *         cdef SparseVector sparse = SparseVector.__new__(SparseVector)             # <<<<<<<<<<<<<<
  *         sparse.vector = new FastSparseVector[weight_t]()
  *         InitSparseVector(self.vector[0], sparse.vector)
  */
-  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   if (!(likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_4cdec_5_cdec_SparseVector)))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_sparse = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":44
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":44
  *         """vector.tosparse() -> Equivalent SparseVector."""
  *         cdef SparseVector sparse = SparseVector.__new__(SparseVector)
  *         sparse.vector = new FastSparseVector[weight_t]()             # <<<<<<<<<<<<<<
@@ -3323,7 +3513,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_15tosparse(struct __pyx_obj
  */
   __pyx_v_sparse->vector = new FastSparseVector<weight_t>();
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":45
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":45
  *         cdef SparseVector sparse = SparseVector.__new__(SparseVector)
  *         sparse.vector = new FastSparseVector[weight_t]()
  *         InitSparseVector(self.vector[0], sparse.vector)             # <<<<<<<<<<<<<<
@@ -3332,7 +3522,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_15tosparse(struct __pyx_obj
  */
   Weights::InitSparseVector((__pyx_v_self->vector[0]), __pyx_v_sparse->vector);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":46
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":46
  *         sparse.vector = new FastSparseVector[weight_t]()
  *         InitSparseVector(self.vector[0], sparse.vector)
  *         return sparse             # <<<<<<<<<<<<<<
@@ -3344,8 +3534,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_15tosparse(struct __pyx_obj
   __pyx_r = ((PyObject *)__pyx_v_sparse);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":41
+ *         return other.dot(self)
+ * 
+ *     def tosparse(self):             # <<<<<<<<<<<<<<
+ *         """vector.tosparse() -> Equivalent SparseVector."""
+ *         cdef SparseVector sparse = SparseVector.__new__(SparseVector)
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.DenseVector.tosparse", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -3357,6 +3554,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_11DenseVector_15tosparse(struct __pyx_obj
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":51
+ *     cdef FastSparseVector[weight_t]* vector
+ * 
+ *     def __init__(self):             # <<<<<<<<<<<<<<
+ *         """SparseVector() -> Sparse feature/weight vector."""
+ *         self.vector = new FastSparseVector[weight_t]()
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_12SparseVector_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_12SparseVector___init__[] = "SparseVector() -> Sparse feature/weight vector.";
@@ -3371,24 +3576,18 @@ static int __pyx_pw_4cdec_5_cdec_12SparseVector_1__init__(PyObject *__pyx_v_self
     __Pyx_RaiseArgtupleInvalid("__init__", 1, 0, 0, PyTuple_GET_SIZE(__pyx_args)); return -1;}
   if (unlikely(__pyx_kwds) && unlikely(PyDict_Size(__pyx_kwds) > 0) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "__init__", 0))) return -1;
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector___init__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":51
- *     cdef FastSparseVector[weight_t]* vector
- * 
- *     def __init__(self):             # <<<<<<<<<<<<<<
- *         """SparseVector() -> Sparse feature/weight vector."""
- *         self.vector = new FastSparseVector[weight_t]()
- */
-
 static int __pyx_pf_4cdec_5_cdec_12SparseVector___init__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self) {
   int __pyx_r;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__init__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":53
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":53
  *     def __init__(self):
  *         """SparseVector() -> Sparse feature/weight vector."""
  *         self.vector = new FastSparseVector[weight_t]()             # <<<<<<<<<<<<<<
@@ -3397,33 +3596,44 @@ static int __pyx_pf_4cdec_5_cdec_12SparseVector___init__(struct __pyx_obj_4cdec_
  */
   __pyx_v_self->vector = new FastSparseVector<weight_t>();
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":51
+ *     cdef FastSparseVector[weight_t]* vector
+ * 
+ *     def __init__(self):             # <<<<<<<<<<<<<<
+ *         """SparseVector() -> Sparse feature/weight vector."""
+ *         self.vector = new FastSparseVector[weight_t]()
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":55
+ *         self.vector = new FastSparseVector[weight_t]()
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.vector
+ * 
+ */
+
 /* Python wrapper */
 static void __pyx_pw_4cdec_5_cdec_12SparseVector_3__dealloc__(PyObject *__pyx_v_self); /*proto*/
 static void __pyx_pw_4cdec_5_cdec_12SparseVector_3__dealloc__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__ (wrapper)", 0);
   __pyx_pf_4cdec_5_cdec_12SparseVector_2__dealloc__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":55
- *         self.vector = new FastSparseVector[weight_t]()
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         del self.vector
- * 
- */
-
-static void __pyx_pf_4cdec_5_cdec_12SparseVector_2__dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self) {
+static void __pyx_pf_4cdec_5_cdec_12SparseVector_2__dealloc__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":56
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":56
  * 
  *     def __dealloc__(self):
  *         del self.vector             # <<<<<<<<<<<<<<
@@ -3432,9 +3642,26 @@ static void __pyx_pf_4cdec_5_cdec_12SparseVector_2__dealloc__(CYTHON_UNUSED stru
  */
   delete __pyx_v_self->vector;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":55
+ *         self.vector = new FastSparseVector[weight_t]()
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.vector
+ * 
+ */
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":58
+ *         del self.vector
+ * 
+ *     def copy(self):             # <<<<<<<<<<<<<<
+ *         """vector.copy() -> SparseVector copy."""
+ *         return self * 1
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_5copy(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_12SparseVector_4copy[] = "vector.copy() -> SparseVector copy.";
@@ -3443,18 +3670,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_5copy(PyObject *__pyx_v_se
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("copy (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_4copy(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":58
- *         del self.vector
- * 
- *     def copy(self):             # <<<<<<<<<<<<<<
- *         """vector.copy() -> SparseVector copy."""
- *         return self * 1
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_4copy(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -3464,7 +3685,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_4copy(struct __pyx_obj_4cd
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("copy", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":60
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":60
  *     def copy(self):
  *         """vector.copy() -> SparseVector copy."""
  *         return self * 1             # <<<<<<<<<<<<<<
@@ -3478,8 +3699,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_4copy(struct __pyx_obj_4cd
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":58
+ *         del self.vector
+ * 
+ *     def copy(self):             # <<<<<<<<<<<<<<
+ *         """vector.copy() -> SparseVector copy."""
+ *         return self * 1
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.SparseVector.copy", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -3490,6 +3718,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_4copy(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":62
+ *         return self * 1
+ * 
+ *     def __getitem__(self, char* fname):             # <<<<<<<<<<<<<<
+ *         cdef int fid = FDConvert(fname)
+ *         if fid < 0: raise KeyError(fname)
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_7__getitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_fname); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_7__getitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_fname) {
@@ -3510,18 +3746,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_7__getitem__(PyObject *__p
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_6__getitem__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_self), ((char *)__pyx_v_fname));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":62
- *         return self * 1
- * 
- *     def __getitem__(self, char* fname):             # <<<<<<<<<<<<<<
- *         cdef int fid = FDConvert(fname)
- *         if fid < 0: raise KeyError(fname)
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_6__getitem__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self, char *__pyx_v_fname) {
   int __pyx_v_fid;
   PyObject *__pyx_r = NULL;
@@ -3534,7 +3764,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_6__getitem__(struct __pyx_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__getitem__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":63
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":63
  * 
  *     def __getitem__(self, char* fname):
  *         cdef int fid = FDConvert(fname)             # <<<<<<<<<<<<<<
@@ -3543,7 +3773,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_6__getitem__(struct __pyx_
  */
   __pyx_v_fid = FD::Convert(__pyx_v_fname);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":64
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":64
  *     def __getitem__(self, char* fname):
  *         cdef int fid = FDConvert(fname)
  *         if fid < 0: raise KeyError(fname)             # <<<<<<<<<<<<<<
@@ -3553,23 +3783,21 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_6__getitem__(struct __pyx_
   __pyx_t_1 = ((__pyx_v_fid < 0) != 0);
   if (__pyx_t_1) {
     __pyx_t_2 = __Pyx_PyBytes_FromString(__pyx_v_fname); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_GOTREF(__pyx_t_2);
     __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_t_2));
-    __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+    PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
+    __Pyx_GIVEREF(__pyx_t_2);
     __pyx_t_2 = 0;
-    __pyx_t_2 = PyObject_Call(__pyx_builtin_KeyError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_KeyError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __Pyx_Raise(__pyx_t_2, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     {__pyx_filename = __pyx_f[1]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    goto __pyx_L3;
   }
-  __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":65
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":65
  *         cdef int fid = FDConvert(fname)
  *         if fid < 0: raise KeyError(fname)
  *         return self.vector.value(fid)             # <<<<<<<<<<<<<<
@@ -3583,8 +3811,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_6__getitem__(struct __pyx_
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":62
+ *         return self * 1
+ * 
+ *     def __getitem__(self, char* fname):             # <<<<<<<<<<<<<<
+ *         cdef int fid = FDConvert(fname)
+ *         if fid < 0: raise KeyError(fname)
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_2);
   __Pyx_XDECREF(__pyx_t_3);
@@ -3596,6 +3831,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_6__getitem__(struct __pyx_
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":67
+ *         return self.vector.value(fid)
+ * 
+ *     def __setitem__(self, char* fname, float value):             # <<<<<<<<<<<<<<
+ *         cdef int fid = FDConvert(fname)
+ *         if fid < 0: raise KeyError(fname)
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_12SparseVector_9__setitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_fname, PyObject *__pyx_arg_value); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_12SparseVector_9__setitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_fname, PyObject *__pyx_arg_value) {
@@ -3620,18 +3863,12 @@ static int __pyx_pw_4cdec_5_cdec_12SparseVector_9__setitem__(PyObject *__pyx_v_s
   return -1;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_8__setitem__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_self), ((char *)__pyx_v_fname), ((float)__pyx_v_value));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":67
- *         return self.vector.value(fid)
- * 
- *     def __setitem__(self, char* fname, float value):             # <<<<<<<<<<<<<<
- *         cdef int fid = FDConvert(fname)
- *         if fid < 0: raise KeyError(fname)
- */
-
 static int __pyx_pf_4cdec_5_cdec_12SparseVector_8__setitem__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self, char *__pyx_v_fname, float __pyx_v_value) {
   int __pyx_v_fid;
   int __pyx_r;
@@ -3644,7 +3881,7 @@ static int __pyx_pf_4cdec_5_cdec_12SparseVector_8__setitem__(struct __pyx_obj_4c
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__setitem__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":68
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":68
  * 
  *     def __setitem__(self, char* fname, float value):
  *         cdef int fid = FDConvert(fname)             # <<<<<<<<<<<<<<
@@ -3653,7 +3890,7 @@ static int __pyx_pf_4cdec_5_cdec_12SparseVector_8__setitem__(struct __pyx_obj_4c
  */
   __pyx_v_fid = FD::Convert(__pyx_v_fname);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":69
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":69
  *     def __setitem__(self, char* fname, float value):
  *         cdef int fid = FDConvert(fname)
  *         if fid < 0: raise KeyError(fname)             # <<<<<<<<<<<<<<
@@ -3663,23 +3900,21 @@ static int __pyx_pf_4cdec_5_cdec_12SparseVector_8__setitem__(struct __pyx_obj_4c
   __pyx_t_1 = ((__pyx_v_fid < 0) != 0);
   if (__pyx_t_1) {
     __pyx_t_2 = __Pyx_PyBytes_FromString(__pyx_v_fname); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_GOTREF(__pyx_t_2);
     __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_t_2));
-    __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+    PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
+    __Pyx_GIVEREF(__pyx_t_2);
     __pyx_t_2 = 0;
-    __pyx_t_2 = PyObject_Call(__pyx_builtin_KeyError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_KeyError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __Pyx_Raise(__pyx_t_2, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     {__pyx_filename = __pyx_f[1]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    goto __pyx_L3;
   }
-  __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":70
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":70
  *         cdef int fid = FDConvert(fname)
  *         if fid < 0: raise KeyError(fname)
  *         self.vector.set_value(fid, value)             # <<<<<<<<<<<<<<
@@ -3688,6 +3923,15 @@ static int __pyx_pf_4cdec_5_cdec_12SparseVector_8__setitem__(struct __pyx_obj_4c
  */
   __pyx_v_self->vector->set_value(__pyx_v_fid, __pyx_v_value);
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":67
+ *         return self.vector.value(fid)
+ * 
+ *     def __setitem__(self, char* fname, float value):             # <<<<<<<<<<<<<<
+ *         cdef int fid = FDConvert(fname)
+ *         if fid < 0: raise KeyError(fname)
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -3701,6 +3945,14 @@ static int __pyx_pf_4cdec_5_cdec_12SparseVector_8__setitem__(struct __pyx_obj_4c
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_12SparseVector_12generator1(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":72
+ *         self.vector.set_value(fid, value)
+ * 
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         cdef FastSparseVector[weight_t].const_iterator* it = new FastSparseVector[weight_t].const_iterator(self.vector[0], False)
+ *         cdef unsigned i
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_11__iter__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_11__iter__(PyObject *__pyx_v_self) {
@@ -3708,18 +3960,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_11__iter__(PyObject *__pyx
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__iter__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_10__iter__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":72
- *         self.vector.set_value(fid, value)
- * 
- *     def __iter__(self):             # <<<<<<<<<<<<<<
- *         cdef FastSparseVector[weight_t].const_iterator* it = new FastSparseVector[weight_t].const_iterator(self.vector[0], False)
- *         cdef unsigned i
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_10__iter__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -3744,6 +3990,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_10__iter__(struct __pyx_ob
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -3765,6 +4012,15 @@ static PyObject *__pyx_gb_4cdec_5_cdec_12SparseVector_12generator1(__pyx_Generat
   PyObject *__pyx_t_3 = NULL;
   PyObject *__pyx_t_4 = NULL;
   PyObject *__pyx_t_5 = NULL;
+  int __pyx_t_6;
+  int __pyx_t_7;
+  char const *__pyx_t_8;
+  PyObject *__pyx_t_9 = NULL;
+  PyObject *__pyx_t_10 = NULL;
+  PyObject *__pyx_t_11 = NULL;
+  PyObject *__pyx_t_12 = NULL;
+  PyObject *__pyx_t_13 = NULL;
+  PyObject *__pyx_t_14 = NULL;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -3780,7 +4036,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_12SparseVector_12generator1(__pyx_Generat
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":73
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":73
  * 
  *     def __iter__(self):
  *         cdef FastSparseVector[weight_t].const_iterator* it = new FastSparseVector[weight_t].const_iterator(self.vector[0], False)             # <<<<<<<<<<<<<<
@@ -3789,7 +4045,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_12SparseVector_12generator1(__pyx_Generat
  */
   __pyx_cur_scope->__pyx_v_it = new FastSparseVector<weight_t>::const_iterator((__pyx_cur_scope->__pyx_v_self->vector[0]), 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":75
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":75
  *         cdef FastSparseVector[weight_t].const_iterator* it = new FastSparseVector[weight_t].const_iterator(self.vector[0], False)
  *         cdef unsigned i
  *         try:             # <<<<<<<<<<<<<<
@@ -3798,7 +4054,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_12SparseVector_12generator1(__pyx_Generat
  */
   /*try:*/ {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":76
+    /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":76
  *         cdef unsigned i
  *         try:
  *             for i in range(self.vector.size()):             # <<<<<<<<<<<<<<
@@ -3809,26 +4065,26 @@ static PyObject *__pyx_gb_4cdec_5_cdec_12SparseVector_12generator1(__pyx_Generat
     for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
       __pyx_cur_scope->__pyx_v_i = __pyx_t_2;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":77
+      /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":77
  *         try:
  *             for i in range(self.vector.size()):
  *                 yield (str(FDConvert(it[0].ptr().first).c_str()), it[0].ptr().second)             # <<<<<<<<<<<<<<
  *                 pinc(it[0]) # ++it
  *         finally:
  */
-      __pyx_t_3 = __Pyx_PyBytes_FromString(FD::Convert((__pyx_cur_scope->__pyx_v_it[0]).operator->()->first).c_str()); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L5;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_3));
-      __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_3 = __Pyx_PyBytes_FromString(FD::Convert((__pyx_cur_scope->__pyx_v_it[0]).operator->()->first).c_str()); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
+      __Pyx_GOTREF(__pyx_t_3);
+      __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_4);
-      PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_t_3));
-      __Pyx_GIVEREF(((PyObject *)__pyx_t_3));
+      PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3);
+      __Pyx_GIVEREF(__pyx_t_3);
       __pyx_t_3 = 0;
-      __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_3);
-      __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
-      __pyx_t_4 = PyFloat_FromDouble((__pyx_cur_scope->__pyx_v_it[0]).operator->()->second); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+      __pyx_t_4 = PyFloat_FromDouble((__pyx_cur_scope->__pyx_v_it[0]).operator->()->second); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_5);
       PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3);
       __Pyx_GIVEREF(__pyx_t_3);
@@ -3836,7 +4092,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_12SparseVector_12generator1(__pyx_Generat
       __Pyx_GIVEREF(__pyx_t_4);
       __pyx_t_3 = 0;
       __pyx_t_4 = 0;
-      __pyx_r = ((PyObject *)__pyx_t_5);
+      __pyx_r = __pyx_t_5;
       __pyx_t_5 = 0;
       __pyx_cur_scope->__pyx_t_0 = __pyx_t_1;
       __pyx_cur_scope->__pyx_t_1 = __pyx_t_2;
@@ -3848,9 +4104,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_12SparseVector_12generator1(__pyx_Generat
       __pyx_L9_resume_from_yield:;
       __pyx_t_1 = __pyx_cur_scope->__pyx_t_0;
       __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
-      if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":78
+      /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":78
  *             for i in range(self.vector.size()):
  *                 yield (str(FDConvert(it[0].ptr().first).c_str()), it[0].ptr().second)
  *                 pinc(it[0]) # ++it             # <<<<<<<<<<<<<<
@@ -3861,7 +4117,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_12SparseVector_12generator1(__pyx_Generat
     }
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":80
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":80
  *                 pinc(it[0]) # ++it
  *         finally:
  *             del it             # <<<<<<<<<<<<<<
@@ -3869,33 +4125,54 @@ static PyObject *__pyx_gb_4cdec_5_cdec_12SparseVector_12generator1(__pyx_Generat
  *     def dot(self, other):
  */
   /*finally:*/ {
-    int __pyx_why;
-    PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;
-    int __pyx_exc_lineno;
-    __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;
-    __pyx_why = 0; goto __pyx_L6;
-    __pyx_L5: {
-      __pyx_why = 4;
+    /*normal exit:*/{
+      delete __pyx_cur_scope->__pyx_v_it;
+      goto __pyx_L6;
+    }
+    /*exception exit:*/{
+      __pyx_L5_error:;
+      __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; __pyx_t_12 = 0; __pyx_t_13 = 0; __pyx_t_14 = 0;
       __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
       __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
       __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
-      __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);
-      __pyx_exc_lineno = __pyx_lineno;
-      goto __pyx_L6;
-    }
-    __pyx_L6:;
-    delete __pyx_cur_scope->__pyx_v_it;
-    switch (__pyx_why) {
-      case 4: {
-        __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);
-        __pyx_lineno = __pyx_exc_lineno;
-        __pyx_exc_type = 0;
-        __pyx_exc_value = 0;
-        __pyx_exc_tb = 0;
-        goto __pyx_L1_error;
+      if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_12, &__pyx_t_13, &__pyx_t_14);
+      if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11) < 0)) __Pyx_ErrFetch(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11);
+      __Pyx_XGOTREF(__pyx_t_9);
+      __Pyx_XGOTREF(__pyx_t_10);
+      __Pyx_XGOTREF(__pyx_t_11);
+      __Pyx_XGOTREF(__pyx_t_12);
+      __Pyx_XGOTREF(__pyx_t_13);
+      __Pyx_XGOTREF(__pyx_t_14);
+      __pyx_t_6 = __pyx_lineno; __pyx_t_7 = __pyx_clineno; __pyx_t_8 = __pyx_filename;
+      {
+        delete __pyx_cur_scope->__pyx_v_it;
+      }
+      if (PY_MAJOR_VERSION >= 3) {
+        __Pyx_XGIVEREF(__pyx_t_12);
+        __Pyx_XGIVEREF(__pyx_t_13);
+        __Pyx_XGIVEREF(__pyx_t_14);
+        __Pyx_ExceptionReset(__pyx_t_12, __pyx_t_13, __pyx_t_14);
       }
+      __Pyx_XGIVEREF(__pyx_t_9);
+      __Pyx_XGIVEREF(__pyx_t_10);
+      __Pyx_XGIVEREF(__pyx_t_11);
+      __Pyx_ErrRestore(__pyx_t_9, __pyx_t_10, __pyx_t_11);
+      __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; __pyx_t_12 = 0; __pyx_t_13 = 0; __pyx_t_14 = 0;
+      __pyx_lineno = __pyx_t_6; __pyx_clineno = __pyx_t_7; __pyx_filename = __pyx_t_8;
+      goto __pyx_L1_error;
     }
+    __pyx_L6:;
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":72
+ *         self.vector.set_value(fid, value)
+ * 
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         cdef FastSparseVector[weight_t].const_iterator* it = new FastSparseVector[weight_t].const_iterator(self.vector[0], False)
+ *         cdef unsigned i
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -3911,6 +4188,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_12SparseVector_12generator1(__pyx_Generat
   return NULL;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":82
+ *             del it
+ * 
+ *     def dot(self, other):             # <<<<<<<<<<<<<<
+ *         """vector.dot(SparseVector/DenseVector other) -> Dot product of the two vectors."""
+ *         if isinstance(other, DenseVector):
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_14dot(PyObject *__pyx_v_self, PyObject *__pyx_v_other); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_12SparseVector_13dot[] = "vector.dot(SparseVector/DenseVector other) -> Dot product of the two vectors.";
@@ -3919,18 +4204,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_14dot(PyObject *__pyx_v_se
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("dot (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_13dot(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_self), ((PyObject *)__pyx_v_other));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":82
- *             del it
- * 
- *     def dot(self, other):             # <<<<<<<<<<<<<<
- *         """vector.dot(SparseVector/DenseVector other) -> Dot product of the two vectors."""
- *         if isinstance(other, DenseVector):
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_13dot(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self, PyObject *__pyx_v_other) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -3943,7 +4222,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_13dot(struct __pyx_obj_4cd
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("dot", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":84
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":84
  *     def dot(self, other):
  *         """vector.dot(SparseVector/DenseVector other) -> Dot product of the two vectors."""
  *         if isinstance(other, DenseVector):             # <<<<<<<<<<<<<<
@@ -3954,7 +4233,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_13dot(struct __pyx_obj_4cd
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":85
+    /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":85
  *         """vector.dot(SparseVector/DenseVector other) -> Dot product of the two vectors."""
  *         if isinstance(other, DenseVector):
  *             return self.vector.dot((<DenseVector> other).vector[0])             # <<<<<<<<<<<<<<
@@ -3967,10 +4246,9 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_13dot(struct __pyx_obj_4cd
     __pyx_r = __pyx_t_3;
     __pyx_t_3 = 0;
     goto __pyx_L0;
-    goto __pyx_L3;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":86
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":86
  *         if isinstance(other, DenseVector):
  *             return self.vector.dot((<DenseVector> other).vector[0])
  *         elif isinstance(other, SparseVector):             # <<<<<<<<<<<<<<
@@ -3981,7 +4259,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_13dot(struct __pyx_obj_4cd
   __pyx_t_1 = (__pyx_t_2 != 0);
   if (__pyx_t_1) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":87
+    /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":87
  *             return self.vector.dot((<DenseVector> other).vector[0])
  *         elif isinstance(other, SparseVector):
  *             return self.vector.dot((<SparseVector> other).vector[0])             # <<<<<<<<<<<<<<
@@ -3994,33 +4272,38 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_13dot(struct __pyx_obj_4cd
     __pyx_r = __pyx_t_3;
     __pyx_t_3 = 0;
     goto __pyx_L0;
-    goto __pyx_L3;
   }
-  __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":88
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":88
  *         elif isinstance(other, SparseVector):
  *             return self.vector.dot((<SparseVector> other).vector[0])
  *         raise TypeError('cannot take the dot product of %s and SparseVector' % type(other))             # <<<<<<<<<<<<<<
  * 
  *     def __richcmp__(SparseVector x, SparseVector y, int op):
  */
-  __pyx_t_3 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_3), ((PyObject *)Py_TYPE(__pyx_v_other))); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+  __pyx_t_3 = __Pyx_PyString_Format(__pyx_kp_s_cannot_take_the_dot_product_of_s, ((PyObject *)Py_TYPE(__pyx_v_other))); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
   __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
-  PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_t_3));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_3));
+  PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3);
+  __Pyx_GIVEREF(__pyx_t_3);
   __pyx_t_3 = 0;
-  __pyx_t_3 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_Raise(__pyx_t_3, 0, 0, 0);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   {__pyx_filename = __pyx_f[1]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":82
+ *             del it
+ * 
+ *     def dot(self, other):             # <<<<<<<<<<<<<<
+ *         """vector.dot(SparseVector/DenseVector other) -> Dot product of the two vectors."""
+ *         if isinstance(other, DenseVector):
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_3);
   __Pyx_XDECREF(__pyx_t_4);
@@ -4032,6 +4315,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_13dot(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":90
+ *         raise TypeError('cannot take the dot product of %s and SparseVector' % type(other))
+ * 
+ *     def __richcmp__(SparseVector x, SparseVector y, int op):             # <<<<<<<<<<<<<<
+ *         if op == 2: # ==
+ *             return x.vector[0] == y.vector[0]
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_16__richcmp__(PyObject *__pyx_v_x, PyObject *__pyx_v_y, int __pyx_v_op); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_16__richcmp__(PyObject *__pyx_v_x, PyObject *__pyx_v_y, int __pyx_v_op) {
@@ -4044,6 +4335,8 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_16__richcmp__(PyObject *__
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x), __pyx_ptype_4cdec_5_cdec_SparseVector, 1, "x", 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y), __pyx_ptype_4cdec_5_cdec_SparseVector, 1, "y", 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_15__richcmp__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_x), ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_y), ((int)__pyx_v_op));
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __pyx_r = NULL;
@@ -4052,14 +4345,6 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_16__richcmp__(PyObject *__
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":90
- *         raise TypeError('cannot take the dot product of %s and SparseVector' % type(other))
- * 
- *     def __richcmp__(SparseVector x, SparseVector y, int op):             # <<<<<<<<<<<<<<
- *         if op == 2: # ==
- *             return x.vector[0] == y.vector[0]
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_15__richcmp__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_x, struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_y, int __pyx_v_op) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -4070,7 +4355,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_15__richcmp__(struct __pyx
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__richcmp__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":93
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":93
  *         if op == 2: # ==
  *             return x.vector[0] == y.vector[0]
  *         elif op == 3: # !=             # <<<<<<<<<<<<<<
@@ -4079,7 +4364,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_15__richcmp__(struct __pyx
  */
   switch (__pyx_v_op) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":91
+    /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":91
  * 
  *     def __richcmp__(SparseVector x, SparseVector y, int op):
  *         if op == 2: # ==             # <<<<<<<<<<<<<<
@@ -4088,7 +4373,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_15__richcmp__(struct __pyx
  */
     case 2:
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":92
+    /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":92
  *     def __richcmp__(SparseVector x, SparseVector y, int op):
  *         if op == 2: # ==
  *             return x.vector[0] == y.vector[0]             # <<<<<<<<<<<<<<
@@ -4103,7 +4388,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_15__richcmp__(struct __pyx
     goto __pyx_L0;
     break;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":93
+    /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":93
  *         if op == 2: # ==
  *             return x.vector[0] == y.vector[0]
  *         elif op == 3: # !=             # <<<<<<<<<<<<<<
@@ -4112,7 +4397,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_15__richcmp__(struct __pyx
  */
     case 3:
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":94
+    /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":94
  *             return x.vector[0] == y.vector[0]
  *         elif op == 3: # !=
  *             return not (x == y)             # <<<<<<<<<<<<<<
@@ -4129,23 +4414,31 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_15__richcmp__(struct __pyx
     __pyx_t_1 = 0;
     goto __pyx_L0;
     break;
+    default: break;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":95
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":95
  *         elif op == 3: # !=
  *             return not (x == y)
  *         raise NotImplemented('comparison not implemented for SparseVector')             # <<<<<<<<<<<<<<
  * 
  *     def __len__(self):
  */
-  __pyx_t_1 = PyObject_Call(__pyx_builtin_NotImplemented, ((PyObject *)__pyx_k_tuple_5), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_NotImplemented, __pyx_tuple__2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_Raise(__pyx_t_1, 0, 0, 0);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   {__pyx_filename = __pyx_f[1]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":90
+ *         raise TypeError('cannot take the dot product of %s and SparseVector' % type(other))
+ * 
+ *     def __richcmp__(SparseVector x, SparseVector y, int op):             # <<<<<<<<<<<<<<
+ *         if op == 2: # ==
+ *             return x.vector[0] == y.vector[0]
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.SparseVector.__richcmp__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -4156,6 +4449,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_15__richcmp__(struct __pyx
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":97
+ *         raise NotImplemented('comparison not implemented for SparseVector')
+ * 
+ *     def __len__(self):             # <<<<<<<<<<<<<<
+ *         return self.vector.size()
+ * 
+ */
+
 /* Python wrapper */
 static Py_ssize_t __pyx_pw_4cdec_5_cdec_12SparseVector_18__len__(PyObject *__pyx_v_self); /*proto*/
 static Py_ssize_t __pyx_pw_4cdec_5_cdec_12SparseVector_18__len__(PyObject *__pyx_v_self) {
@@ -4163,24 +4464,18 @@ static Py_ssize_t __pyx_pw_4cdec_5_cdec_12SparseVector_18__len__(PyObject *__pyx
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_17__len__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":97
- *         raise NotImplemented('comparison not implemented for SparseVector')
- * 
- *     def __len__(self):             # <<<<<<<<<<<<<<
- *         return self.vector.size()
- * 
- */
-
 static Py_ssize_t __pyx_pf_4cdec_5_cdec_12SparseVector_17__len__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self) {
   Py_ssize_t __pyx_r;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":98
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":98
  * 
  *     def __len__(self):
  *         return self.vector.size()             # <<<<<<<<<<<<<<
@@ -4190,12 +4485,28 @@ static Py_ssize_t __pyx_pf_4cdec_5_cdec_12SparseVector_17__len__(struct __pyx_ob
   __pyx_r = __pyx_v_self->vector->size();
   goto __pyx_L0;
 
-  __pyx_r = 0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":97
+ *         raise NotImplemented('comparison not implemented for SparseVector')
+ * 
+ *     def __len__(self):             # <<<<<<<<<<<<<<
+ *         return self.vector.size()
+ * 
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":100
+ *         return self.vector.size()
+ * 
+ *     def __contains__(self, char* fname):             # <<<<<<<<<<<<<<
+ *         return self.vector.nonzero(FDConvert(fname))
+ * 
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_12SparseVector_20__contains__(PyObject *__pyx_v_self, PyObject *__pyx_arg_fname); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_12SparseVector_20__contains__(PyObject *__pyx_v_self, PyObject *__pyx_arg_fname) {
@@ -4216,24 +4527,18 @@ static int __pyx_pw_4cdec_5_cdec_12SparseVector_20__contains__(PyObject *__pyx_v
   return -1;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_19__contains__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_self), ((char *)__pyx_v_fname));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":100
- *         return self.vector.size()
- * 
- *     def __contains__(self, char* fname):             # <<<<<<<<<<<<<<
- *         return self.vector.nonzero(FDConvert(fname))
- * 
- */
-
 static int __pyx_pf_4cdec_5_cdec_12SparseVector_19__contains__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self, char *__pyx_v_fname) {
   int __pyx_r;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__contains__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":101
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":101
  * 
  *     def __contains__(self, char* fname):
  *         return self.vector.nonzero(FDConvert(fname))             # <<<<<<<<<<<<<<
@@ -4243,12 +4548,28 @@ static int __pyx_pf_4cdec_5_cdec_12SparseVector_19__contains__(struct __pyx_obj_
   __pyx_r = __pyx_v_self->vector->nonzero(FD::Convert(__pyx_v_fname));
   goto __pyx_L0;
 
-  __pyx_r = 0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":100
+ *         return self.vector.size()
+ * 
+ *     def __contains__(self, char* fname):             # <<<<<<<<<<<<<<
+ *         return self.vector.nonzero(FDConvert(fname))
+ * 
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":103
+ *         return self.vector.nonzero(FDConvert(fname))
+ * 
+ *     def __neg__(self):             # <<<<<<<<<<<<<<
+ *         cdef SparseVector result = SparseVector.__new__(SparseVector)
+ *         result.vector = new FastSparseVector[weight_t](self.vector[0])
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_22__neg__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_22__neg__(PyObject *__pyx_v_self) {
@@ -4256,18 +4577,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_22__neg__(PyObject *__pyx_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__neg__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_21__neg__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":103
- *         return self.vector.nonzero(FDConvert(fname))
- * 
- *     def __neg__(self):             # <<<<<<<<<<<<<<
- *         cdef SparseVector result = SparseVector.__new__(SparseVector)
- *         result.vector = new FastSparseVector[weight_t](self.vector[0])
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_21__neg__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_result = 0;
   PyObject *__pyx_r = NULL;
@@ -4278,20 +4593,20 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_21__neg__(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__neg__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":104
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":104
  * 
  *     def __neg__(self):
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)             # <<<<<<<<<<<<<<
  *         result.vector = new FastSparseVector[weight_t](self.vector[0])
  *         result.vector[0] *= -1.0
  */
-  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   if (!(likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_4cdec_5_cdec_SparseVector)))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_result = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":105
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":105
  *     def __neg__(self):
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)
  *         result.vector = new FastSparseVector[weight_t](self.vector[0])             # <<<<<<<<<<<<<<
@@ -4300,7 +4615,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_21__neg__(struct __pyx_obj
  */
   __pyx_v_result->vector = new FastSparseVector<weight_t>((__pyx_v_self->vector[0]));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":106
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":106
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)
  *         result.vector = new FastSparseVector[weight_t](self.vector[0])
  *         result.vector[0] *= -1.0             # <<<<<<<<<<<<<<
@@ -4309,7 +4624,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_21__neg__(struct __pyx_obj
  */
   (__pyx_v_result->vector[0]) *= -1.0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":107
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":107
  *         result.vector = new FastSparseVector[weight_t](self.vector[0])
  *         result.vector[0] *= -1.0
  *         return result             # <<<<<<<<<<<<<<
@@ -4321,8 +4636,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_21__neg__(struct __pyx_obj
   __pyx_r = ((PyObject *)__pyx_v_result);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":103
+ *         return self.vector.nonzero(FDConvert(fname))
+ * 
+ *     def __neg__(self):             # <<<<<<<<<<<<<<
+ *         cdef SparseVector result = SparseVector.__new__(SparseVector)
+ *         result.vector = new FastSparseVector[weight_t](self.vector[0])
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.SparseVector.__neg__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -4334,6 +4656,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_21__neg__(struct __pyx_obj
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":109
+ *         return result
+ * 
+ *     def __iadd__(SparseVector self, SparseVector other):             # <<<<<<<<<<<<<<
+ *         self.vector[0] += other.vector[0]
+ *         return self
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_24__iadd__(PyObject *__pyx_v_self, PyObject *__pyx_v_other); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_24__iadd__(PyObject *__pyx_v_self, PyObject *__pyx_v_other) {
@@ -4345,6 +4675,8 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_24__iadd__(PyObject *__pyx
   __Pyx_RefNannySetupContext("__iadd__ (wrapper)", 0);
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_4cdec_5_cdec_SparseVector, 1, "other", 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 109; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_23__iadd__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_self), ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_other));
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __pyx_r = NULL;
@@ -4353,20 +4685,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_24__iadd__(PyObject *__pyx
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":109
- *         return result
- * 
- *     def __iadd__(SparseVector self, SparseVector other):             # <<<<<<<<<<<<<<
- *         self.vector[0] += other.vector[0]
- *         return self
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_23__iadd__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self, struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_other) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__iadd__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":110
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":110
  * 
  *     def __iadd__(SparseVector self, SparseVector other):
  *         self.vector[0] += other.vector[0]             # <<<<<<<<<<<<<<
@@ -4375,7 +4699,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_23__iadd__(struct __pyx_ob
  */
   (__pyx_v_self->vector[0]) += (__pyx_v_other->vector[0]);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":111
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":111
  *     def __iadd__(SparseVector self, SparseVector other):
  *         self.vector[0] += other.vector[0]
  *         return self             # <<<<<<<<<<<<<<
@@ -4387,13 +4711,29 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_23__iadd__(struct __pyx_ob
   __pyx_r = ((PyObject *)__pyx_v_self);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":109
+ *         return result
+ * 
+ *     def __iadd__(SparseVector self, SparseVector other):             # <<<<<<<<<<<<<<
+ *         self.vector[0] += other.vector[0]
+ *         return self
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":113
+ *         return self
+ * 
+ *     def __isub__(SparseVector self, SparseVector other):             # <<<<<<<<<<<<<<
+ *         self.vector[0] -= other.vector[0]
+ *         return self
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_26__isub__(PyObject *__pyx_v_self, PyObject *__pyx_v_other); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_26__isub__(PyObject *__pyx_v_self, PyObject *__pyx_v_other) {
@@ -4405,6 +4745,8 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_26__isub__(PyObject *__pyx
   __Pyx_RefNannySetupContext("__isub__ (wrapper)", 0);
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_4cdec_5_cdec_SparseVector, 1, "other", 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_25__isub__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_self), ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_other));
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __pyx_r = NULL;
@@ -4413,20 +4755,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_26__isub__(PyObject *__pyx
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":113
- *         return self
- * 
- *     def __isub__(SparseVector self, SparseVector other):             # <<<<<<<<<<<<<<
- *         self.vector[0] -= other.vector[0]
- *         return self
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_25__isub__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self, struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_other) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__isub__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":114
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":114
  * 
  *     def __isub__(SparseVector self, SparseVector other):
  *         self.vector[0] -= other.vector[0]             # <<<<<<<<<<<<<<
@@ -4435,7 +4769,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_25__isub__(struct __pyx_ob
  */
   (__pyx_v_self->vector[0]) -= (__pyx_v_other->vector[0]);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":115
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":115
  *     def __isub__(SparseVector self, SparseVector other):
  *         self.vector[0] -= other.vector[0]
  *         return self             # <<<<<<<<<<<<<<
@@ -4447,13 +4781,29 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_25__isub__(struct __pyx_ob
   __pyx_r = ((PyObject *)__pyx_v_self);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":113
+ *         return self
+ * 
+ *     def __isub__(SparseVector self, SparseVector other):             # <<<<<<<<<<<<<<
+ *         self.vector[0] -= other.vector[0]
+ *         return self
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":117
+ *         return self
+ * 
+ *     def __imul__(SparseVector self, float scalar):             # <<<<<<<<<<<<<<
+ *         self.vector[0] *= scalar
+ *         return self
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_28__imul__(PyObject *__pyx_v_self, PyObject *__pyx_arg_scalar); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_28__imul__(PyObject *__pyx_v_self, PyObject *__pyx_arg_scalar) {
@@ -4474,24 +4824,18 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_28__imul__(PyObject *__pyx
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_27__imul__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_self), ((float)__pyx_v_scalar));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":117
- *         return self
- * 
- *     def __imul__(SparseVector self, float scalar):             # <<<<<<<<<<<<<<
- *         self.vector[0] *= scalar
- *         return self
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_27__imul__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self, float __pyx_v_scalar) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__imul__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":118
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":118
  * 
  *     def __imul__(SparseVector self, float scalar):
  *         self.vector[0] *= scalar             # <<<<<<<<<<<<<<
@@ -4500,7 +4844,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_27__imul__(struct __pyx_ob
  */
   (__pyx_v_self->vector[0]) *= __pyx_v_scalar;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":119
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":119
  *     def __imul__(SparseVector self, float scalar):
  *         self.vector[0] *= scalar
  *         return self             # <<<<<<<<<<<<<<
@@ -4512,13 +4856,29 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_27__imul__(struct __pyx_ob
   __pyx_r = ((PyObject *)__pyx_v_self);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":117
+ *         return self
+ * 
+ *     def __imul__(SparseVector self, float scalar):             # <<<<<<<<<<<<<<
+ *         self.vector[0] *= scalar
+ *         return self
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":121
+ *         return self
+ * 
+ *     def __idiv__(SparseVector self, float scalar):             # <<<<<<<<<<<<<<
+ *         self.vector[0] /= scalar
+ *         return self
+ */
+
 /* Python wrapper */
 #if PY_MAJOR_VERSION < 3
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_30__idiv__(PyObject *__pyx_v_self, PyObject *__pyx_arg_scalar); /*proto*/
@@ -4540,26 +4900,20 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_30__idiv__(PyObject *__pyx
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_29__idiv__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_self), ((float)__pyx_v_scalar));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 #endif /*!(#if PY_MAJOR_VERSION < 3)*/
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":121
- *         return self
- * 
- *     def __idiv__(SparseVector self, float scalar):             # <<<<<<<<<<<<<<
- *         self.vector[0] /= scalar
- *         return self
- */
-
 #if PY_MAJOR_VERSION < 3
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_29__idiv__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_self, float __pyx_v_scalar) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__idiv__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":122
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":122
  * 
  *     def __idiv__(SparseVector self, float scalar):
  *         self.vector[0] /= scalar             # <<<<<<<<<<<<<<
@@ -4568,7 +4922,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_29__idiv__(struct __pyx_ob
  */
   (__pyx_v_self->vector[0]) /= __pyx_v_scalar;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":123
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":123
  *     def __idiv__(SparseVector self, float scalar):
  *         self.vector[0] /= scalar
  *         return self             # <<<<<<<<<<<<<<
@@ -4580,7 +4934,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_29__idiv__(struct __pyx_ob
   __pyx_r = ((PyObject *)__pyx_v_self);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":121
+ *         return self
+ * 
+ *     def __idiv__(SparseVector self, float scalar):             # <<<<<<<<<<<<<<
+ *         self.vector[0] /= scalar
+ *         return self
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
@@ -4588,6 +4950,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_29__idiv__(struct __pyx_ob
 }
 #endif /*!(#if PY_MAJOR_VERSION < 3)*/
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":125
+ *         return self
+ * 
+ *     def __add__(SparseVector x, SparseVector y):             # <<<<<<<<<<<<<<
+ *         cdef SparseVector result = SparseVector.__new__(SparseVector)
+ *         result.vector = new FastSparseVector[weight_t](x.vector[0] + y.vector[0])
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_32__add__(PyObject *__pyx_v_x, PyObject *__pyx_v_y); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_32__add__(PyObject *__pyx_v_x, PyObject *__pyx_v_y) {
@@ -4600,6 +4970,8 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_32__add__(PyObject *__pyx_
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x), __pyx_ptype_4cdec_5_cdec_SparseVector, 1, "x", 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y), __pyx_ptype_4cdec_5_cdec_SparseVector, 1, "y", 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_31__add__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_x), ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_y));
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __pyx_r = NULL;
@@ -4608,14 +4980,6 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_32__add__(PyObject *__pyx_
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":125
- *         return self
- * 
- *     def __add__(SparseVector x, SparseVector y):             # <<<<<<<<<<<<<<
- *         cdef SparseVector result = SparseVector.__new__(SparseVector)
- *         result.vector = new FastSparseVector[weight_t](x.vector[0] + y.vector[0])
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_31__add__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_x, struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_y) {
   struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_result = 0;
   PyObject *__pyx_r = NULL;
@@ -4626,20 +4990,20 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_31__add__(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__add__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":126
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":126
  * 
  *     def __add__(SparseVector x, SparseVector y):
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)             # <<<<<<<<<<<<<<
  *         result.vector = new FastSparseVector[weight_t](x.vector[0] + y.vector[0])
  *         return result
  */
-  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   if (!(likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_4cdec_5_cdec_SparseVector)))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_result = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":127
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":127
  *     def __add__(SparseVector x, SparseVector y):
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)
  *         result.vector = new FastSparseVector[weight_t](x.vector[0] + y.vector[0])             # <<<<<<<<<<<<<<
@@ -4648,7 +5012,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_31__add__(struct __pyx_obj
  */
   __pyx_v_result->vector = new FastSparseVector<weight_t>(((__pyx_v_x->vector[0]) + (__pyx_v_y->vector[0])));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":128
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":128
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)
  *         result.vector = new FastSparseVector[weight_t](x.vector[0] + y.vector[0])
  *         return result             # <<<<<<<<<<<<<<
@@ -4660,8 +5024,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_31__add__(struct __pyx_obj
   __pyx_r = ((PyObject *)__pyx_v_result);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":125
+ *         return self
+ * 
+ *     def __add__(SparseVector x, SparseVector y):             # <<<<<<<<<<<<<<
+ *         cdef SparseVector result = SparseVector.__new__(SparseVector)
+ *         result.vector = new FastSparseVector[weight_t](x.vector[0] + y.vector[0])
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.SparseVector.__add__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -4673,6 +5044,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_31__add__(struct __pyx_obj
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":130
+ *         return result
+ * 
+ *     def __sub__(SparseVector x, SparseVector y):             # <<<<<<<<<<<<<<
+ *         cdef SparseVector result = SparseVector.__new__(SparseVector)
+ *         result.vector = new FastSparseVector[weight_t](x.vector[0] - y.vector[0])
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_34__sub__(PyObject *__pyx_v_x, PyObject *__pyx_v_y); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_34__sub__(PyObject *__pyx_v_x, PyObject *__pyx_v_y) {
@@ -4685,6 +5064,8 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_34__sub__(PyObject *__pyx_
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x), __pyx_ptype_4cdec_5_cdec_SparseVector, 1, "x", 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y), __pyx_ptype_4cdec_5_cdec_SparseVector, 1, "y", 0))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_33__sub__(((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_x), ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_v_y));
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __pyx_r = NULL;
@@ -4693,14 +5074,6 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_34__sub__(PyObject *__pyx_
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":130
- *         return result
- * 
- *     def __sub__(SparseVector x, SparseVector y):             # <<<<<<<<<<<<<<
- *         cdef SparseVector result = SparseVector.__new__(SparseVector)
- *         result.vector = new FastSparseVector[weight_t](x.vector[0] - y.vector[0])
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_33__sub__(struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_x, struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_y) {
   struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_result = 0;
   PyObject *__pyx_r = NULL;
@@ -4711,20 +5084,20 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_33__sub__(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__sub__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":131
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":131
  * 
  *     def __sub__(SparseVector x, SparseVector y):
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)             # <<<<<<<<<<<<<<
  *         result.vector = new FastSparseVector[weight_t](x.vector[0] - y.vector[0])
  *         return result
  */
-  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   if (!(likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_4cdec_5_cdec_SparseVector)))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_result = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":132
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":132
  *     def __sub__(SparseVector x, SparseVector y):
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)
  *         result.vector = new FastSparseVector[weight_t](x.vector[0] - y.vector[0])             # <<<<<<<<<<<<<<
@@ -4733,7 +5106,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_33__sub__(struct __pyx_obj
  */
   __pyx_v_result->vector = new FastSparseVector<weight_t>(((__pyx_v_x->vector[0]) - (__pyx_v_y->vector[0])));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":133
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":133
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)
  *         result.vector = new FastSparseVector[weight_t](x.vector[0] - y.vector[0])
  *         return result             # <<<<<<<<<<<<<<
@@ -4745,8 +5118,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_33__sub__(struct __pyx_obj
   __pyx_r = ((PyObject *)__pyx_v_result);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":130
+ *         return result
+ * 
+ *     def __sub__(SparseVector x, SparseVector y):             # <<<<<<<<<<<<<<
+ *         cdef SparseVector result = SparseVector.__new__(SparseVector)
+ *         result.vector = new FastSparseVector[weight_t](x.vector[0] - y.vector[0])
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.SparseVector.__sub__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -4758,6 +5138,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_33__sub__(struct __pyx_obj
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":135
+ *         return result
+ * 
+ *     def __mul__(x, y):             # <<<<<<<<<<<<<<
+ *         cdef SparseVector vector
+ *         cdef float scalar
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_36__mul__(PyObject *__pyx_v_x, PyObject *__pyx_v_y); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_36__mul__(PyObject *__pyx_v_x, PyObject *__pyx_v_y) {
@@ -4765,18 +5153,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_36__mul__(PyObject *__pyx_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__mul__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_35__mul__(((PyObject *)__pyx_v_x), ((PyObject *)__pyx_v_y));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":135
- *         return result
- * 
- *     def __mul__(x, y):             # <<<<<<<<<<<<<<
- *         cdef SparseVector vector
- *         cdef float scalar
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_35__mul__(PyObject *__pyx_v_x, PyObject *__pyx_v_y) {
   struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_vector = 0;
   float __pyx_v_scalar;
@@ -4792,7 +5174,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_35__mul__(PyObject *__pyx_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__mul__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":138
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":138
  *         cdef SparseVector vector
  *         cdef float scalar
  *         if isinstance(x, SparseVector): vector, scalar = x, y             # <<<<<<<<<<<<<<
@@ -4813,7 +5195,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_35__mul__(PyObject *__pyx_
   }
   /*else*/ {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":139
+    /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":139
  *         cdef float scalar
  *         if isinstance(x, SparseVector): vector, scalar = x, y
  *         else: vector, scalar = y, x             # <<<<<<<<<<<<<<
@@ -4830,20 +5212,20 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_35__mul__(PyObject *__pyx_
   }
   __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":140
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":140
  *         if isinstance(x, SparseVector): vector, scalar = x, y
  *         else: vector, scalar = y, x
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)             # <<<<<<<<<<<<<<
  *         result.vector = new FastSparseVector[weight_t](vector.vector[0] * scalar)
  *         return result
  */
-  __pyx_t_3 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   if (!(likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_4cdec_5_cdec_SparseVector)))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_result = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":141
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":141
  *         else: vector, scalar = y, x
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)
  *         result.vector = new FastSparseVector[weight_t](vector.vector[0] * scalar)             # <<<<<<<<<<<<<<
@@ -4852,7 +5234,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_35__mul__(PyObject *__pyx_
  */
   __pyx_v_result->vector = new FastSparseVector<weight_t>(((__pyx_v_vector->vector[0]) * __pyx_v_scalar));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":142
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":142
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)
  *         result.vector = new FastSparseVector[weight_t](vector.vector[0] * scalar)
  *         return result             # <<<<<<<<<<<<<<
@@ -4864,8 +5246,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_35__mul__(PyObject *__pyx_
   __pyx_r = ((PyObject *)__pyx_v_result);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":135
+ *         return result
+ * 
+ *     def __mul__(x, y):             # <<<<<<<<<<<<<<
+ *         cdef SparseVector vector
+ *         cdef float scalar
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_3);
   __Pyx_AddTraceback("cdec._cdec.SparseVector.__mul__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -4878,6 +5267,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_35__mul__(PyObject *__pyx_
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":144
+ *         return result
+ * 
+ *     def __div__(x, y):             # <<<<<<<<<<<<<<
+ *         cdef SparseVector vector
+ *         cdef float scalar
+ */
+
 /* Python wrapper */
 #if PY_MAJOR_VERSION < 3
 static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_38__div__(PyObject *__pyx_v_x, PyObject *__pyx_v_y); /*proto*/
@@ -4886,19 +5283,13 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12SparseVector_38__div__(PyObject *__pyx_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__div__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_12SparseVector_37__div__(((PyObject *)__pyx_v_x), ((PyObject *)__pyx_v_y));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 #endif /*!(#if PY_MAJOR_VERSION < 3)*/
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":144
- *         return result
- * 
- *     def __div__(x, y):             # <<<<<<<<<<<<<<
- *         cdef SparseVector vector
- *         cdef float scalar
- */
-
 #if PY_MAJOR_VERSION < 3
 static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_37__div__(PyObject *__pyx_v_x, PyObject *__pyx_v_y) {
   struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_vector = 0;
@@ -4915,7 +5306,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_37__div__(PyObject *__pyx_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__div__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":147
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":147
  *         cdef SparseVector vector
  *         cdef float scalar
  *         if isinstance(x, SparseVector): vector, scalar = x, y             # <<<<<<<<<<<<<<
@@ -4936,7 +5327,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_37__div__(PyObject *__pyx_
   }
   /*else*/ {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":148
+    /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":148
  *         cdef float scalar
  *         if isinstance(x, SparseVector): vector, scalar = x, y
  *         else: vector, scalar = y, x             # <<<<<<<<<<<<<<
@@ -4953,20 +5344,20 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_37__div__(PyObject *__pyx_
   }
   __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":149
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":149
  *         if isinstance(x, SparseVector): vector, scalar = x, y
  *         else: vector, scalar = y, x
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)             # <<<<<<<<<<<<<<
  *         result.vector = new FastSparseVector[weight_t](vector.vector[0] / scalar)
  *         return result
  */
-  __pyx_t_3 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   if (!(likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_4cdec_5_cdec_SparseVector)))) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_result = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":150
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":150
  *         else: vector, scalar = y, x
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)
  *         result.vector = new FastSparseVector[weight_t](vector.vector[0] / scalar)             # <<<<<<<<<<<<<<
@@ -4974,7 +5365,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_37__div__(PyObject *__pyx_
  */
   __pyx_v_result->vector = new FastSparseVector<weight_t>(((__pyx_v_vector->vector[0]) / __pyx_v_scalar));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":151
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":151
  *         cdef SparseVector result = SparseVector.__new__(SparseVector)
  *         result.vector = new FastSparseVector[weight_t](vector.vector[0] / scalar)
  *         return result             # <<<<<<<<<<<<<<
@@ -4984,8 +5375,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_37__div__(PyObject *__pyx_
   __pyx_r = ((PyObject *)__pyx_v_result);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":144
+ *         return result
+ * 
+ *     def __div__(x, y):             # <<<<<<<<<<<<<<
+ *         cdef SparseVector vector
+ *         cdef float scalar
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_3);
   __Pyx_AddTraceback("cdec._cdec.SparseVector.__div__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -4999,6 +5397,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12SparseVector_37__div__(PyObject *__pyx_
 }
 #endif /*!(#if PY_MAJOR_VERSION < 3)*/
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":5
+ * import cdec.sa._sa as _sa
+ * 
+ * def _phrase(phrase):             # <<<<<<<<<<<<<<
+ *     return ' '.join(w.encode('utf8') if isinstance(w, unicode) else str(w) for w in phrase)
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_1_phrase(PyObject *__pyx_self, PyObject *__pyx_v_phrase); /*proto*/
 static PyMethodDef __pyx_mdef_4cdec_5_cdec_1_phrase = {__Pyx_NAMESTR("_phrase"), (PyCFunction)__pyx_pw_4cdec_5_cdec_1_phrase, METH_O, __Pyx_DOCSTR(0)};
@@ -5007,12 +5413,14 @@ static PyObject *__pyx_pw_4cdec_5_cdec_1_phrase(PyObject *__pyx_self, PyObject *
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("_phrase (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec__phrase(__pyx_self, ((PyObject *)__pyx_v_phrase));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_7_phrase_2generator18(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":6
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":6
  * 
  * def _phrase(phrase):
  *     return ' '.join(w.encode('utf8') if isinstance(w, unicode) else str(w) for w in phrase)             # <<<<<<<<<<<<<<
@@ -5044,6 +5452,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7_phrase_genexpr(PyObject *__pyx_self) {
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -5108,8 +5517,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7_phrase_2generator18(__pyx_GeneratorObje
     } else {
       __pyx_t_4 = __pyx_t_3(__pyx_t_1);
       if (unlikely(!__pyx_t_4)) {
-        if (PyErr_Occurred()) {
-          if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
+        PyObject* exc_type = PyErr_Occurred();
+        if (exc_type) {
+          if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
           else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         }
         break;
@@ -5117,15 +5527,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7_phrase_2generator18(__pyx_GeneratorObje
       __Pyx_GOTREF(__pyx_t_4);
     }
     __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_w);
-    __Pyx_XDECREF(__pyx_cur_scope->__pyx_v_w);
+    __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_w, __pyx_t_4);
     __Pyx_GIVEREF(__pyx_t_4);
-    __pyx_cur_scope->__pyx_v_w = __pyx_t_4;
     __pyx_t_4 = 0;
     __pyx_t_5 = PyUnicode_Check(__pyx_cur_scope->__pyx_v_w); 
     if ((__pyx_t_5 != 0)) {
-      __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_w, __pyx_n_s__encode); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_w, __pyx_n_s_encode); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_6);
-      __pyx_t_7 = PyObject_Call(__pyx_t_6, ((PyObject *)__pyx_k_tuple_6), NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_tuple__3, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_7);
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
       __pyx_t_4 = __pyx_t_7;
@@ -5136,9 +5545,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7_phrase_2generator18(__pyx_GeneratorObje
       __Pyx_INCREF(__pyx_cur_scope->__pyx_v_w);
       PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_cur_scope->__pyx_v_w);
       __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_w);
-      __pyx_t_6 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_7), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_7, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_6);
-      __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0;
+      __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
       __pyx_t_4 = __pyx_t_6;
       __pyx_t_6 = 0;
     }
@@ -5162,6 +5571,8 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7_phrase_2generator18(__pyx_GeneratorObje
     if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -5178,7 +5589,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7_phrase_2generator18(__pyx_GeneratorObje
   return NULL;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":5
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":5
  * import cdec.sa._sa as _sa
  * 
  * def _phrase(phrase):             # <<<<<<<<<<<<<<
@@ -5192,7 +5603,6 @@ static PyObject *__pyx_pf_4cdec_5_cdec__phrase(CYTHON_UNUSED PyObject *__pyx_sel
   __Pyx_RefNannyDeclarations
   PyObject *__pyx_t_1 = NULL;
   PyObject *__pyx_t_2 = NULL;
-  PyObject *__pyx_t_3 = NULL;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -5207,7 +5617,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec__phrase(CYTHON_UNUSED PyObject *__pyx_sel
   __Pyx_INCREF(__pyx_cur_scope->__pyx_v_phrase);
   __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_phrase);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":6
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":6
  * 
  * def _phrase(phrase):
  *     return ' '.join(w.encode('utf8') if isinstance(w, unicode) else str(w) for w in phrase)             # <<<<<<<<<<<<<<
@@ -5215,29 +5625,27 @@ static PyObject *__pyx_pf_4cdec_5_cdec__phrase(CYTHON_UNUSED PyObject *__pyx_sel
  * cdef class NT:
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_kp_s_7), __pyx_n_s__join); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_pf_4cdec_5_cdec_7_phrase_genexpr(((PyObject*)__pyx_cur_scope)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __pyx_pf_4cdec_5_cdec_7_phrase_genexpr(((PyObject*)__pyx_cur_scope)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_3);
-  PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
-  __Pyx_GIVEREF(__pyx_t_2);
-  __pyx_t_2 = 0;
-  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyString_Join(__pyx_kp_s__4, __pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
   __pyx_r = __pyx_t_2;
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":5
+ * import cdec.sa._sa as _sa
+ * 
+ * def _phrase(phrase):             # <<<<<<<<<<<<<<
+ *     return ' '.join(w.encode('utf8') if isinstance(w, unicode) else str(w) for w in phrase)
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_XDECREF(__pyx_t_3);
   __Pyx_AddTraceback("cdec._cdec._phrase", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = NULL;
   __pyx_L0:;
@@ -5247,6 +5655,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec__phrase(CYTHON_UNUSED PyObject *__pyx_sel
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":11
+ *     cdef public bytes cat
+ *     cdef public unsigned ref
+ *     def __init__(self, bytes cat, unsigned ref=0):             # <<<<<<<<<<<<<<
+ *         """NT(bytes cat, int ref=0) -> Non-terminal from category `cat`."""
+ *         self.cat = cat
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_2NT_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_2NT___init__[] = "NT(bytes cat, int ref=0) -> Non-terminal from category `cat`.";
@@ -5263,7 +5679,7 @@ static int __pyx_pw_4cdec_5_cdec_2NT_1__init__(PyObject *__pyx_v_self, PyObject
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__init__ (wrapper)", 0);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__cat,&__pyx_n_s__ref,0};
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_cat,&__pyx_n_s_ref,0};
     PyObject* values[2] = {0,0};
     if (unlikely(__pyx_kwds)) {
       Py_ssize_t kw_args;
@@ -5277,11 +5693,11 @@ static int __pyx_pw_4cdec_5_cdec_2NT_1__init__(PyObject *__pyx_v_self, PyObject
       kw_args = PyDict_Size(__pyx_kwds);
       switch (pos_args) {
         case  0:
-        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__cat)) != 0)) kw_args--;
+        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_cat)) != 0)) kw_args--;
         else goto __pyx_L5_argtuple_error;
         case  1:
         if (kw_args > 0) {
-          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__ref);
+          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_ref);
           if (value) { values[1] = value; kw_args--; }
         }
       }
@@ -5298,7 +5714,7 @@ static int __pyx_pw_4cdec_5_cdec_2NT_1__init__(PyObject *__pyx_v_self, PyObject
     }
     __pyx_v_cat = ((PyObject*)values[0]);
     if (values[1]) {
-      __pyx_v_ref = __Pyx_PyInt_AsUnsignedInt(values[1]); if (unlikely((__pyx_v_ref == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      __pyx_v_ref = __Pyx_PyInt_As_unsigned_int(values[1]); if (unlikely((__pyx_v_ref == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     } else {
       __pyx_v_ref = ((unsigned int)0);
     }
@@ -5313,6 +5729,8 @@ static int __pyx_pw_4cdec_5_cdec_2NT_1__init__(PyObject *__pyx_v_self, PyObject
   __pyx_L4_argument_unpacking_done:;
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_cat), (&PyBytes_Type), 1, "cat", 1))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 11; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_5_cdec_2NT___init__(((struct __pyx_obj_4cdec_5_cdec_NT *)__pyx_v_self), __pyx_v_cat, __pyx_v_ref);
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __pyx_r = -1;
@@ -5321,33 +5739,25 @@ static int __pyx_pw_4cdec_5_cdec_2NT_1__init__(PyObject *__pyx_v_self, PyObject
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":11
- *     cdef public bytes cat
- *     cdef public unsigned ref
- *     def __init__(self, bytes cat, unsigned ref=0):             # <<<<<<<<<<<<<<
- *         """NT(bytes cat, int ref=0) -> Non-terminal from category `cat`."""
- *         self.cat = cat
- */
-
 static int __pyx_pf_4cdec_5_cdec_2NT___init__(struct __pyx_obj_4cdec_5_cdec_NT *__pyx_v_self, PyObject *__pyx_v_cat, unsigned int __pyx_v_ref) {
   int __pyx_r;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__init__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":13
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":13
  *     def __init__(self, bytes cat, unsigned ref=0):
  *         """NT(bytes cat, int ref=0) -> Non-terminal from category `cat`."""
  *         self.cat = cat             # <<<<<<<<<<<<<<
  *         self.ref = ref
  * 
  */
-  __Pyx_INCREF(((PyObject *)__pyx_v_cat));
-  __Pyx_GIVEREF(((PyObject *)__pyx_v_cat));
+  __Pyx_INCREF(__pyx_v_cat);
+  __Pyx_GIVEREF(__pyx_v_cat);
   __Pyx_GOTREF(__pyx_v_self->cat);
-  __Pyx_DECREF(((PyObject *)__pyx_v_self->cat));
+  __Pyx_DECREF(__pyx_v_self->cat);
   __pyx_v_self->cat = __pyx_v_cat;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":14
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":14
  *         """NT(bytes cat, int ref=0) -> Non-terminal from category `cat`."""
  *         self.cat = cat
  *         self.ref = ref             # <<<<<<<<<<<<<<
@@ -5356,11 +5766,28 @@ static int __pyx_pf_4cdec_5_cdec_2NT___init__(struct __pyx_obj_4cdec_5_cdec_NT *
  */
   __pyx_v_self->ref = __pyx_v_ref;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":11
+ *     cdef public bytes cat
+ *     cdef public unsigned ref
+ *     def __init__(self, bytes cat, unsigned ref=0):             # <<<<<<<<<<<<<<
+ *         """NT(bytes cat, int ref=0) -> Non-terminal from category `cat`."""
+ *         self.cat = cat
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":16
+ *         self.ref = ref
+ * 
+ *     def __str__(self):             # <<<<<<<<<<<<<<
+ *         if self.ref > 0:
+ *             return '[%s,%d]' % (self.cat, self.ref)
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_2NT_3__str__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_2NT_3__str__(PyObject *__pyx_v_self) {
@@ -5368,18 +5795,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_2NT_3__str__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__str__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_2NT_2__str__(((struct __pyx_obj_4cdec_5_cdec_NT *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":16
- *         self.ref = ref
- * 
- *     def __str__(self):             # <<<<<<<<<<<<<<
- *         if self.ref > 0:
- *             return '[%s,%d]' % (self.cat, self.ref)
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_2NT_2__str__(struct __pyx_obj_4cdec_5_cdec_NT *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -5391,7 +5812,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_2NT_2__str__(struct __pyx_obj_4cdec_5_cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__str__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":17
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":17
  * 
  *     def __str__(self):
  *         if self.ref > 0:             # <<<<<<<<<<<<<<
@@ -5401,7 +5822,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_2NT_2__str__(struct __pyx_obj_4cdec_5_cde
   __pyx_t_1 = ((__pyx_v_self->ref > 0) != 0);
   if (__pyx_t_1) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":18
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":18
  *     def __str__(self):
  *         if self.ref > 0:
  *             return '[%s,%d]' % (self.cat, self.ref)             # <<<<<<<<<<<<<<
@@ -5409,27 +5830,25 @@ static PyObject *__pyx_pf_4cdec_5_cdec_2NT_2__str__(struct __pyx_obj_4cdec_5_cde
  * 
  */
     __Pyx_XDECREF(__pyx_r);
-    __pyx_t_2 = PyLong_FromUnsignedLong(__pyx_v_self->ref); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_2 = __Pyx_PyInt_From_unsigned_int(__pyx_v_self->ref); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_2);
     __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_INCREF(((PyObject *)__pyx_v_self->cat));
-    PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_v_self->cat));
-    __Pyx_GIVEREF(((PyObject *)__pyx_v_self->cat));
+    __Pyx_INCREF(__pyx_v_self->cat);
+    PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_self->cat);
+    __Pyx_GIVEREF(__pyx_v_self->cat);
     PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_2);
     __Pyx_GIVEREF(__pyx_t_2);
     __pyx_t_2 = 0;
-    __pyx_t_2 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_8), ((PyObject *)__pyx_t_3)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
-    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
-    __pyx_r = ((PyObject *)__pyx_t_2);
+    __pyx_t_2 = __Pyx_PyString_Format(__pyx_kp_s_s_d, __pyx_t_3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    __pyx_r = __pyx_t_2;
     __pyx_t_2 = 0;
     goto __pyx_L0;
-    goto __pyx_L3;
   }
-  __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":19
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":19
  *         if self.ref > 0:
  *             return '[%s,%d]' % (self.cat, self.ref)
  *         return '[%s]' % self.cat             # <<<<<<<<<<<<<<
@@ -5437,14 +5856,21 @@ static PyObject *__pyx_pf_4cdec_5_cdec_2NT_2__str__(struct __pyx_obj_4cdec_5_cde
  * cdef class NTRef:
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_2 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_9), ((PyObject *)__pyx_v_self->cat)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
-  __pyx_r = ((PyObject *)__pyx_t_2);
+  __pyx_t_2 = __Pyx_PyString_Format(__pyx_kp_s_s, __pyx_v_self->cat); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_r = __pyx_t_2;
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":16
+ *         self.ref = ref
+ * 
+ *     def __str__(self):             # <<<<<<<<<<<<<<
+ *         if self.ref > 0:
+ *             return '[%s,%d]' % (self.cat, self.ref)
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_2);
   __Pyx_XDECREF(__pyx_t_3);
@@ -5456,6 +5882,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_2NT_2__str__(struct __pyx_obj_4cdec_5_cde
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":9
+ * 
+ * cdef class NT:
+ *     cdef public bytes cat             # <<<<<<<<<<<<<<
+ *     cdef public unsigned ref
+ *     def __init__(self, bytes cat, unsigned ref=0):
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_2NT_3cat_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_2NT_3cat_1__get__(PyObject *__pyx_v_self) {
@@ -5463,28 +5897,22 @@ static PyObject *__pyx_pw_4cdec_5_cdec_2NT_3cat_1__get__(PyObject *__pyx_v_self)
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_2NT_3cat___get__(((struct __pyx_obj_4cdec_5_cdec_NT *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":9
- * 
- * cdef class NT:
- *     cdef public bytes cat             # <<<<<<<<<<<<<<
- *     cdef public unsigned ref
- *     def __init__(self, bytes cat, unsigned ref=0):
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_2NT_3cat___get__(struct __pyx_obj_4cdec_5_cdec_NT *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__", 0);
   __Pyx_XDECREF(__pyx_r);
-  __Pyx_INCREF(((PyObject *)__pyx_v_self->cat));
-  __pyx_r = ((PyObject *)__pyx_v_self->cat);
+  __Pyx_INCREF(__pyx_v_self->cat);
+  __pyx_r = __pyx_v_self->cat;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
+  /* function exit code */
   __pyx_L0:;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
@@ -5498,6 +5926,8 @@ static int __pyx_pw_4cdec_5_cdec_2NT_3cat_3__set__(PyObject *__pyx_v_self, PyObj
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__set__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_2NT_3cat_2__set__(((struct __pyx_obj_4cdec_5_cdec_NT *)__pyx_v_self), ((PyObject *)__pyx_v_value));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
@@ -5505,20 +5935,25 @@ static int __pyx_pw_4cdec_5_cdec_2NT_3cat_3__set__(PyObject *__pyx_v_self, PyObj
 static int __pyx_pf_4cdec_5_cdec_2NT_3cat_2__set__(struct __pyx_obj_4cdec_5_cdec_NT *__pyx_v_self, PyObject *__pyx_v_value) {
   int __pyx_r;
   __Pyx_RefNannyDeclarations
+  PyObject *__pyx_t_1 = NULL;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__set__", 0);
-  if (!(likely(PyBytes_CheckExact(__pyx_v_value))||((__pyx_v_value) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected bytes, got %.200s", Py_TYPE(__pyx_v_value)->tp_name), 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_INCREF(__pyx_v_value);
-  __Pyx_GIVEREF(__pyx_v_value);
+  if (!(likely(PyBytes_CheckExact(__pyx_v_value))||((__pyx_v_value) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "bytes", Py_TYPE(__pyx_v_value)->tp_name), 0))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_v_value;
+  __Pyx_INCREF(__pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
   __Pyx_GOTREF(__pyx_v_self->cat);
-  __Pyx_DECREF(((PyObject *)__pyx_v_self->cat));
-  __pyx_v_self->cat = ((PyObject*)__pyx_v_value);
+  __Pyx_DECREF(__pyx_v_self->cat);
+  __pyx_v_self->cat = ((PyObject*)__pyx_t_1);
+  __pyx_t_1 = 0;
 
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
+  __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.NT.cat.__set__", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = -1;
   __pyx_L0:;
@@ -5533,6 +5968,8 @@ static int __pyx_pw_4cdec_5_cdec_2NT_3cat_5__del__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__del__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_2NT_3cat_4__del__(((struct __pyx_obj_4cdec_5_cdec_NT *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
@@ -5544,14 +5981,23 @@ static int __pyx_pf_4cdec_5_cdec_2NT_3cat_4__del__(struct __pyx_obj_4cdec_5_cdec
   __Pyx_INCREF(Py_None);
   __Pyx_GIVEREF(Py_None);
   __Pyx_GOTREF(__pyx_v_self->cat);
-  __Pyx_DECREF(((PyObject *)__pyx_v_self->cat));
+  __Pyx_DECREF(__pyx_v_self->cat);
   __pyx_v_self->cat = ((PyObject*)Py_None);
 
+  /* function exit code */
   __pyx_r = 0;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":10
+ * cdef class NT:
+ *     cdef public bytes cat
+ *     cdef public unsigned ref             # <<<<<<<<<<<<<<
+ *     def __init__(self, bytes cat, unsigned ref=0):
+ *         """NT(bytes cat, int ref=0) -> Non-terminal from category `cat`."""
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_2NT_3ref_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_2NT_3ref_1__get__(PyObject *__pyx_v_self) {
@@ -5559,18 +6005,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_2NT_3ref_1__get__(PyObject *__pyx_v_self)
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_2NT_3ref___get__(((struct __pyx_obj_4cdec_5_cdec_NT *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":10
- * cdef class NT:
- *     cdef public bytes cat
- *     cdef public unsigned ref             # <<<<<<<<<<<<<<
- *     def __init__(self, bytes cat, unsigned ref=0):
- *         """NT(bytes cat, int ref=0) -> Non-terminal from category `cat`."""
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_2NT_3ref___get__(struct __pyx_obj_4cdec_5_cdec_NT *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -5580,14 +6020,13 @@ static PyObject *__pyx_pf_4cdec_5_cdec_2NT_3ref___get__(struct __pyx_obj_4cdec_5
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = PyLong_FromUnsignedLong(__pyx_v_self->ref); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_From_unsigned_int(__pyx_v_self->ref); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.NT.ref.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -5605,6 +6044,8 @@ static int __pyx_pw_4cdec_5_cdec_2NT_3ref_3__set__(PyObject *__pyx_v_self, PyObj
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__set__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_2NT_3ref_2__set__(((struct __pyx_obj_4cdec_5_cdec_NT *)__pyx_v_self), ((PyObject *)__pyx_v_value));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
@@ -5617,9 +6058,10 @@ static int __pyx_pf_4cdec_5_cdec_2NT_3ref_2__set__(struct __pyx_obj_4cdec_5_cdec
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__set__", 0);
-  __pyx_t_1 = __Pyx_PyInt_AsUnsignedInt(__pyx_v_value); if (unlikely((__pyx_t_1 == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_As_unsigned_int(__pyx_v_value); if (unlikely((__pyx_t_1 == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 10; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_self->ref = __pyx_t_1;
 
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -5630,6 +6072,14 @@ static int __pyx_pf_4cdec_5_cdec_2NT_3ref_2__set__(struct __pyx_obj_4cdec_5_cdec
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":23
+ * cdef class NTRef:
+ *     cdef public unsigned ref
+ *     def __init__(self, unsigned ref):             # <<<<<<<<<<<<<<
+ *         """NTRef(int ref) -> Non-terminal reference."""
+ *         self.ref = ref
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_5NTRef_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_5NTRef___init__[] = "NTRef(int ref) -> Non-terminal reference.";
@@ -5645,7 +6095,7 @@ static int __pyx_pw_4cdec_5_cdec_5NTRef_1__init__(PyObject *__pyx_v_self, PyObje
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__init__ (wrapper)", 0);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__ref,0};
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_ref,0};
     PyObject* values[1] = {0};
     if (unlikely(__pyx_kwds)) {
       Py_ssize_t kw_args;
@@ -5658,7 +6108,7 @@ static int __pyx_pw_4cdec_5_cdec_5NTRef_1__init__(PyObject *__pyx_v_self, PyObje
       kw_args = PyDict_Size(__pyx_kwds);
       switch (pos_args) {
         case  0:
-        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__ref)) != 0)) kw_args--;
+        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_ref)) != 0)) kw_args--;
         else goto __pyx_L5_argtuple_error;
       }
       if (unlikely(kw_args > 0)) {
@@ -5669,7 +6119,7 @@ static int __pyx_pw_4cdec_5_cdec_5NTRef_1__init__(PyObject *__pyx_v_self, PyObje
     } else {
       values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
     }
-    __pyx_v_ref = __Pyx_PyInt_AsUnsignedInt(values[0]); if (unlikely((__pyx_v_ref == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    __pyx_v_ref = __Pyx_PyInt_As_unsigned_int(values[0]); if (unlikely((__pyx_v_ref == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
@@ -5680,24 +6130,18 @@ static int __pyx_pw_4cdec_5_cdec_5NTRef_1__init__(PyObject *__pyx_v_self, PyObje
   return -1;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_5NTRef___init__(((struct __pyx_obj_4cdec_5_cdec_NTRef *)__pyx_v_self), __pyx_v_ref);
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":23
- * cdef class NTRef:
- *     cdef public unsigned ref
- *     def __init__(self, unsigned ref):             # <<<<<<<<<<<<<<
- *         """NTRef(int ref) -> Non-terminal reference."""
- *         self.ref = ref
- */
-
 static int __pyx_pf_4cdec_5_cdec_5NTRef___init__(struct __pyx_obj_4cdec_5_cdec_NTRef *__pyx_v_self, unsigned int __pyx_v_ref) {
   int __pyx_r;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__init__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":25
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":25
  *     def __init__(self, unsigned ref):
  *         """NTRef(int ref) -> Non-terminal reference."""
  *         self.ref = ref             # <<<<<<<<<<<<<<
@@ -5706,11 +6150,28 @@ static int __pyx_pf_4cdec_5_cdec_5NTRef___init__(struct __pyx_obj_4cdec_5_cdec_N
  */
   __pyx_v_self->ref = __pyx_v_ref;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":23
+ * cdef class NTRef:
+ *     cdef public unsigned ref
+ *     def __init__(self, unsigned ref):             # <<<<<<<<<<<<<<
+ *         """NTRef(int ref) -> Non-terminal reference."""
+ *         self.ref = ref
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":27
+ *         self.ref = ref
+ * 
+ *     def __str__(self):             # <<<<<<<<<<<<<<
+ *         return '[%d]' % self.ref
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_5NTRef_3__str__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_5NTRef_3__str__(PyObject *__pyx_v_self) {
@@ -5718,18 +6179,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_5NTRef_3__str__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__str__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5NTRef_2__str__(((struct __pyx_obj_4cdec_5_cdec_NTRef *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":27
- *         self.ref = ref
- * 
- *     def __str__(self):             # <<<<<<<<<<<<<<
- *         return '[%d]' % self.ref
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_5NTRef_2__str__(struct __pyx_obj_4cdec_5_cdec_NTRef *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -5740,7 +6195,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5NTRef_2__str__(struct __pyx_obj_4cdec_5_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__str__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":28
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":28
  * 
  *     def __str__(self):
  *         return '[%d]' % self.ref             # <<<<<<<<<<<<<<
@@ -5748,17 +6203,24 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5NTRef_2__str__(struct __pyx_obj_4cdec_5_
  * cdef TRule convert_rule(_sa.Rule rule):
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = PyLong_FromUnsignedLong(__pyx_v_self->ref); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_From_unsigned_int(__pyx_v_self->ref); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_10), __pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = __Pyx_PyString_Format(__pyx_kp_s_d, __pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_r = ((PyObject *)__pyx_t_2);
+  __pyx_r = __pyx_t_2;
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":27
+ *         self.ref = ref
+ * 
+ *     def __str__(self):             # <<<<<<<<<<<<<<
+ *         return '[%d]' % self.ref
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -5770,6 +6232,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5NTRef_2__str__(struct __pyx_obj_4cdec_5_
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":22
+ * 
+ * cdef class NTRef:
+ *     cdef public unsigned ref             # <<<<<<<<<<<<<<
+ *     def __init__(self, unsigned ref):
+ *         """NTRef(int ref) -> Non-terminal reference."""
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_5NTRef_3ref_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_5NTRef_3ref_1__get__(PyObject *__pyx_v_self) {
@@ -5777,18 +6247,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_5NTRef_3ref_1__get__(PyObject *__pyx_v_se
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5NTRef_3ref___get__(((struct __pyx_obj_4cdec_5_cdec_NTRef *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":22
- * 
- * cdef class NTRef:
- *     cdef public unsigned ref             # <<<<<<<<<<<<<<
- *     def __init__(self, unsigned ref):
- *         """NTRef(int ref) -> Non-terminal reference."""
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_5NTRef_3ref___get__(struct __pyx_obj_4cdec_5_cdec_NTRef *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -5798,14 +6262,13 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5NTRef_3ref___get__(struct __pyx_obj_4cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = PyLong_FromUnsignedLong(__pyx_v_self->ref); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_From_unsigned_int(__pyx_v_self->ref); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.NTRef.ref.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -5823,6 +6286,8 @@ static int __pyx_pw_4cdec_5_cdec_5NTRef_3ref_3__set__(PyObject *__pyx_v_self, Py
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__set__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5NTRef_3ref_2__set__(((struct __pyx_obj_4cdec_5_cdec_NTRef *)__pyx_v_self), ((PyObject *)__pyx_v_value));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
@@ -5835,9 +6300,10 @@ static int __pyx_pf_4cdec_5_cdec_5NTRef_3ref_2__set__(struct __pyx_obj_4cdec_5_c
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__set__", 0);
-  __pyx_t_1 = __Pyx_PyInt_AsUnsignedInt(__pyx_v_value); if (unlikely((__pyx_t_1 == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_As_unsigned_int(__pyx_v_value); if (unlikely((__pyx_t_1 == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_self->ref = __pyx_t_1;
 
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -5848,7 +6314,7 @@ static int __pyx_pf_4cdec_5_cdec_5NTRef_3ref_2__set__(struct __pyx_obj_4cdec_5_c
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":30
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":30
  *         return '[%d]' % self.ref
  * 
  * cdef TRule convert_rule(_sa.Rule rule):             # <<<<<<<<<<<<<<
@@ -5879,7 +6345,7 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("convert_rule", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":31
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":31
  * 
  * cdef TRule convert_rule(_sa.Rule rule):
  *     lhs = _sa.sym_tocat(rule.lhs)             # <<<<<<<<<<<<<<
@@ -5888,7 +6354,7 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
  */
   __pyx_v_lhs = __pyx_f_4cdec_2sa_3_sa_sym_tocat(__pyx_v_rule->lhs);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":32
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":32
  * cdef TRule convert_rule(_sa.Rule rule):
  *     lhs = _sa.sym_tocat(rule.lhs)
  *     scores = dict(rule.scores)             # <<<<<<<<<<<<<<
@@ -5900,13 +6366,13 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
   __Pyx_INCREF(((PyObject *)__pyx_v_rule->scores));
   PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_v_rule->scores));
   __Pyx_GIVEREF(((PyObject *)__pyx_v_rule->scores));
-  __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)(&PyDict_Type))), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyDict_Type))), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_v_scores = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":33
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":33
  *     lhs = _sa.sym_tocat(rule.lhs)
  *     scores = dict(rule.scores)
  *     f, e = [], []             # <<<<<<<<<<<<<<
@@ -5922,7 +6388,7 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
   __pyx_v_e = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":34
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":34
  *     scores = dict(rule.scores)
  *     f, e = [], []
  *     cdef int* fsyms = rule.f.syms             # <<<<<<<<<<<<<<
@@ -5932,7 +6398,7 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
   __pyx_t_3 = __pyx_v_rule->f->syms;
   __pyx_v_fsyms = __pyx_t_3;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":35
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":35
  *     f, e = [], []
  *     cdef int* fsyms = rule.f.syms
  *     for i in range(rule.f.n):             # <<<<<<<<<<<<<<
@@ -5943,7 +6409,7 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
   for (__pyx_t_5 = 0; __pyx_t_5 < __pyx_t_4; __pyx_t_5+=1) {
     __pyx_v_i = __pyx_t_5;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":36
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":36
  *     cdef int* fsyms = rule.f.syms
  *     for i in range(rule.f.n):
  *         if _sa.sym_isvar(fsyms[i]):             # <<<<<<<<<<<<<<
@@ -5953,7 +6419,7 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
     __pyx_t_6 = (__pyx_f_4cdec_2sa_3_sa_sym_isvar((__pyx_v_fsyms[__pyx_v_i])) != 0);
     if (__pyx_t_6) {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":37
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":37
  *     for i in range(rule.f.n):
  *         if _sa.sym_isvar(fsyms[i]):
  *             f.append(NT(_sa.sym_tocat(fsyms[i])))             # <<<<<<<<<<<<<<
@@ -5961,22 +6427,22 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
  *             f.append(_sa.sym_tostring(fsyms[i]))
  */
       __pyx_t_1 = __Pyx_PyBytes_FromString(__pyx_f_4cdec_2sa_3_sa_sym_tocat((__pyx_v_fsyms[__pyx_v_i]))); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+      __Pyx_GOTREF(__pyx_t_1);
       __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_2);
-      PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_1));
-      __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+      PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+      __Pyx_GIVEREF(__pyx_t_1);
       __pyx_t_1 = 0;
-      __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_NT)), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_NT)), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_1);
-      __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+      __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __pyx_t_7 = __Pyx_PyList_Append(__pyx_v_f, __pyx_t_1); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
       goto __pyx_L5;
     }
     /*else*/ {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":39
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":39
  *             f.append(NT(_sa.sym_tocat(fsyms[i])))
  *         else:
  *             f.append(_sa.sym_tostring(fsyms[i]))             # <<<<<<<<<<<<<<
@@ -5984,14 +6450,14 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
  *     for i in range(rule.e.n):
  */
       __pyx_t_1 = __Pyx_PyBytes_FromString(__pyx_f_4cdec_2sa_3_sa_sym_tostring((__pyx_v_fsyms[__pyx_v_i]))); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_1));
-      __pyx_t_7 = __Pyx_PyList_Append(__pyx_v_f, ((PyObject *)__pyx_t_1)); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+      __Pyx_GOTREF(__pyx_t_1);
+      __pyx_t_7 = __Pyx_PyList_Append(__pyx_v_f, __pyx_t_1); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     }
     __pyx_L5:;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":40
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":40
  *         else:
  *             f.append(_sa.sym_tostring(fsyms[i]))
  *     cdef int* esyms = rule.e.syms             # <<<<<<<<<<<<<<
@@ -6001,7 +6467,7 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
   __pyx_t_3 = __pyx_v_rule->e->syms;
   __pyx_v_esyms = __pyx_t_3;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":41
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":41
  *             f.append(_sa.sym_tostring(fsyms[i]))
  *     cdef int* esyms = rule.e.syms
  *     for i in range(rule.e.n):             # <<<<<<<<<<<<<<
@@ -6012,7 +6478,7 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
   for (__pyx_t_5 = 0; __pyx_t_5 < __pyx_t_4; __pyx_t_5+=1) {
     __pyx_v_i = __pyx_t_5;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":42
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":42
  *     cdef int* esyms = rule.e.syms
  *     for i in range(rule.e.n):
  *         if _sa.sym_isvar(esyms[i]):             # <<<<<<<<<<<<<<
@@ -6022,30 +6488,30 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
     __pyx_t_6 = (__pyx_f_4cdec_2sa_3_sa_sym_isvar((__pyx_v_esyms[__pyx_v_i])) != 0);
     if (__pyx_t_6) {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":43
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":43
  *     for i in range(rule.e.n):
  *         if _sa.sym_isvar(esyms[i]):
  *             e.append(NTRef(_sa.sym_getindex(esyms[i])))             # <<<<<<<<<<<<<<
  *         else:
  *             e.append(_sa.sym_tostring(esyms[i]))
  */
-      __pyx_t_1 = PyInt_FromLong(__pyx_f_4cdec_2sa_3_sa_sym_getindex((__pyx_v_esyms[__pyx_v_i]))); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_1 = __Pyx_PyInt_From_int(__pyx_f_4cdec_2sa_3_sa_sym_getindex((__pyx_v_esyms[__pyx_v_i]))); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_1);
       __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_2);
       PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
       __Pyx_GIVEREF(__pyx_t_1);
       __pyx_t_1 = 0;
-      __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_NTRef)), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_NTRef)), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_1);
-      __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+      __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __pyx_t_7 = __Pyx_PyList_Append(__pyx_v_e, __pyx_t_1); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
       goto __pyx_L8;
     }
     /*else*/ {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":45
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":45
  *             e.append(NTRef(_sa.sym_getindex(esyms[i])))
  *         else:
  *             e.append(_sa.sym_tostring(esyms[i]))             # <<<<<<<<<<<<<<
@@ -6053,23 +6519,23 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
  *     return TRule(lhs, f, e, scores, a)
  */
       __pyx_t_1 = __Pyx_PyBytes_FromString(__pyx_f_4cdec_2sa_3_sa_sym_tostring((__pyx_v_esyms[__pyx_v_i]))); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_1));
-      __pyx_t_7 = __Pyx_PyList_Append(__pyx_v_e, ((PyObject *)__pyx_t_1)); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+      __Pyx_GOTREF(__pyx_t_1);
+      __pyx_t_7 = __Pyx_PyList_Append(__pyx_v_e, __pyx_t_1); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     }
     __pyx_L8:;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":46
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":46
  *         else:
  *             e.append(_sa.sym_tostring(esyms[i]))
  *     a = list(rule.alignments())             # <<<<<<<<<<<<<<
  *     return TRule(lhs, f, e, scores, a)
  * 
  */
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_rule), __pyx_n_s__alignments); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_rule), __pyx_n_s_alignments); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -6077,13 +6543,13 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
   PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_2);
   __pyx_t_2 = 0;
-  __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)(&PyList_Type))), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyList_Type))), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_v_a = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":47
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":47
  *             e.append(_sa.sym_tostring(esyms[i]))
  *     a = list(rule.alignments())
  *     return TRule(lhs, f, e, scores, a)             # <<<<<<<<<<<<<<
@@ -6092,33 +6558,40 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
  */
   __Pyx_XDECREF(((PyObject *)__pyx_r));
   __pyx_t_2 = __Pyx_PyBytes_FromString(__pyx_v_lhs); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_GOTREF(__pyx_t_2);
   __pyx_t_1 = PyTuple_New(5); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_t_2));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
-  __Pyx_INCREF(((PyObject *)__pyx_v_f));
-  PyTuple_SET_ITEM(__pyx_t_1, 1, ((PyObject *)__pyx_v_f));
-  __Pyx_GIVEREF(((PyObject *)__pyx_v_f));
-  __Pyx_INCREF(((PyObject *)__pyx_v_e));
-  PyTuple_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_v_e));
-  __Pyx_GIVEREF(((PyObject *)__pyx_v_e));
-  __Pyx_INCREF(((PyObject *)__pyx_v_scores));
-  PyTuple_SET_ITEM(__pyx_t_1, 3, ((PyObject *)__pyx_v_scores));
-  __Pyx_GIVEREF(((PyObject *)__pyx_v_scores));
-  __Pyx_INCREF(((PyObject *)__pyx_v_a));
-  PyTuple_SET_ITEM(__pyx_t_1, 4, ((PyObject *)__pyx_v_a));
-  __Pyx_GIVEREF(((PyObject *)__pyx_v_a));
+  PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2);
+  __Pyx_GIVEREF(__pyx_t_2);
+  __Pyx_INCREF(__pyx_v_f);
+  PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_v_f);
+  __Pyx_GIVEREF(__pyx_v_f);
+  __Pyx_INCREF(__pyx_v_e);
+  PyTuple_SET_ITEM(__pyx_t_1, 2, __pyx_v_e);
+  __Pyx_GIVEREF(__pyx_v_e);
+  __Pyx_INCREF(__pyx_v_scores);
+  PyTuple_SET_ITEM(__pyx_t_1, 3, __pyx_v_scores);
+  __Pyx_GIVEREF(__pyx_v_scores);
+  __Pyx_INCREF(__pyx_v_a);
+  PyTuple_SET_ITEM(__pyx_t_1, 4, __pyx_v_a);
+  __Pyx_GIVEREF(__pyx_v_a);
   __pyx_t_2 = 0;
-  __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_TRule)), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_TRule)), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_r = ((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_t_2);
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = ((struct __pyx_obj_4cdec_5_cdec_TRule *)Py_None); __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":30
+ *         return '[%d]' % self.ref
+ * 
+ * cdef TRule convert_rule(_sa.Rule rule):             # <<<<<<<<<<<<<<
+ *     lhs = _sa.sym_tocat(rule.lhs)
+ *     scores = dict(rule.scores)
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -6134,6 +6607,14 @@ static struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_f_4cdec_5_cdec_convert_rule(st
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":52
+ *     cdef shared_ptr[grammar.TRule]* rule
+ * 
+ *     def __init__(self, lhs, f, e, scores, a=None, text=None):             # <<<<<<<<<<<<<<
+ *         """TRule(lhs, f, e, scores, a=None) -> Translation rule.
+ *         lhs: left hand side non-terminal
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_5TRule_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_5TRule___init__[] = "TRule(lhs, f, e, scores, a=None) -> Translation rule.\n        lhs: left hand side non-terminal\n        f: source phrase (list of words/NT)\n        e: target phrase (list of words/NTRef)\n        scores: dictionary of feature scores\n        a: optional list of alignment points";
@@ -6146,6 +6627,7 @@ static int __pyx_pw_4cdec_5_cdec_5TRule_1__init__(PyObject *__pyx_v_self, PyObje
   PyObject *__pyx_v_e = 0;
   PyObject *__pyx_v_scores = 0;
   PyObject *__pyx_v_a = 0;
+  PyObject *__pyx_v_text = 0;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -6153,21 +6635,15 @@ static int __pyx_pw_4cdec_5_cdec_5TRule_1__init__(PyObject *__pyx_v_self, PyObje
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__init__ (wrapper)", 0);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__lhs,&__pyx_n_s__f,&__pyx_n_s__e,&__pyx_n_s__scores,&__pyx_n_s__a,0};
-    PyObject* values[5] = {0,0,0,0,0};
-
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":52
- *     cdef shared_ptr[grammar.TRule]* rule
- * 
- *     def __init__(self, lhs, f, e, scores, a=None):             # <<<<<<<<<<<<<<
- *         """TRule(lhs, f, e, scores, a=None) -> Translation rule.
- *         lhs: left hand side non-terminal
- */
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_lhs,&__pyx_n_s_f,&__pyx_n_s_e,&__pyx_n_s_scores,&__pyx_n_s_a,&__pyx_n_s_text,0};
+    PyObject* values[6] = {0,0,0,0,0,0};
     values[4] = ((PyObject *)Py_None);
+    values[5] = ((PyObject *)Py_None);
     if (unlikely(__pyx_kwds)) {
       Py_ssize_t kw_args;
       const Py_ssize_t pos_args = PyTuple_GET_SIZE(__pyx_args);
       switch (pos_args) {
+        case  6: values[5] = PyTuple_GET_ITEM(__pyx_args, 5);
         case  5: values[4] = PyTuple_GET_ITEM(__pyx_args, 4);
         case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
         case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
@@ -6179,34 +6655,40 @@ static int __pyx_pw_4cdec_5_cdec_5TRule_1__init__(PyObject *__pyx_v_self, PyObje
       kw_args = PyDict_Size(__pyx_kwds);
       switch (pos_args) {
         case  0:
-        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__lhs)) != 0)) kw_args--;
+        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_lhs)) != 0)) kw_args--;
         else goto __pyx_L5_argtuple_error;
         case  1:
-        if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__f)) != 0)) kw_args--;
+        if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_f)) != 0)) kw_args--;
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 0, 4, 5, 1); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+          __Pyx_RaiseArgtupleInvalid("__init__", 0, 4, 6, 1); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
         }
         case  2:
-        if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__e)) != 0)) kw_args--;
+        if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_e)) != 0)) kw_args--;
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 0, 4, 5, 2); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+          __Pyx_RaiseArgtupleInvalid("__init__", 0, 4, 6, 2); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
         }
         case  3:
-        if (likely((values[3] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__scores)) != 0)) kw_args--;
+        if (likely((values[3] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_scores)) != 0)) kw_args--;
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 0, 4, 5, 3); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+          __Pyx_RaiseArgtupleInvalid("__init__", 0, 4, 6, 3); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
         }
         case  4:
         if (kw_args > 0) {
-          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__a);
+          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_a);
           if (value) { values[4] = value; kw_args--; }
         }
+        case  5:
+        if (kw_args > 0) {
+          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_text);
+          if (value) { values[5] = value; kw_args--; }
+        }
       }
       if (unlikely(kw_args > 0)) {
         if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "__init__") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       }
     } else {
       switch (PyTuple_GET_SIZE(__pyx_args)) {
+        case  6: values[5] = PyTuple_GET_ITEM(__pyx_args, 5);
         case  5: values[4] = PyTuple_GET_ITEM(__pyx_args, 4);
         case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
         values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
@@ -6221,36 +6703,40 @@ static int __pyx_pw_4cdec_5_cdec_5TRule_1__init__(PyObject *__pyx_v_self, PyObje
     __pyx_v_e = values[2];
     __pyx_v_scores = values[3];
     __pyx_v_a = values[4];
+    __pyx_v_text = values[5];
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 0, 4, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __Pyx_RaiseArgtupleInvalid("__init__", 0, 4, 6, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   __pyx_L3_error:;
   __Pyx_AddTraceback("cdec._cdec.TRule.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __Pyx_RefNannyFinishContext();
   return -1;
   __pyx_L4_argument_unpacking_done:;
-  __pyx_r = __pyx_pf_4cdec_5_cdec_5TRule___init__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self), __pyx_v_lhs, __pyx_v_f, __pyx_v_e, __pyx_v_scores, __pyx_v_a);
+  __pyx_r = __pyx_pf_4cdec_5_cdec_5TRule___init__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self), __pyx_v_lhs, __pyx_v_f, __pyx_v_e, __pyx_v_scores, __pyx_v_a, __pyx_v_text);
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-static int __pyx_pf_4cdec_5_cdec_5TRule___init__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self, PyObject *__pyx_v_lhs, PyObject *__pyx_v_f, PyObject *__pyx_v_e, PyObject *__pyx_v_scores, PyObject *__pyx_v_a) {
+static int __pyx_pf_4cdec_5_cdec_5TRule___init__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self, PyObject *__pyx_v_lhs, PyObject *__pyx_v_f, PyObject *__pyx_v_e, PyObject *__pyx_v_scores, PyObject *__pyx_v_a, PyObject *__pyx_v_text) {
   int __pyx_r;
   __Pyx_RefNannyDeclarations
   TRule *__pyx_t_1;
   int __pyx_t_2;
+  std::string __pyx_t_3;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":59
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":59
  *         scores: dictionary of feature scores
  *         a: optional list of alignment points"""
  *         self.rule = new shared_ptr[grammar.TRule](new grammar.TRule())             # <<<<<<<<<<<<<<
- *         self.lhs = lhs
- *         self.e = e
+ *         if lhs:
+ *           self.lhs = lhs
  */
   try {
     __pyx_t_1 = new TRule();
@@ -6260,73 +6746,157 @@ static int __pyx_pf_4cdec_5_cdec_5TRule___init__(struct __pyx_obj_4cdec_5_cdec_T
   }
   __pyx_v_self->rule = new boost::shared_ptr<TRule>(__pyx_t_1);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":60
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":60
  *         a: optional list of alignment points"""
  *         self.rule = new shared_ptr[grammar.TRule](new grammar.TRule())
- *         self.lhs = lhs             # <<<<<<<<<<<<<<
- *         self.e = e
- *         self.f = f
+ *         if lhs:             # <<<<<<<<<<<<<<
+ *           self.lhs = lhs
+ *         if e:
  */
-  if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s__lhs, __pyx_v_lhs) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_lhs); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_2) {
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":61
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":61
  *         self.rule = new shared_ptr[grammar.TRule](new grammar.TRule())
- *         self.lhs = lhs
- *         self.e = e             # <<<<<<<<<<<<<<
- *         self.f = f
- *         self.scores = scores
- */
-  if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s__e, __pyx_v_e) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":62
- *         self.lhs = lhs
- *         self.e = e
- *         self.f = f             # <<<<<<<<<<<<<<
- *         self.scores = scores
+ *         if lhs:
+ *           self.lhs = lhs             # <<<<<<<<<<<<<<
+ *         if e:
+ *           self.e = e
+ */
+    if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_lhs, __pyx_v_lhs) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    goto __pyx_L3;
+  }
+  __pyx_L3:;
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":62
+ *         if lhs:
+ *           self.lhs = lhs
+ *         if e:             # <<<<<<<<<<<<<<
+ *           self.e = e
+ *         if f:
+ */
+  __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_e); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_2) {
+
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":63
+ *           self.lhs = lhs
+ *         if e:
+ *           self.e = e             # <<<<<<<<<<<<<<
+ *         if f:
+ *           self.f = f
+ */
+    if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_e, __pyx_v_e) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    goto __pyx_L4;
+  }
+  __pyx_L4:;
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":64
+ *         if e:
+ *           self.e = e
+ *         if f:             # <<<<<<<<<<<<<<
+ *           self.f = f
+ *         if scores:
+ */
+  __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_f); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_2) {
+
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":65
+ *           self.e = e
+ *         if f:
+ *           self.f = f             # <<<<<<<<<<<<<<
+ *         if scores:
+ *           self.scores = scores
+ */
+    if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_f, __pyx_v_f) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    goto __pyx_L5;
+  }
+  __pyx_L5:;
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":66
+ *         if f:
+ *           self.f = f
+ *         if scores:             # <<<<<<<<<<<<<<
+ *           self.scores = scores
  *         if a:
  */
-  if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s__f, __pyx_v_f) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_scores); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_2) {
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":63
- *         self.e = e
- *         self.f = f
- *         self.scores = scores             # <<<<<<<<<<<<<<
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":67
+ *           self.f = f
+ *         if scores:
+ *           self.scores = scores             # <<<<<<<<<<<<<<
  *         if a:
- *             self.a = a
+ *           self.a = a
  */
-  if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s__scores, __pyx_v_scores) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_scores, __pyx_v_scores) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    goto __pyx_L6;
+  }
+  __pyx_L6:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":64
- *         self.f = f
- *         self.scores = scores
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":68
+ *         if scores:
+ *           self.scores = scores
  *         if a:             # <<<<<<<<<<<<<<
- *             self.a = a
- *         self.rule.get().ComputeArity()
+ *           self.a = a
+ *         if text:
  */
-  __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_a); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_a); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_2) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":65
- *         self.scores = scores
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":69
+ *           self.scores = scores
+ *         if a:
+ *           self.a = a             # <<<<<<<<<<<<<<
+ *         if text:
+ *           self.rule.get().ReadFromString(text, 0)
+ */
+    if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_a, __pyx_v_a) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    goto __pyx_L7;
+  }
+  __pyx_L7:;
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":70
  *         if a:
- *             self.a = a             # <<<<<<<<<<<<<<
+ *           self.a = a
+ *         if text:             # <<<<<<<<<<<<<<
+ *           self.rule.get().ReadFromString(text, 0)
+ *         self.rule.get().ComputeArity()
+ */
+  __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_text); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_2) {
+
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":71
+ *           self.a = a
+ *         if text:
+ *           self.rule.get().ReadFromString(text, 0)             # <<<<<<<<<<<<<<
  *         self.rule.get().ComputeArity()
  * 
  */
-    if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s__a, __pyx_v_a) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    goto __pyx_L3;
+    __pyx_t_3 = __pyx_convert_string_from_py_(__pyx_v_text); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_v_self->rule->get()->ReadFromString(__pyx_t_3, 0);
+    goto __pyx_L8;
   }
-  __pyx_L3:;
+  __pyx_L8:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":66
- *         if a:
- *             self.a = a
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":72
+ *         if text:
+ *           self.rule.get().ReadFromString(text, 0)
  *         self.rule.get().ComputeArity()             # <<<<<<<<<<<<<<
  * 
  *     def __dealloc__(self):
  */
   __pyx_v_self->rule->get()->ComputeArity();
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":52
+ *     cdef shared_ptr[grammar.TRule]* rule
+ * 
+ *     def __init__(self, lhs, f, e, scores, a=None, text=None):             # <<<<<<<<<<<<<<
+ *         """TRule(lhs, f, e, scores, a=None) -> Translation rule.
+ *         lhs: left hand side non-terminal
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -6337,28 +6907,30 @@ static int __pyx_pf_4cdec_5_cdec_5TRule___init__(struct __pyx_obj_4cdec_5_cdec_T
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":74
+ *         self.rule.get().ComputeArity()
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.rule
+ * 
+ */
+
 /* Python wrapper */
 static void __pyx_pw_4cdec_5_cdec_5TRule_3__dealloc__(PyObject *__pyx_v_self); /*proto*/
 static void __pyx_pw_4cdec_5_cdec_5TRule_3__dealloc__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__ (wrapper)", 0);
   __pyx_pf_4cdec_5_cdec_5TRule_2__dealloc__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":68
- *         self.rule.get().ComputeArity()
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         del self.rule
- * 
- */
-
-static void __pyx_pf_4cdec_5_cdec_5TRule_2__dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self) {
+static void __pyx_pf_4cdec_5_cdec_5TRule_2__dealloc__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":69
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":75
  * 
  *     def __dealloc__(self):
  *         del self.rule             # <<<<<<<<<<<<<<
@@ -6367,9 +6939,26 @@ static void __pyx_pf_4cdec_5_cdec_5TRule_2__dealloc__(CYTHON_UNUSED struct __pyx
  */
   delete __pyx_v_self->rule;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":74
+ *         self.rule.get().ComputeArity()
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.rule
+ * 
+ */
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":78
+ * 
+ *     property arity:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return self.rule.get().arity_
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_5arity_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_5arity_1__get__(PyObject *__pyx_v_self) {
@@ -6377,18 +6966,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_5arity_1__get__(PyObject *__pyx_v_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5TRule_5arity___get__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":72
- * 
- *     property arity:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             return self.rule.get().arity_
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_5arity___get__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -6398,7 +6981,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_5arity___get__(struct __pyx_obj_4c
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":73
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":79
  *     property arity:
  *         def __get__(self):
  *             return self.rule.get().arity_             # <<<<<<<<<<<<<<
@@ -6406,14 +6989,21 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_5arity___get__(struct __pyx_obj_4c
  *     property f:
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = PyInt_FromLong(__pyx_v_self->rule->get()->arity_); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_From_int(__pyx_v_self->rule->get()->arity_); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":78
+ * 
+ *     property arity:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return self.rule.get().arity_
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.TRule.arity.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -6424,6 +7014,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_5arity___get__(struct __pyx_obj_4c
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":82
+ * 
+ *     property f:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef vector[WordID]* f_ = &self.rule.get().f_
+ *             cdef WordID w
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_1f_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_1f_1__get__(PyObject *__pyx_v_self) {
@@ -6431,18 +7029,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_1f_1__get__(PyObject *__pyx_v_self
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5TRule_1f___get__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":76
- * 
- *     property f:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef vector[WordID]* f_ = &self.rule.get().f_
- *             cdef WordID w
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1f___get__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self) {
   std::vector<WordID> *__pyx_v_f_;
   WordID __pyx_v_w;
@@ -6457,12 +7049,13 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1f___get__(struct __pyx_obj_4cdec_
   int __pyx_t_4;
   PyObject *__pyx_t_5 = NULL;
   PyObject *__pyx_t_6 = NULL;
+  int __pyx_t_7;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":77
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":83
  *     property f:
  *         def __get__(self):
  *             cdef vector[WordID]* f_ = &self.rule.get().f_             # <<<<<<<<<<<<<<
@@ -6471,19 +7064,19 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1f___get__(struct __pyx_obj_4cdec_
  */
   __pyx_v_f_ = (&__pyx_v_self->rule->get()->f_);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":79
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":85
  *             cdef vector[WordID]* f_ = &self.rule.get().f_
  *             cdef WordID w
  *             cdef f = []             # <<<<<<<<<<<<<<
  *             cdef unsigned i
  *             cdef int idx = 0
  */
-  __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_v_f = ((PyObject *)__pyx_t_1);
+  __pyx_v_f = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":81
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":87
  *             cdef f = []
  *             cdef unsigned i
  *             cdef int idx = 0             # <<<<<<<<<<<<<<
@@ -6492,7 +7085,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1f___get__(struct __pyx_obj_4cdec_
  */
   __pyx_v_idx = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":82
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":88
  *             cdef unsigned i
  *             cdef int idx = 0
  *             for i in range(f_.size()):             # <<<<<<<<<<<<<<
@@ -6503,7 +7096,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1f___get__(struct __pyx_obj_4cdec_
   for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {
     __pyx_v_i = __pyx_t_3;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":83
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":89
  *             cdef int idx = 0
  *             for i in range(f_.size()):
  *                 w = f_[0][i]             # <<<<<<<<<<<<<<
@@ -6512,7 +7105,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1f___get__(struct __pyx_obj_4cdec_
  */
     __pyx_v_w = ((__pyx_v_f_[0])[__pyx_v_i]);
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":84
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":90
  *             for i in range(f_.size()):
  *                 w = f_[0][i]
  *                 if w < 0:             # <<<<<<<<<<<<<<
@@ -6522,7 +7115,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1f___get__(struct __pyx_obj_4cdec_
     __pyx_t_4 = ((__pyx_v_w < 0) != 0);
     if (__pyx_t_4) {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":85
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":91
  *                 w = f_[0][i]
  *                 if w < 0:
  *                     idx += 1             # <<<<<<<<<<<<<<
@@ -6531,66 +7124,62 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1f___get__(struct __pyx_obj_4cdec_
  */
       __pyx_v_idx = (__pyx_v_idx + 1);
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":86
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":92
  *                 if w < 0:
  *                     idx += 1
  *                     f.append(NT(TDConvert(-w).c_str(), idx))             # <<<<<<<<<<<<<<
  *                 else:
  *                     f.append(unicode(TDConvert(w).c_str(), encoding='utf8'))
  */
-      __pyx_t_1 = __Pyx_PyBytes_FromString(TD::Convert((-__pyx_v_w)).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_1));
-      __pyx_t_5 = PyInt_FromLong(__pyx_v_idx); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_1 = __Pyx_PyBytes_FromString(TD::Convert((-__pyx_v_w)).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_1);
+      __pyx_t_5 = __Pyx_PyInt_From_int(__pyx_v_idx); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_5);
-      __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_6);
-      PyTuple_SET_ITEM(__pyx_t_6, 0, ((PyObject *)__pyx_t_1));
-      __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+      PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_1);
+      __Pyx_GIVEREF(__pyx_t_1);
       PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_5);
       __Pyx_GIVEREF(__pyx_t_5);
       __pyx_t_1 = 0;
       __pyx_t_5 = 0;
-      __pyx_t_5 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_NT)), ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_5 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_NT)), __pyx_t_6, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_5);
-      __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0;
-      __pyx_t_6 = __Pyx_PyObject_Append(__pyx_v_f, __pyx_t_5); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(__pyx_t_6);
-      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+      __pyx_t_7 = __Pyx_PyObject_Append(__pyx_v_f, __pyx_t_5); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       goto __pyx_L5;
     }
     /*else*/ {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":88
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":94
  *                     f.append(NT(TDConvert(-w).c_str(), idx))
  *                 else:
  *                     f.append(unicode(TDConvert(w).c_str(), encoding='utf8'))             # <<<<<<<<<<<<<<
  *             return f
  * 
  */
-      __pyx_t_6 = __Pyx_PyBytes_FromString(TD::Convert(__pyx_v_w).c_str()); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_6));
-      __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_5 = __Pyx_PyBytes_FromString(TD::Convert(__pyx_v_w).c_str()); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_5);
-      PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_t_6));
-      __Pyx_GIVEREF(((PyObject *)__pyx_t_6));
-      __pyx_t_6 = 0;
-      __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_6));
-      if (PyDict_SetItem(__pyx_t_6, ((PyObject *)__pyx_n_s__encoding), ((PyObject *)__pyx_n_s__utf8)) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), ((PyObject *)__pyx_t_5), ((PyObject *)__pyx_t_6)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(__pyx_t_1);
-      __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
-      __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0;
-      __pyx_t_6 = __Pyx_PyObject_Append(__pyx_v_f, __pyx_t_1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_6);
-      __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+      PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_5);
+      __Pyx_GIVEREF(__pyx_t_5);
+      __pyx_t_5 = 0;
+      __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_5);
+      if (PyDict_SetItem(__pyx_t_5, __pyx_n_s_encoding, __pyx_n_s_utf8) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), __pyx_t_6, __pyx_t_5); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_1);
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+      __pyx_t_7 = __Pyx_PyObject_Append(__pyx_v_f, __pyx_t_1); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     }
     __pyx_L5:;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":89
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":95
  *                 else:
  *                     f.append(unicode(TDConvert(w).c_str(), encoding='utf8'))
  *             return f             # <<<<<<<<<<<<<<
@@ -6602,8 +7191,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1f___get__(struct __pyx_obj_4cdec_
   __pyx_r = __pyx_v_f;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":82
+ * 
+ *     property f:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef vector[WordID]* f_ = &self.rule.get().f_
+ *             cdef WordID w
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_5);
@@ -6617,6 +7213,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1f___get__(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":97
+ *             return f
+ * 
+ *         def __set__(self, f):             # <<<<<<<<<<<<<<
+ *             cdef vector[WordID]* f_ = &self.rule.get().f_
+ *             f_.resize(len(f))
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_5TRule_1f_3__set__(PyObject *__pyx_v_self, PyObject *__pyx_v_f); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_5TRule_1f_3__set__(PyObject *__pyx_v_self, PyObject *__pyx_v_f) {
@@ -6624,18 +7228,12 @@ static int __pyx_pw_4cdec_5_cdec_5TRule_1f_3__set__(PyObject *__pyx_v_self, PyOb
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__set__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5TRule_1f_2__set__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self), ((PyObject *)__pyx_v_f));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":91
- *             return f
- * 
- *         def __set__(self, f):             # <<<<<<<<<<<<<<
- *             cdef vector[WordID]* f_ = &self.rule.get().f_
- *             f_.resize(len(f))
- */
-
 static int __pyx_pf_4cdec_5_cdec_5TRule_1f_2__set__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self, PyObject *__pyx_v_f) {
   std::vector<WordID> *__pyx_v_f_;
   unsigned int __pyx_v_i;
@@ -6655,7 +7253,7 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1f_2__set__(struct __pyx_obj_4cdec_5_cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__set__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":92
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":98
  * 
  *         def __set__(self, f):
  *             cdef vector[WordID]* f_ = &self.rule.get().f_             # <<<<<<<<<<<<<<
@@ -6664,17 +7262,17 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1f_2__set__(struct __pyx_obj_4cdec_5_cde
  */
   __pyx_v_f_ = (&__pyx_v_self->rule->get()->f_);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":93
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":99
  *         def __set__(self, f):
  *             cdef vector[WordID]* f_ = &self.rule.get().f_
  *             f_.resize(len(f))             # <<<<<<<<<<<<<<
  *             cdef unsigned i
  *             cdef int idx = 0
  */
-  __pyx_t_1 = PyObject_Length(__pyx_v_f); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = PyObject_Length(__pyx_v_f); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_f_->resize(__pyx_t_1);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":95
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":101
  *             f_.resize(len(f))
  *             cdef unsigned i
  *             cdef int idx = 0             # <<<<<<<<<<<<<<
@@ -6683,76 +7281,84 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1f_2__set__(struct __pyx_obj_4cdec_5_cde
  */
   __pyx_v_idx = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":96
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":102
  *             cdef unsigned i
  *             cdef int idx = 0
  *             for i in range(len(f)):             # <<<<<<<<<<<<<<
  *                 if isinstance(f[i], NT):
  *                     f_[0][i] = -TDConvert((<NT> f[i]).cat)
  */
-  __pyx_t_1 = PyObject_Length(__pyx_v_f); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = PyObject_Length(__pyx_v_f); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_v_i = __pyx_t_2;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":97
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":103
  *             cdef int idx = 0
  *             for i in range(len(f)):
  *                 if isinstance(f[i], NT):             # <<<<<<<<<<<<<<
  *                     f_[0][i] = -TDConvert((<NT> f[i]).cat)
  *                 else:
  */
-    __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_f, __pyx_v_i, sizeof(unsigned int)+1, PyLong_FromUnsignedLong, 0, 0, 1); if (!__pyx_t_3) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_f, __pyx_v_i, unsigned int, 0, __Pyx_PyInt_From_unsigned_int, 0, 0, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
     __Pyx_GOTREF(__pyx_t_3);
     __pyx_t_4 = __Pyx_TypeCheck(__pyx_t_3, ((PyObject*)__pyx_ptype_4cdec_5_cdec_NT)); 
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __pyx_t_5 = (__pyx_t_4 != 0);
     if (__pyx_t_5) {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":98
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":104
  *             for i in range(len(f)):
  *                 if isinstance(f[i], NT):
  *                     f_[0][i] = -TDConvert((<NT> f[i]).cat)             # <<<<<<<<<<<<<<
  *                 else:
  *                     fi = as_str(f[i])
  */
-      __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_f, __pyx_v_i, sizeof(unsigned int)+1, PyLong_FromUnsignedLong, 0, 0, 1); if (!__pyx_t_3) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_f, __pyx_v_i, unsigned int, 0, __Pyx_PyInt_From_unsigned_int, 0, 0, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
       __Pyx_GOTREF(__pyx_t_3);
-      __pyx_t_6 = __Pyx_PyObject_AsString(((PyObject *)((struct __pyx_obj_4cdec_5_cdec_NT *)__pyx_t_3)->cat)); if (unlikely((!__pyx_t_6) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = __Pyx_PyObject_AsString(((struct __pyx_obj_4cdec_5_cdec_NT *)__pyx_t_3)->cat); if (unlikely((!__pyx_t_6) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
       ((__pyx_v_f_[0])[__pyx_v_i]) = (-TD::Convert(__pyx_t_6));
       goto __pyx_L5;
     }
     /*else*/ {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":100
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":106
  *                     f_[0][i] = -TDConvert((<NT> f[i]).cat)
  *                 else:
  *                     fi = as_str(f[i])             # <<<<<<<<<<<<<<
  *                     f_[0][i] = TDConvert(fi)
  * 
  */
-      __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_f, __pyx_v_i, sizeof(unsigned int)+1, PyLong_FromUnsignedLong, 0, 0, 1); if (!__pyx_t_3) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_f, __pyx_v_i, unsigned int, 0, __Pyx_PyInt_From_unsigned_int, 0, 0, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
       __Pyx_GOTREF(__pyx_t_3);
-      __pyx_t_7 = ((PyObject *)__pyx_f_4cdec_5_cdec_as_str(__pyx_t_3, NULL)); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_7 = __pyx_f_4cdec_5_cdec_as_str(__pyx_t_3, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_7);
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-      __Pyx_XDECREF(((PyObject *)__pyx_v_fi));
-      __pyx_v_fi = ((PyObject*)__pyx_t_7);
+      __Pyx_XDECREF_SET(__pyx_v_fi, ((PyObject*)__pyx_t_7));
       __pyx_t_7 = 0;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":101
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":107
  *                 else:
  *                     fi = as_str(f[i])
  *                     f_[0][i] = TDConvert(fi)             # <<<<<<<<<<<<<<
  * 
  *     property e:
  */
-      __pyx_t_6 = __Pyx_PyObject_AsString(((PyObject *)__pyx_v_fi)); if (unlikely((!__pyx_t_6) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = __Pyx_PyObject_AsString(__pyx_v_fi); if (unlikely((!__pyx_t_6) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       ((__pyx_v_f_[0])[__pyx_v_i]) = TD::Convert(__pyx_t_6);
     }
     __pyx_L5:;
   }
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":97
+ *             return f
+ * 
+ *         def __set__(self, f):             # <<<<<<<<<<<<<<
+ *             cdef vector[WordID]* f_ = &self.rule.get().f_
+ *             f_.resize(len(f))
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -6766,6 +7372,14 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1f_2__set__(struct __pyx_obj_4cdec_5_cde
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":110
+ * 
+ *     property e:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef vector[WordID]* e_ = &self.rule.get().e_
+ *             cdef WordID w
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_1e_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_1e_1__get__(PyObject *__pyx_v_self) {
@@ -6773,18 +7387,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_1e_1__get__(PyObject *__pyx_v_self
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5TRule_1e___get__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":104
- * 
- *     property e:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef vector[WordID]* e_ = &self.rule.get().e_
- *             cdef WordID w
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1e___get__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self) {
   std::vector<WordID> *__pyx_v_e_;
   WordID __pyx_v_w;
@@ -6798,13 +7406,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1e___get__(struct __pyx_obj_4cdec_
   unsigned int __pyx_t_3;
   int __pyx_t_4;
   PyObject *__pyx_t_5 = NULL;
-  PyObject *__pyx_t_6 = NULL;
+  int __pyx_t_6;
+  PyObject *__pyx_t_7 = NULL;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":105
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":111
  *     property e:
  *         def __get__(self):
  *             cdef vector[WordID]* e_ = &self.rule.get().e_             # <<<<<<<<<<<<<<
@@ -6813,19 +7422,19 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1e___get__(struct __pyx_obj_4cdec_
  */
   __pyx_v_e_ = (&__pyx_v_self->rule->get()->e_);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":107
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":113
  *             cdef vector[WordID]* e_ = &self.rule.get().e_
  *             cdef WordID w
  *             cdef e = []             # <<<<<<<<<<<<<<
  *             cdef unsigned i
  *             cdef int idx = 0
  */
-  __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_v_e = ((PyObject *)__pyx_t_1);
+  __pyx_v_e = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":109
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":115
  *             cdef e = []
  *             cdef unsigned i
  *             cdef int idx = 0             # <<<<<<<<<<<<<<
@@ -6834,7 +7443,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1e___get__(struct __pyx_obj_4cdec_
  */
   __pyx_v_idx = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":110
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":116
  *             cdef unsigned i
  *             cdef int idx = 0
  *             for i in range(e_.size()):             # <<<<<<<<<<<<<<
@@ -6845,7 +7454,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1e___get__(struct __pyx_obj_4cdec_
   for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {
     __pyx_v_i = __pyx_t_3;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":111
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":117
  *             cdef int idx = 0
  *             for i in range(e_.size()):
  *                 w = e_[0][i]             # <<<<<<<<<<<<<<
@@ -6854,7 +7463,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1e___get__(struct __pyx_obj_4cdec_
  */
     __pyx_v_w = ((__pyx_v_e_[0])[__pyx_v_i]);
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":112
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":118
  *             for i in range(e_.size()):
  *                 w = e_[0][i]
  *                 if w < 1:             # <<<<<<<<<<<<<<
@@ -6864,7 +7473,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1e___get__(struct __pyx_obj_4cdec_
     __pyx_t_4 = ((__pyx_v_w < 1) != 0);
     if (__pyx_t_4) {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":113
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":119
  *                 w = e_[0][i]
  *                 if w < 1:
  *                     idx += 1             # <<<<<<<<<<<<<<
@@ -6873,61 +7482,57 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1e___get__(struct __pyx_obj_4cdec_
  */
       __pyx_v_idx = (__pyx_v_idx + 1);
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":114
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":120
  *                 if w < 1:
  *                     idx += 1
  *                     e.append(NTRef(1-w))             # <<<<<<<<<<<<<<
  *                 else:
  *                     e.append(unicode(TDConvert(w).c_str(), encoding='utf8'))
  */
-      __pyx_t_1 = PyInt_FromLong((1 - __pyx_v_w)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_1 = __Pyx_PyInt_From_long((1 - __pyx_v_w)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_1);
-      __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_5);
       PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1);
       __Pyx_GIVEREF(__pyx_t_1);
       __pyx_t_1 = 0;
-      __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_NTRef)), ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_NTRef)), __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_1);
-      __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
-      __pyx_t_5 = __Pyx_PyObject_Append(__pyx_v_e, __pyx_t_1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(__pyx_t_5);
-      __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
       __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+      __pyx_t_6 = __Pyx_PyObject_Append(__pyx_v_e, __pyx_t_1); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
       goto __pyx_L5;
     }
     /*else*/ {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":116
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":122
  *                     e.append(NTRef(1-w))
  *                 else:
  *                     e.append(unicode(TDConvert(w).c_str(), encoding='utf8'))             # <<<<<<<<<<<<<<
  *             return e
  * 
  */
-      __pyx_t_5 = __Pyx_PyBytes_FromString(TD::Convert(__pyx_v_w).c_str()); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_5));
-      __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_1 = __Pyx_PyBytes_FromString(TD::Convert(__pyx_v_w).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_1);
-      PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_t_5));
-      __Pyx_GIVEREF(((PyObject *)__pyx_t_5));
-      __pyx_t_5 = 0;
-      __pyx_t_5 = PyDict_New(); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_5));
-      if (PyDict_SetItem(__pyx_t_5, ((PyObject *)__pyx_n_s__encoding), ((PyObject *)__pyx_n_s__utf8)) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_6 = PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), ((PyObject *)__pyx_t_1), ((PyObject *)__pyx_t_5)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(__pyx_t_6);
-      __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
-      __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
-      __pyx_t_5 = __Pyx_PyObject_Append(__pyx_v_e, __pyx_t_6); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_5);
-      __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+      PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1);
+      __Pyx_GIVEREF(__pyx_t_1);
+      __pyx_t_1 = 0;
+      __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_1);
+      if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_encoding, __pyx_n_s_utf8) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_7 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), __pyx_t_5, __pyx_t_1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_7);
       __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+      __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+      __pyx_t_6 = __Pyx_PyObject_Append(__pyx_v_e, __pyx_t_7); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
     }
     __pyx_L5:;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":117
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":123
  *                 else:
  *                     e.append(unicode(TDConvert(w).c_str(), encoding='utf8'))
  *             return e             # <<<<<<<<<<<<<<
@@ -6939,12 +7544,19 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1e___get__(struct __pyx_obj_4cdec_
   __pyx_r = __pyx_v_e;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":110
+ * 
+ *     property e:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef vector[WordID]* e_ = &self.rule.get().e_
+ *             cdef WordID w
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_5);
-  __Pyx_XDECREF(__pyx_t_6);
+  __Pyx_XDECREF(__pyx_t_7);
   __Pyx_AddTraceback("cdec._cdec.TRule.e.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = NULL;
   __pyx_L0:;
@@ -6954,6 +7566,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1e___get__(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":125
+ *             return e
+ * 
+ *         def __set__(self, e):             # <<<<<<<<<<<<<<
+ *             cdef vector[WordID]* e_ = &self.rule.get().e_
+ *             e_.resize(len(e))
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_5TRule_1e_3__set__(PyObject *__pyx_v_self, PyObject *__pyx_v_e); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_5TRule_1e_3__set__(PyObject *__pyx_v_self, PyObject *__pyx_v_e) {
@@ -6961,18 +7581,12 @@ static int __pyx_pw_4cdec_5_cdec_5TRule_1e_3__set__(PyObject *__pyx_v_self, PyOb
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__set__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5TRule_1e_2__set__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self), ((PyObject *)__pyx_v_e));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":119
- *             return e
- * 
- *         def __set__(self, e):             # <<<<<<<<<<<<<<
- *             cdef vector[WordID]* e_ = &self.rule.get().e_
- *             e_.resize(len(e))
- */
-
 static int __pyx_pf_4cdec_5_cdec_5TRule_1e_2__set__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self, PyObject *__pyx_v_e) {
   std::vector<WordID> *__pyx_v_e_;
   unsigned int __pyx_v_i;
@@ -6992,7 +7606,7 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1e_2__set__(struct __pyx_obj_4cdec_5_cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__set__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":120
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":126
  * 
  *         def __set__(self, e):
  *             cdef vector[WordID]* e_ = &self.rule.get().e_             # <<<<<<<<<<<<<<
@@ -7001,92 +7615,100 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1e_2__set__(struct __pyx_obj_4cdec_5_cde
  */
   __pyx_v_e_ = (&__pyx_v_self->rule->get()->e_);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":121
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":127
  *         def __set__(self, e):
  *             cdef vector[WordID]* e_ = &self.rule.get().e_
  *             e_.resize(len(e))             # <<<<<<<<<<<<<<
  *             cdef unsigned i
  *             for i in range(len(e)):
  */
-  __pyx_t_1 = PyObject_Length(__pyx_v_e); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = PyObject_Length(__pyx_v_e); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_e_->resize(__pyx_t_1);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":123
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":129
  *             e_.resize(len(e))
  *             cdef unsigned i
  *             for i in range(len(e)):             # <<<<<<<<<<<<<<
  *                 if isinstance(e[i], NTRef):
  *                     e_[0][i] = 1-e[i].ref
  */
-  __pyx_t_1 = PyObject_Length(__pyx_v_e); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 123; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = PyObject_Length(__pyx_v_e); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 129; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_v_i = __pyx_t_2;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":124
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":130
  *             cdef unsigned i
  *             for i in range(len(e)):
  *                 if isinstance(e[i], NTRef):             # <<<<<<<<<<<<<<
  *                     e_[0][i] = 1-e[i].ref
  *                 else:
  */
-    __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_e, __pyx_v_i, sizeof(unsigned int)+1, PyLong_FromUnsignedLong, 0, 0, 1); if (!__pyx_t_3) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_e, __pyx_v_i, unsigned int, 0, __Pyx_PyInt_From_unsigned_int, 0, 0, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
     __Pyx_GOTREF(__pyx_t_3);
     __pyx_t_4 = __Pyx_TypeCheck(__pyx_t_3, ((PyObject*)__pyx_ptype_4cdec_5_cdec_NTRef)); 
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __pyx_t_5 = (__pyx_t_4 != 0);
     if (__pyx_t_5) {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":125
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":131
  *             for i in range(len(e)):
  *                 if isinstance(e[i], NTRef):
  *                     e_[0][i] = 1-e[i].ref             # <<<<<<<<<<<<<<
  *                 else:
  *                     ei = as_str(e[i])
  */
-      __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_e, __pyx_v_i, sizeof(unsigned int)+1, PyLong_FromUnsignedLong, 0, 0, 1); if (!__pyx_t_3) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_e, __pyx_v_i, unsigned int, 0, __Pyx_PyInt_From_unsigned_int, 0, 0, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
       __Pyx_GOTREF(__pyx_t_3);
-      __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s__ref); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_ref); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_6);
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-      __pyx_t_3 = PyNumber_Subtract(__pyx_int_1, __pyx_t_6); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_3 = PyNumber_Subtract(__pyx_int_1, __pyx_t_6); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-      __pyx_t_7 = __Pyx_PyInt_from_py_WordID(__pyx_t_3); if (unlikely((__pyx_t_7 == (WordID)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_7 = __Pyx_PyInt_As_WordID(__pyx_t_3); if (unlikely((__pyx_t_7 == (WordID)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
       ((__pyx_v_e_[0])[__pyx_v_i]) = __pyx_t_7;
       goto __pyx_L5;
     }
     /*else*/ {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":127
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":133
  *                     e_[0][i] = 1-e[i].ref
  *                 else:
  *                     ei = as_str(e[i])             # <<<<<<<<<<<<<<
  *                     e_[0][i] = TDConvert(ei)
  * 
  */
-      __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_e, __pyx_v_i, sizeof(unsigned int)+1, PyLong_FromUnsignedLong, 0, 0, 1); if (!__pyx_t_3) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_e, __pyx_v_i, unsigned int, 0, __Pyx_PyInt_From_unsigned_int, 0, 0, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
       __Pyx_GOTREF(__pyx_t_3);
-      __pyx_t_6 = ((PyObject *)__pyx_f_4cdec_5_cdec_as_str(__pyx_t_3, NULL)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = __pyx_f_4cdec_5_cdec_as_str(__pyx_t_3, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_6);
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-      __Pyx_XDECREF(((PyObject *)__pyx_v_ei));
-      __pyx_v_ei = ((PyObject*)__pyx_t_6);
+      __Pyx_XDECREF_SET(__pyx_v_ei, ((PyObject*)__pyx_t_6));
       __pyx_t_6 = 0;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":128
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":134
  *                 else:
  *                     ei = as_str(e[i])
  *                     e_[0][i] = TDConvert(ei)             # <<<<<<<<<<<<<<
  * 
  *     property a:
  */
-      __pyx_t_8 = __Pyx_PyObject_AsString(((PyObject *)__pyx_v_ei)); if (unlikely((!__pyx_t_8) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_8 = __Pyx_PyObject_AsString(__pyx_v_ei); if (unlikely((!__pyx_t_8) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       ((__pyx_v_e_[0])[__pyx_v_i]) = TD::Convert(__pyx_t_8);
     }
     __pyx_L5:;
   }
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":125
+ *             return e
+ * 
+ *         def __set__(self, e):             # <<<<<<<<<<<<<<
+ *             cdef vector[WordID]* e_ = &self.rule.get().e_
+ *             e_.resize(len(e))
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -7101,6 +7723,14 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1e_2__set__(struct __pyx_obj_4cdec_5_cde
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_5TRule_1a_2generator2(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":137
+ * 
+ *     property a:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             cdef vector[grammar.AlignmentPoint]* a = &self.rule.get().a_
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_1a_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_1a_1__get__(PyObject *__pyx_v_self) {
@@ -7108,18 +7738,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_1a_1__get__(PyObject *__pyx_v_self
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5TRule_1a___get__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":131
- * 
- *     property a:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef unsigned i
- *             cdef vector[grammar.AlignmentPoint]* a = &self.rule.get().a_
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1a___get__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -7138,12 +7762,13 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_1a___get__(struct __pyx_obj_4cdec_
   __Pyx_INCREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
   __Pyx_GIVEREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
   {
-    __pyx_GeneratorObject *gen = __Pyx_Generator_New((__pyx_generator_body_t) __pyx_gb_4cdec_5_cdec_5TRule_1a_2generator2, (PyObject *) __pyx_cur_scope); if (unlikely(!gen)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_GeneratorObject *gen = __Pyx_Generator_New((__pyx_generator_body_t) __pyx_gb_4cdec_5_cdec_5TRule_1a_2generator2, (PyObject *) __pyx_cur_scope); if (unlikely(!gen)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_cur_scope);
     __Pyx_RefNannyFinishContext();
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -7178,9 +7803,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_5TRule_1a_2generator2(__pyx_GeneratorObje
     return NULL;
   }
   __pyx_L3_first_run:;
-  if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":133
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":139
  *         def __get__(self):
  *             cdef unsigned i
  *             cdef vector[grammar.AlignmentPoint]* a = &self.rule.get().a_             # <<<<<<<<<<<<<<
@@ -7189,7 +7814,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_5TRule_1a_2generator2(__pyx_GeneratorObje
  */
   __pyx_cur_scope->__pyx_v_a = (&__pyx_cur_scope->__pyx_v_self->rule->get()->a_);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":134
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":140
  *             cdef unsigned i
  *             cdef vector[grammar.AlignmentPoint]* a = &self.rule.get().a_
  *             for i in range(a.size()):             # <<<<<<<<<<<<<<
@@ -7200,18 +7825,18 @@ static PyObject *__pyx_gb_4cdec_5_cdec_5TRule_1a_2generator2(__pyx_GeneratorObje
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_2;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":135
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":141
  *             cdef vector[grammar.AlignmentPoint]* a = &self.rule.get().a_
  *             for i in range(a.size()):
  *                 yield (a[0][i].s_, a[0][i].t_)             # <<<<<<<<<<<<<<
  * 
  *         def __set__(self, a):
  */
-    __pyx_t_3 = PyInt_FromLong(((__pyx_cur_scope->__pyx_v_a[0])[__pyx_cur_scope->__pyx_v_i]).s_); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyInt_From_short(((__pyx_cur_scope->__pyx_v_a[0])[__pyx_cur_scope->__pyx_v_i]).s_); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_4 = PyInt_FromLong(((__pyx_cur_scope->__pyx_v_a[0])[__pyx_cur_scope->__pyx_v_i]).t_); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyInt_From_short(((__pyx_cur_scope->__pyx_v_a[0])[__pyx_cur_scope->__pyx_v_i]).t_); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
-    __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
     PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3);
     __Pyx_GIVEREF(__pyx_t_3);
@@ -7219,7 +7844,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_5TRule_1a_2generator2(__pyx_GeneratorObje
     __Pyx_GIVEREF(__pyx_t_4);
     __pyx_t_3 = 0;
     __pyx_t_4 = 0;
-    __pyx_r = ((PyObject *)__pyx_t_5);
+    __pyx_r = __pyx_t_5;
     __pyx_t_5 = 0;
     __pyx_cur_scope->__pyx_t_0 = __pyx_t_1;
     __pyx_cur_scope->__pyx_t_1 = __pyx_t_2;
@@ -7231,8 +7856,18 @@ static PyObject *__pyx_gb_4cdec_5_cdec_5TRule_1a_2generator2(__pyx_GeneratorObje
     __pyx_L6_resume_from_yield:;
     __pyx_t_1 = __pyx_cur_scope->__pyx_t_0;
     __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
-    if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":137
+ * 
+ *     property a:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             cdef vector[grammar.AlignmentPoint]* a = &self.rule.get().a_
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -7248,6 +7883,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_5TRule_1a_2generator2(__pyx_GeneratorObje
   return NULL;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":143
+ *                 yield (a[0][i].s_, a[0][i].t_)
+ * 
+ *         def __set__(self, a):             # <<<<<<<<<<<<<<
+ *             cdef vector[grammar.AlignmentPoint]* a_ = &self.rule.get().a_
+ *             a_.resize(len(a))
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_5TRule_1a_4__set__(PyObject *__pyx_v_self, PyObject *__pyx_v_a); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_5TRule_1a_4__set__(PyObject *__pyx_v_self, PyObject *__pyx_v_a) {
@@ -7255,18 +7898,12 @@ static int __pyx_pw_4cdec_5_cdec_5TRule_1a_4__set__(PyObject *__pyx_v_self, PyOb
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__set__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5TRule_1a_3__set__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self), ((PyObject *)__pyx_v_a));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":137
- *                 yield (a[0][i].s_, a[0][i].t_)
- * 
- *         def __set__(self, a):             # <<<<<<<<<<<<<<
- *             cdef vector[grammar.AlignmentPoint]* a_ = &self.rule.get().a_
- *             a_.resize(len(a))
- */
-
 static int __pyx_pf_4cdec_5_cdec_5TRule_1a_3__set__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self, PyObject *__pyx_v_a) {
   std::vector<AlignmentPoint> *__pyx_v_a_;
   unsigned int __pyx_v_i;
@@ -7288,7 +7925,7 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1a_3__set__(struct __pyx_obj_4cdec_5_cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__set__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":138
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":144
  * 
  *         def __set__(self, a):
  *             cdef vector[grammar.AlignmentPoint]* a_ = &self.rule.get().a_             # <<<<<<<<<<<<<<
@@ -7297,35 +7934,35 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1a_3__set__(struct __pyx_obj_4cdec_5_cde
  */
   __pyx_v_a_ = (&__pyx_v_self->rule->get()->a_);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":139
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":145
  *         def __set__(self, a):
  *             cdef vector[grammar.AlignmentPoint]* a_ = &self.rule.get().a_
  *             a_.resize(len(a))             # <<<<<<<<<<<<<<
  *             cdef unsigned i
  *             cdef int s, t
  */
-  __pyx_t_1 = PyObject_Length(__pyx_v_a); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = PyObject_Length(__pyx_v_a); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_a_->resize(__pyx_t_1);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":142
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":148
  *             cdef unsigned i
  *             cdef int s, t
  *             for i in range(len(a)):             # <<<<<<<<<<<<<<
  *                 s, t = a[i]
  *                 a_[0][i] = grammar.AlignmentPoint(s, t)
  */
-  __pyx_t_1 = PyObject_Length(__pyx_v_a); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = PyObject_Length(__pyx_v_a); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_v_i = __pyx_t_2;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":143
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":149
  *             cdef int s, t
  *             for i in range(len(a)):
  *                 s, t = a[i]             # <<<<<<<<<<<<<<
  *                 a_[0][i] = grammar.AlignmentPoint(s, t)
  * 
  */
-    __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_a, __pyx_v_i, sizeof(unsigned int)+1, PyLong_FromUnsignedLong, 0, 0, 1); if (!__pyx_t_3) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_GetItemInt(__pyx_v_a, __pyx_v_i, unsigned int, 0, __Pyx_PyInt_From_unsigned_int, 0, 0, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
     __Pyx_GOTREF(__pyx_t_3);
     if ((likely(PyTuple_CheckExact(__pyx_t_3))) || (PyList_CheckExact(__pyx_t_3))) {
       PyObject* sequence = __pyx_t_3;
@@ -7337,7 +7974,7 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1a_3__set__(struct __pyx_obj_4cdec_5_cde
       if (unlikely(size != 2)) {
         if (size > 2) __Pyx_RaiseTooManyValuesError(2);
         else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);
-        {__pyx_filename = __pyx_f[2]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        {__pyx_filename = __pyx_f[2]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       }
       #if CYTHON_COMPILING_IN_CPYTHON
       if (likely(PyTuple_CheckExact(sequence))) {
@@ -7350,16 +7987,15 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1a_3__set__(struct __pyx_obj_4cdec_5_cde
       __Pyx_INCREF(__pyx_t_4);
       __Pyx_INCREF(__pyx_t_5);
       #else
-      __pyx_t_4 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_5 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_5 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_5);
       #endif
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    } else
-    {
+    } else {
       Py_ssize_t index = -1;
-      __pyx_t_6 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = PyObject_GetIter(__pyx_t_3); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_6);
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
       __pyx_t_7 = Py_TYPE(__pyx_t_6)->tp_iternext;
@@ -7367,7 +8003,7 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1a_3__set__(struct __pyx_obj_4cdec_5_cde
       __Pyx_GOTREF(__pyx_t_4);
       index = 1; __pyx_t_5 = __pyx_t_7(__pyx_t_6); if (unlikely(!__pyx_t_5)) goto __pyx_L5_unpacking_failed;
       __Pyx_GOTREF(__pyx_t_5);
-      if (__Pyx_IternextUnpackEndCheck(__pyx_t_7(__pyx_t_6), 2) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      if (__Pyx_IternextUnpackEndCheck(__pyx_t_7(__pyx_t_6), 2) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __pyx_t_7 = NULL;
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
       goto __pyx_L6_unpacking_done;
@@ -7375,17 +8011,17 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1a_3__set__(struct __pyx_obj_4cdec_5_cde
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
       __pyx_t_7 = NULL;
       if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);
-      {__pyx_filename = __pyx_f[2]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      {__pyx_filename = __pyx_f[2]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __pyx_L6_unpacking_done:;
     }
-    __pyx_t_8 = __Pyx_PyInt_AsInt(__pyx_t_4); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_8 = __Pyx_PyInt_As_int(__pyx_t_4); if (unlikely((__pyx_t_8 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __pyx_t_9 = __Pyx_PyInt_AsInt(__pyx_t_5); if (unlikely((__pyx_t_9 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_9 = __Pyx_PyInt_As_int(__pyx_t_5); if (unlikely((__pyx_t_9 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __pyx_v_s = __pyx_t_8;
     __pyx_v_t = __pyx_t_9;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":144
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":150
  *             for i in range(len(a)):
  *                 s, t = a[i]
  *                 a_[0][i] = grammar.AlignmentPoint(s, t)             # <<<<<<<<<<<<<<
@@ -7395,6 +8031,15 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1a_3__set__(struct __pyx_obj_4cdec_5_cde
     ((__pyx_v_a_[0])[__pyx_v_i]) = AlignmentPoint(__pyx_v_s, __pyx_v_t);
   }
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":143
+ *                 yield (a[0][i].s_, a[0][i].t_)
+ * 
+ *         def __set__(self, a):             # <<<<<<<<<<<<<<
+ *             cdef vector[grammar.AlignmentPoint]* a_ = &self.rule.get().a_
+ *             a_.resize(len(a))
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -7409,6 +8054,14 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_1a_3__set__(struct __pyx_obj_4cdec_5_cde
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":153
+ * 
+ *     property scores:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef SparseVector scores = SparseVector.__new__(SparseVector)
+ *             scores.vector = new FastSparseVector[double](self.rule.get().scores_)
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_6scores_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_6scores_1__get__(PyObject *__pyx_v_self) {
@@ -7416,18 +8069,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_6scores_1__get__(PyObject *__pyx_v
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5TRule_6scores___get__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":147
- * 
- *     property scores:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef SparseVector scores = SparseVector.__new__(SparseVector)
- *             scores.vector = new FastSparseVector[double](self.rule.get().scores_)
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_6scores___get__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_scores = 0;
   PyObject *__pyx_r = NULL;
@@ -7438,20 +8085,20 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_6scores___get__(struct __pyx_obj_4
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":148
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":154
  *     property scores:
  *         def __get__(self):
  *             cdef SparseVector scores = SparseVector.__new__(SparseVector)             # <<<<<<<<<<<<<<
  *             scores.vector = new FastSparseVector[double](self.rule.get().scores_)
  *             return scores
  */
-  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  if (!(likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_4cdec_5_cdec_SparseVector)))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 148; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (!(likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_4cdec_5_cdec_SparseVector)))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 154; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_scores = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":149
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":155
  *         def __get__(self):
  *             cdef SparseVector scores = SparseVector.__new__(SparseVector)
  *             scores.vector = new FastSparseVector[double](self.rule.get().scores_)             # <<<<<<<<<<<<<<
@@ -7460,7 +8107,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_6scores___get__(struct __pyx_obj_4
  */
   __pyx_v_scores->vector = new FastSparseVector<double>(__pyx_v_self->rule->get()->scores_);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":150
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":156
  *             cdef SparseVector scores = SparseVector.__new__(SparseVector)
  *             scores.vector = new FastSparseVector[double](self.rule.get().scores_)
  *             return scores             # <<<<<<<<<<<<<<
@@ -7472,8 +8119,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_6scores___get__(struct __pyx_obj_4
   __pyx_r = ((PyObject *)__pyx_v_scores);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":153
+ * 
+ *     property scores:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef SparseVector scores = SparseVector.__new__(SparseVector)
+ *             scores.vector = new FastSparseVector[double](self.rule.get().scores_)
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.TRule.scores.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -7485,6 +8139,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_6scores___get__(struct __pyx_obj_4
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":158
+ *             return scores
+ * 
+ *         def __set__(self, scores):             # <<<<<<<<<<<<<<
+ *             cdef FastSparseVector[double]* scores_ = &self.rule.get().scores_
+ *             scores_.clear()
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_5TRule_6scores_3__set__(PyObject *__pyx_v_self, PyObject *__pyx_v_scores); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_5TRule_6scores_3__set__(PyObject *__pyx_v_self, PyObject *__pyx_v_scores) {
@@ -7492,18 +8154,12 @@ static int __pyx_pw_4cdec_5_cdec_5TRule_6scores_3__set__(PyObject *__pyx_v_self,
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__set__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5TRule_6scores_2__set__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self), ((PyObject *)__pyx_v_scores));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":152
- *             return scores
- * 
- *         def __set__(self, scores):             # <<<<<<<<<<<<<<
- *             cdef FastSparseVector[double]* scores_ = &self.rule.get().scores_
- *             scores_.clear()
- */
-
 static int __pyx_pf_4cdec_5_cdec_5TRule_6scores_2__set__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self, PyObject *__pyx_v_scores) {
   FastSparseVector<double> *__pyx_v_scores_;
   int __pyx_v_fid;
@@ -7528,7 +8184,7 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_6scores_2__set__(struct __pyx_obj_4cdec_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__set__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":153
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":159
  * 
  *         def __set__(self, scores):
  *             cdef FastSparseVector[double]* scores_ = &self.rule.get().scores_             # <<<<<<<<<<<<<<
@@ -7537,7 +8193,7 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_6scores_2__set__(struct __pyx_obj_4cdec_
  */
   __pyx_v_scores_ = (&__pyx_v_self->rule->get()->scores_);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":154
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":160
  *         def __set__(self, scores):
  *             cdef FastSparseVector[double]* scores_ = &self.rule.get().scores_
  *             scores_.clear()             # <<<<<<<<<<<<<<
@@ -7546,23 +8202,23 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_6scores_2__set__(struct __pyx_obj_4cdec_
  */
   __pyx_v_scores_->clear();
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":157
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":163
  *             cdef int fid
  *             cdef float fval
  *             for fname, fval in scores.items():             # <<<<<<<<<<<<<<
  *                 fn = as_str(fname)
  *                 fid = FDConvert(fn)
  */
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_scores, __pyx_n_s__items); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_scores, __pyx_n_s_items); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (PyList_CheckExact(__pyx_t_2) || PyTuple_CheckExact(__pyx_t_2)) {
     __pyx_t_1 = __pyx_t_2; __Pyx_INCREF(__pyx_t_1); __pyx_t_3 = 0;
     __pyx_t_4 = NULL;
   } else {
-    __pyx_t_3 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_1);
     __pyx_t_4 = Py_TYPE(__pyx_t_1)->tp_iternext;
   }
@@ -7571,23 +8227,24 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_6scores_2__set__(struct __pyx_obj_4cdec_
     if (!__pyx_t_4 && PyList_CheckExact(__pyx_t_1)) {
       if (__pyx_t_3 >= PyList_GET_SIZE(__pyx_t_1)) break;
       #if CYTHON_COMPILING_IN_CPYTHON
-      __pyx_t_2 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_3); __Pyx_INCREF(__pyx_t_2); __pyx_t_3++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_2 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_3); __Pyx_INCREF(__pyx_t_2); __pyx_t_3++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #else
-      __pyx_t_2 = PySequence_ITEM(__pyx_t_1, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_2 = PySequence_ITEM(__pyx_t_1, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #endif
     } else if (!__pyx_t_4 && PyTuple_CheckExact(__pyx_t_1)) {
       if (__pyx_t_3 >= PyTuple_GET_SIZE(__pyx_t_1)) break;
       #if CYTHON_COMPILING_IN_CPYTHON
-      __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_3); __Pyx_INCREF(__pyx_t_2); __pyx_t_3++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_3); __Pyx_INCREF(__pyx_t_2); __pyx_t_3++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #else
-      __pyx_t_2 = PySequence_ITEM(__pyx_t_1, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_2 = PySequence_ITEM(__pyx_t_1, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #endif
     } else {
       __pyx_t_2 = __pyx_t_4(__pyx_t_1);
       if (unlikely(!__pyx_t_2)) {
-        if (PyErr_Occurred()) {
-          if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
-          else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        PyObject* exc_type = PyErr_Occurred();
+        if (exc_type) {
+          if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
+          else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         }
         break;
       }
@@ -7603,7 +8260,7 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_6scores_2__set__(struct __pyx_obj_4cdec_
       if (unlikely(size != 2)) {
         if (size > 2) __Pyx_RaiseTooManyValuesError(2);
         else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);
-        {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       }
       #if CYTHON_COMPILING_IN_CPYTHON
       if (likely(PyTuple_CheckExact(sequence))) {
@@ -7616,16 +8273,15 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_6scores_2__set__(struct __pyx_obj_4cdec_
       __Pyx_INCREF(__pyx_t_5);
       __Pyx_INCREF(__pyx_t_6);
       #else
-      __pyx_t_5 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_5 = PySequence_ITEM(sequence, 0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_5);
-      __pyx_t_6 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = PySequence_ITEM(sequence, 1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_6);
       #endif
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    } else
-    {
+    } else {
       Py_ssize_t index = -1;
-      __pyx_t_7 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_7 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_7);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __pyx_t_8 = Py_TYPE(__pyx_t_7)->tp_iternext;
@@ -7633,7 +8289,7 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_6scores_2__set__(struct __pyx_obj_4cdec_
       __Pyx_GOTREF(__pyx_t_5);
       index = 1; __pyx_t_6 = __pyx_t_8(__pyx_t_7); if (unlikely(!__pyx_t_6)) goto __pyx_L5_unpacking_failed;
       __Pyx_GOTREF(__pyx_t_6);
-      if (__Pyx_IternextUnpackEndCheck(__pyx_t_8(__pyx_t_7), 2) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      if (__Pyx_IternextUnpackEndCheck(__pyx_t_8(__pyx_t_7), 2) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __pyx_t_8 = NULL;
       __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
       goto __pyx_L6_unpacking_done;
@@ -7641,40 +8297,38 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_6scores_2__set__(struct __pyx_obj_4cdec_
       __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
       __pyx_t_8 = NULL;
       if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);
-      {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __pyx_L6_unpacking_done:;
     }
-    __pyx_t_9 = __pyx_PyFloat_AsFloat(__pyx_t_6); if (unlikely((__pyx_t_9 == (float)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_9 = __pyx_PyFloat_AsFloat(__pyx_t_6); if (unlikely((__pyx_t_9 == (float)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-    __Pyx_XDECREF(__pyx_v_fname);
-    __pyx_v_fname = __pyx_t_5;
+    __Pyx_XDECREF_SET(__pyx_v_fname, __pyx_t_5);
     __pyx_t_5 = 0;
     __pyx_v_fval = __pyx_t_9;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":158
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":164
  *             cdef float fval
  *             for fname, fval in scores.items():
  *                 fn = as_str(fname)             # <<<<<<<<<<<<<<
  *                 fid = FDConvert(fn)
  *                 if fid < 0: raise KeyError(fname)
  */
-    __pyx_t_2 = ((PyObject *)__pyx_f_4cdec_5_cdec_as_str(__pyx_v_fname, NULL)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_2 = __pyx_f_4cdec_5_cdec_as_str(__pyx_v_fname, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_XDECREF(((PyObject *)__pyx_v_fn));
-    __pyx_v_fn = ((PyObject*)__pyx_t_2);
+    __Pyx_XDECREF_SET(__pyx_v_fn, ((PyObject*)__pyx_t_2));
     __pyx_t_2 = 0;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":159
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":165
  *             for fname, fval in scores.items():
  *                 fn = as_str(fname)
  *                 fid = FDConvert(fn)             # <<<<<<<<<<<<<<
  *                 if fid < 0: raise KeyError(fname)
  *                 scores_.set_value(fid, fval)
  */
-    __pyx_t_10 = __Pyx_PyObject_AsString(((PyObject *)__pyx_v_fn)); if (unlikely((!__pyx_t_10) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 159; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_10 = __Pyx_PyObject_AsString(__pyx_v_fn); if (unlikely((!__pyx_t_10) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __pyx_v_fid = FD::Convert(__pyx_t_10);
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":160
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":166
  *                 fn = as_str(fname)
  *                 fid = FDConvert(fn)
  *                 if fid < 0: raise KeyError(fname)             # <<<<<<<<<<<<<<
@@ -7683,22 +8337,20 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_6scores_2__set__(struct __pyx_obj_4cdec_
  */
     __pyx_t_11 = ((__pyx_v_fid < 0) != 0);
     if (__pyx_t_11) {
-      __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_INCREF(__pyx_v_fname);
       PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_v_fname);
       __Pyx_GIVEREF(__pyx_v_fname);
-      __pyx_t_6 = PyObject_Call(__pyx_builtin_KeyError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = __Pyx_PyObject_Call(__pyx_builtin_KeyError, __pyx_t_2, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_6);
-      __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+      __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __Pyx_Raise(__pyx_t_6, 0, 0, 0);
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-      {__pyx_filename = __pyx_f[2]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      goto __pyx_L7;
+      {__pyx_filename = __pyx_f[2]; __pyx_lineno = 166; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
-    __pyx_L7:;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":161
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":167
  *                 fid = FDConvert(fn)
  *                 if fid < 0: raise KeyError(fname)
  *                 scores_.set_value(fid, fval)             # <<<<<<<<<<<<<<
@@ -7709,6 +8361,15 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_6scores_2__set__(struct __pyx_obj_4cdec_
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":158
+ *             return scores
+ * 
+ *         def __set__(self, scores):             # <<<<<<<<<<<<<<
+ *             cdef FastSparseVector[double]* scores_ = &self.rule.get().scores_
+ *             scores_.clear()
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -7726,6 +8387,14 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_6scores_2__set__(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":170
+ * 
+ *     property lhs:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return NT(TDConvert(-self.rule.get().lhs_).c_str())
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_3lhs_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_3lhs_1__get__(PyObject *__pyx_v_self) {
@@ -7733,18 +8402,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_3lhs_1__get__(PyObject *__pyx_v_se
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5TRule_3lhs___get__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":164
- * 
- *     property lhs:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             return NT(TDConvert(-self.rule.get().lhs_).c_str())
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_3lhs___get__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -7755,7 +8418,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_3lhs___get__(struct __pyx_obj_4cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":165
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":171
  *     property lhs:
  *         def __get__(self):
  *             return NT(TDConvert(-self.rule.get().lhs_).c_str())             # <<<<<<<<<<<<<<
@@ -7763,22 +8426,29 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_3lhs___get__(struct __pyx_obj_4cde
  *         def __set__(self, lhs):
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __Pyx_PyBytes_FromString(TD::Convert((-__pyx_v_self->rule->get()->lhs_)).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
-  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyBytes_FromString(TD::Convert((-__pyx_v_self->rule->get()->lhs_)).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_1));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_NT)), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_NT)), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":170
+ * 
+ *     property lhs:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return NT(TDConvert(-self.rule.get().lhs_).c_str())
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -7790,6 +8460,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_3lhs___get__(struct __pyx_obj_4cde
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":173
+ *             return NT(TDConvert(-self.rule.get().lhs_).c_str())
+ * 
+ *         def __set__(self, lhs):             # <<<<<<<<<<<<<<
+ *             if not isinstance(lhs, NT):
+ *                 lhs = NT(lhs)
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_5TRule_3lhs_3__set__(PyObject *__pyx_v_self, PyObject *__pyx_v_lhs); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_5TRule_3lhs_3__set__(PyObject *__pyx_v_self, PyObject *__pyx_v_lhs) {
@@ -7797,18 +8475,12 @@ static int __pyx_pw_4cdec_5_cdec_5TRule_3lhs_3__set__(PyObject *__pyx_v_self, Py
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__set__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5TRule_3lhs_2__set__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self), ((PyObject *)__pyx_v_lhs));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":167
- *             return NT(TDConvert(-self.rule.get().lhs_).c_str())
- * 
- *         def __set__(self, lhs):             # <<<<<<<<<<<<<<
- *             if not isinstance(lhs, NT):
- *                 lhs = NT(lhs)
- */
-
 static int __pyx_pf_4cdec_5_cdec_5TRule_3lhs_2__set__(struct __pyx_obj_4cdec_5_cdec_TRule *__pyx_v_self, PyObject *__pyx_v_lhs) {
   int __pyx_r;
   __Pyx_RefNannyDeclarations
@@ -7823,7 +8495,7 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_3lhs_2__set__(struct __pyx_obj_4cdec_5_c
   __Pyx_RefNannySetupContext("__set__", 0);
   __Pyx_INCREF(__pyx_v_lhs);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":168
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":174
  * 
  *         def __set__(self, lhs):
  *             if not isinstance(lhs, NT):             # <<<<<<<<<<<<<<
@@ -7834,38 +8506,46 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_3lhs_2__set__(struct __pyx_obj_4cdec_5_c
   __pyx_t_2 = ((!(__pyx_t_1 != 0)) != 0);
   if (__pyx_t_2) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":169
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":175
  *         def __set__(self, lhs):
  *             if not isinstance(lhs, NT):
  *                 lhs = NT(lhs)             # <<<<<<<<<<<<<<
  *             self.rule.get().lhs_ = -TDConvert((<NT> lhs).cat)
  * 
  */
-    __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_INCREF(__pyx_v_lhs);
     PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_lhs);
     __Pyx_GIVEREF(__pyx_v_lhs);
-    __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_NT)), ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 169; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_NT)), __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
-    __Pyx_DECREF(__pyx_v_lhs);
-    __pyx_v_lhs = __pyx_t_4;
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    __Pyx_DECREF_SET(__pyx_v_lhs, __pyx_t_4);
     __pyx_t_4 = 0;
     goto __pyx_L3;
   }
   __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":170
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":176
  *             if not isinstance(lhs, NT):
  *                 lhs = NT(lhs)
  *             self.rule.get().lhs_ = -TDConvert((<NT> lhs).cat)             # <<<<<<<<<<<<<<
  * 
  *     def __str__(self):
  */
-  __pyx_t_5 = __Pyx_PyObject_AsString(((PyObject *)((struct __pyx_obj_4cdec_5_cdec_NT *)__pyx_v_lhs)->cat)); if (unlikely((!__pyx_t_5) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_5 = __Pyx_PyObject_AsString(((struct __pyx_obj_4cdec_5_cdec_NT *)__pyx_v_lhs)->cat); if (unlikely((!__pyx_t_5) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 176; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_self->rule->get()->lhs_ = (-TD::Convert(__pyx_t_5));
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":173
+ *             return NT(TDConvert(-self.rule.get().lhs_).c_str())
+ * 
+ *         def __set__(self, lhs):             # <<<<<<<<<<<<<<
+ *             if not isinstance(lhs, NT):
+ *                 lhs = NT(lhs)
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -7879,6 +8559,14 @@ static int __pyx_pf_4cdec_5_cdec_5TRule_3lhs_2__set__(struct __pyx_obj_4cdec_5_c
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":178
+ *             self.rule.get().lhs_ = -TDConvert((<NT> lhs).cat)
+ * 
+ *     def __str__(self):             # <<<<<<<<<<<<<<
+ *         scores = ' '.join('%s=%s' % feat for feat in self.scores)
+ *         return '%s ||| %s ||| %s ||| %s' % (self.lhs,
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_5__str__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_5__str__(PyObject *__pyx_v_self) {
@@ -7886,12 +8574,14 @@ static PyObject *__pyx_pw_4cdec_5_cdec_5TRule_5__str__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__str__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_5TRule_4__str__(((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_5TRule_7__str___2generator19(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":173
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":179
  * 
  *     def __str__(self):
  *         scores = ' '.join('%s=%s' % feat for feat in self.scores)             # <<<<<<<<<<<<<<
@@ -7917,12 +8607,13 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_7__str___genexpr(PyObject *__pyx_s
   __Pyx_INCREF(((PyObject *)__pyx_cur_scope->__pyx_outer_scope));
   __Pyx_GIVEREF(__pyx_cur_scope->__pyx_outer_scope);
   {
-    __pyx_GeneratorObject *gen = __Pyx_Generator_New((__pyx_generator_body_t) __pyx_gb_4cdec_5_cdec_5TRule_7__str___2generator19, (PyObject *) __pyx_cur_scope); if (unlikely(!gen)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_GeneratorObject *gen = __Pyx_Generator_New((__pyx_generator_body_t) __pyx_gb_4cdec_5_cdec_5TRule_7__str___2generator19, (PyObject *) __pyx_cur_scope); if (unlikely(!gen)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_cur_scope);
     __Pyx_RefNannyFinishContext();
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -7956,15 +8647,15 @@ static PyObject *__pyx_gb_4cdec_5_cdec_5TRule_7__str___2generator19(__pyx_Genera
     return NULL;
   }
   __pyx_L3_first_run:;
-  if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  if (unlikely(!__pyx_cur_scope->__pyx_outer_scope->__pyx_v_self)) { __Pyx_RaiseClosureNameError("self"); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;} }
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_cur_scope->__pyx_outer_scope->__pyx_v_self), __pyx_n_s__scores); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__pyx_cur_scope->__pyx_outer_scope->__pyx_v_self)) { __Pyx_RaiseClosureNameError("self"); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;} }
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_cur_scope->__pyx_outer_scope->__pyx_v_self), __pyx_n_s_scores); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   if (PyList_CheckExact(__pyx_t_1) || PyTuple_CheckExact(__pyx_t_1)) {
     __pyx_t_2 = __pyx_t_1; __Pyx_INCREF(__pyx_t_2); __pyx_t_3 = 0;
     __pyx_t_4 = NULL;
   } else {
-    __pyx_t_3 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = -1; __pyx_t_2 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_2);
     __pyx_t_4 = Py_TYPE(__pyx_t_2)->tp_iternext;
   }
@@ -7973,36 +8664,36 @@ static PyObject *__pyx_gb_4cdec_5_cdec_5TRule_7__str___2generator19(__pyx_Genera
     if (!__pyx_t_4 && PyList_CheckExact(__pyx_t_2)) {
       if (__pyx_t_3 >= PyList_GET_SIZE(__pyx_t_2)) break;
       #if CYTHON_COMPILING_IN_CPYTHON
-      __pyx_t_1 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_1); __pyx_t_3++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_1 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_1); __pyx_t_3++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #else
-      __pyx_t_1 = PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_1 = PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #endif
     } else if (!__pyx_t_4 && PyTuple_CheckExact(__pyx_t_2)) {
       if (__pyx_t_3 >= PyTuple_GET_SIZE(__pyx_t_2)) break;
       #if CYTHON_COMPILING_IN_CPYTHON
-      __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_1); __pyx_t_3++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_1 = PyTuple_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_1); __pyx_t_3++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #else
-      __pyx_t_1 = PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_1 = PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #endif
     } else {
       __pyx_t_1 = __pyx_t_4(__pyx_t_2);
       if (unlikely(!__pyx_t_1)) {
-        if (PyErr_Occurred()) {
-          if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
-          else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        PyObject* exc_type = PyErr_Occurred();
+        if (exc_type) {
+          if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
+          else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         }
         break;
       }
       __Pyx_GOTREF(__pyx_t_1);
     }
     __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_feat);
-    __Pyx_XDECREF(__pyx_cur_scope->__pyx_v_feat);
+    __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_feat, __pyx_t_1);
     __Pyx_GIVEREF(__pyx_t_1);
-    __pyx_cur_scope->__pyx_v_feat = __pyx_t_1;
     __pyx_t_1 = 0;
-    __pyx_t_1 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_11), __pyx_cur_scope->__pyx_v_feat); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_1));
-    __pyx_r = ((PyObject *)__pyx_t_1);
+    __pyx_t_1 = __Pyx_PyString_Format(__pyx_kp_s_s_s, __pyx_cur_scope->__pyx_v_feat); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_1);
+    __pyx_r = __pyx_t_1;
     __pyx_t_1 = 0;
     __Pyx_XGIVEREF(__pyx_t_2);
     __pyx_cur_scope->__pyx_t_0 = __pyx_t_2;
@@ -8019,9 +8710,11 @@ static PyObject *__pyx_gb_4cdec_5_cdec_5TRule_7__str___2generator19(__pyx_Genera
     __Pyx_XGOTREF(__pyx_t_2);
     __pyx_t_3 = __pyx_cur_scope->__pyx_t_1;
     __pyx_t_4 = __pyx_cur_scope->__pyx_t_2;
-    if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -8036,7 +8729,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_5TRule_7__str___2generator19(__pyx_Genera
   return NULL;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":172
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":178
  *             self.rule.get().lhs_ = -TDConvert((<NT> lhs).cat)
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -8068,30 +8761,22 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_4__str__(struct __pyx_obj_4cdec_5_
   __Pyx_INCREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
   __Pyx_GIVEREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":173
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":179
  * 
  *     def __str__(self):
  *         scores = ' '.join('%s=%s' % feat for feat in self.scores)             # <<<<<<<<<<<<<<
  *         return '%s ||| %s ||| %s ||| %s' % (self.lhs,
  *                 _phrase(self.f), _phrase(self.e), scores)
  */
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_kp_s_7), __pyx_n_s__join); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_pf_4cdec_5_cdec_5TRule_7__str___genexpr(((PyObject*)__pyx_cur_scope)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __pyx_pf_4cdec_5_cdec_5TRule_7__str___genexpr(((PyObject*)__pyx_cur_scope)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_3);
-  PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
-  __Pyx_GIVEREF(__pyx_t_2);
-  __pyx_t_2 = 0;
-  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyString_Join(__pyx_kp_s__4, __pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
-  __pyx_v_scores = __pyx_t_2;
+  __pyx_v_scores = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":174
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":180
  *     def __str__(self):
  *         scores = ' '.join('%s=%s' % feat for feat in self.scores)
  *         return '%s ||| %s ||| %s ||| %s' % (self.lhs,             # <<<<<<<<<<<<<<
@@ -8099,65 +8784,80 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_4__str__(struct __pyx_obj_4cdec_5_
  * 
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_cur_scope->__pyx_v_self), __pyx_n_s__lhs); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_cur_scope->__pyx_v_self), __pyx_n_s_lhs); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":175
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":181
  *         scores = ' '.join('%s=%s' % feat for feat in self.scores)
  *         return '%s ||| %s ||| %s ||| %s' % (self.lhs,
  *                 _phrase(self.f), _phrase(self.e), scores)             # <<<<<<<<<<<<<<
  * 
  * cdef class MRule(TRule):
  */
-  __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s___phrase); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_cur_scope->__pyx_v_self), __pyx_n_s__f); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_4);
-  PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_1);
-  __Pyx_GIVEREF(__pyx_t_1);
-  __pyx_t_1 = 0;
-  __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_phrase); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s___phrase); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_cur_scope->__pyx_v_self), __pyx_n_s__e); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_cur_scope->__pyx_v_self), __pyx_n_s_f); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_5);
-  PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_3);
+  __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_4);
+  PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_3);
   __pyx_t_3 = 0;
-  __pyx_t_3 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+  __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_phrase); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_4);
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_cur_scope->__pyx_v_self), __pyx_n_s_e); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_5);
+  PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
+  __pyx_t_1 = 0;
+  __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_5, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
-  __pyx_t_5 = PyTuple_New(4); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":180
+ *     def __str__(self):
+ *         scores = ' '.join('%s=%s' % feat for feat in self.scores)
+ *         return '%s ||| %s ||| %s ||| %s' % (self.lhs,             # <<<<<<<<<<<<<<
+ *                 _phrase(self.f), _phrase(self.e), scores)
+ * 
+ */
+  __pyx_t_5 = PyTuple_New(4); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_5);
   PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_2);
-  PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_1);
-  __Pyx_GIVEREF(__pyx_t_1);
-  PyTuple_SET_ITEM(__pyx_t_5, 2, __pyx_t_3);
+  PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_3);
+  PyTuple_SET_ITEM(__pyx_t_5, 2, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
   __Pyx_INCREF(__pyx_v_scores);
   PyTuple_SET_ITEM(__pyx_t_5, 3, __pyx_v_scores);
   __Pyx_GIVEREF(__pyx_v_scores);
   __pyx_t_2 = 0;
-  __pyx_t_1 = 0;
-  __pyx_t_3 = 0;
-  __pyx_t_3 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_12), ((PyObject *)__pyx_t_5)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_3));
-  __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
-  __pyx_r = ((PyObject *)__pyx_t_3);
   __pyx_t_3 = 0;
+  __pyx_t_1 = 0;
+  __pyx_t_1 = __Pyx_PyString_Format(__pyx_kp_s_s_s_s_s, __pyx_t_5); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+  __pyx_r = __pyx_t_1;
+  __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":178
+ *             self.rule.get().lhs_ = -TDConvert((<NT> lhs).cat)
+ * 
+ *     def __str__(self):             # <<<<<<<<<<<<<<
+ *         scores = ' '.join('%s=%s' % feat for feat in self.scores)
+ *         return '%s ||| %s ||| %s ||| %s' % (self.lhs,
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -8174,6 +8874,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_5TRule_4__str__(struct __pyx_obj_4cdec_5_
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":184
+ * 
+ * cdef class MRule(TRule):
+ *     def __init__(self, lhs, rhs, scores):             # <<<<<<<<<<<<<<
+ *         """MRule(lhs, rhs, scores, a=None) -> Monolingual rule.
+ *         lhs: left hand side non-terminal
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_5MRule_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_5MRule___init__[] = "MRule(lhs, rhs, scores, a=None) -> Monolingual rule.\n        lhs: left hand side non-terminal\n        rhs: right hand side phrase (list of words/NT)\n        scores: dictionary of feature scores";
@@ -8191,7 +8899,7 @@ static int __pyx_pw_4cdec_5_cdec_5MRule_1__init__(PyObject *__pyx_v_self, PyObje
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__init__ (wrapper)", 0);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__lhs,&__pyx_n_s__rhs,&__pyx_n_s__scores,0};
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_lhs,&__pyx_n_s_rhs,&__pyx_n_s_scores,0};
     PyObject* values[3] = {0,0,0};
     if (unlikely(__pyx_kwds)) {
       Py_ssize_t kw_args;
@@ -8206,21 +8914,21 @@ static int __pyx_pw_4cdec_5_cdec_5MRule_1__init__(PyObject *__pyx_v_self, PyObje
       kw_args = PyDict_Size(__pyx_kwds);
       switch (pos_args) {
         case  0:
-        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__lhs)) != 0)) kw_args--;
+        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_lhs)) != 0)) kw_args--;
         else goto __pyx_L5_argtuple_error;
         case  1:
-        if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__rhs)) != 0)) kw_args--;
+        if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_rhs)) != 0)) kw_args--;
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 3, 3, 1); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 3, 3, 1); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
         }
         case  2:
-        if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__scores)) != 0)) kw_args--;
+        if (likely((values[2] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_scores)) != 0)) kw_args--;
         else {
-          __Pyx_RaiseArgtupleInvalid("__init__", 1, 3, 3, 2); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+          __Pyx_RaiseArgtupleInvalid("__init__", 1, 3, 3, 2); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
         }
       }
       if (unlikely(kw_args > 0)) {
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "__init__") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "__init__") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       }
     } else if (PyTuple_GET_SIZE(__pyx_args) != 3) {
       goto __pyx_L5_argtuple_error;
@@ -8235,25 +8943,19 @@ static int __pyx_pw_4cdec_5_cdec_5MRule_1__init__(PyObject *__pyx_v_self, PyObje
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __Pyx_RaiseArgtupleInvalid("__init__", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   __pyx_L3_error:;
   __Pyx_AddTraceback("cdec._cdec.MRule.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __Pyx_RefNannyFinishContext();
   return -1;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_5MRule___init__(((struct __pyx_obj_4cdec_5_cdec_MRule *)__pyx_v_self), __pyx_v_lhs, __pyx_v_rhs, __pyx_v_scores);
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":178
- * 
- * cdef class MRule(TRule):
- *     def __init__(self, lhs, rhs, scores):             # <<<<<<<<<<<<<<
- *         """MRule(lhs, rhs, scores, a=None) -> Monolingual rule.
- *         lhs: left hand side non-terminal
- */
-
 static int __pyx_pf_4cdec_5_cdec_5MRule___init__(struct __pyx_obj_4cdec_5_cdec_MRule *__pyx_v_self, PyObject *__pyx_v_lhs, PyObject *__pyx_v_rhs, PyObject *__pyx_v_scores) {
   unsigned int __pyx_v_i;
   PyObject *__pyx_v_e = NULL;
@@ -8273,7 +8975,7 @@ static int __pyx_pf_4cdec_5_cdec_5MRule___init__(struct __pyx_obj_4cdec_5_cdec_M
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":183
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":189
  *         rhs: right hand side phrase (list of words/NT)
  *         scores: dictionary of feature scores"""
  *         cdef unsigned i = 1             # <<<<<<<<<<<<<<
@@ -8282,19 +8984,19 @@ static int __pyx_pf_4cdec_5_cdec_5MRule___init__(struct __pyx_obj_4cdec_5_cdec_M
  */
   __pyx_v_i = 1;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":184
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":190
  *         scores: dictionary of feature scores"""
  *         cdef unsigned i = 1
  *         e = []             # <<<<<<<<<<<<<<
  *         for s in rhs:
  *             if isinstance(s, NT):
  */
-  __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_v_e = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":185
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":191
  *         cdef unsigned i = 1
  *         e = []
  *         for s in rhs:             # <<<<<<<<<<<<<<
@@ -8305,7 +9007,7 @@ static int __pyx_pf_4cdec_5_cdec_5MRule___init__(struct __pyx_obj_4cdec_5_cdec_M
     __pyx_t_1 = __pyx_v_rhs; __Pyx_INCREF(__pyx_t_1); __pyx_t_2 = 0;
     __pyx_t_3 = NULL;
   } else {
-    __pyx_t_2 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_v_rhs); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_2 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_v_rhs); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_1);
     __pyx_t_3 = Py_TYPE(__pyx_t_1)->tp_iternext;
   }
@@ -8313,33 +9015,33 @@ static int __pyx_pf_4cdec_5_cdec_5MRule___init__(struct __pyx_obj_4cdec_5_cdec_M
     if (!__pyx_t_3 && PyList_CheckExact(__pyx_t_1)) {
       if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_1)) break;
       #if CYTHON_COMPILING_IN_CPYTHON
-      __pyx_t_4 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #else
-      __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #endif
     } else if (!__pyx_t_3 && PyTuple_CheckExact(__pyx_t_1)) {
       if (__pyx_t_2 >= PyTuple_GET_SIZE(__pyx_t_1)) break;
       #if CYTHON_COMPILING_IN_CPYTHON
-      __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #else
-      __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #endif
     } else {
       __pyx_t_4 = __pyx_t_3(__pyx_t_1);
       if (unlikely(!__pyx_t_4)) {
-        if (PyErr_Occurred()) {
-          if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
-          else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        PyObject* exc_type = PyErr_Occurred();
+        if (exc_type) {
+          if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
+          else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         }
         break;
       }
       __Pyx_GOTREF(__pyx_t_4);
     }
-    __Pyx_XDECREF(__pyx_v_s);
-    __pyx_v_s = __pyx_t_4;
+    __Pyx_XDECREF_SET(__pyx_v_s, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":186
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":192
  *         e = []
  *         for s in rhs:
  *             if isinstance(s, NT):             # <<<<<<<<<<<<<<
@@ -8350,27 +9052,27 @@ static int __pyx_pf_4cdec_5_cdec_5MRule___init__(struct __pyx_obj_4cdec_5_cdec_M
     __pyx_t_6 = (__pyx_t_5 != 0);
     if (__pyx_t_6) {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":187
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":193
  *         for s in rhs:
  *             if isinstance(s, NT):
  *                 e.append(NTRef(i))             # <<<<<<<<<<<<<<
  *                 i += 1
  *             else:
  */
-      __pyx_t_4 = PyLong_FromUnsignedLong(__pyx_v_i); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = __Pyx_PyInt_From_unsigned_int(__pyx_v_i); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_4);
-      __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_7 = PyTuple_New(1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_7);
       PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_4);
       __Pyx_GIVEREF(__pyx_t_4);
       __pyx_t_4 = 0;
-      __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_NTRef)), ((PyObject *)__pyx_t_7), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_NTRef)), __pyx_t_7, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_4);
-      __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0;
-      __pyx_t_8 = __Pyx_PyList_Append(__pyx_v_e, __pyx_t_4); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
+      __pyx_t_8 = __Pyx_PyList_Append(__pyx_v_e, __pyx_t_4); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":188
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":194
  *             if isinstance(s, NT):
  *                 e.append(NTRef(i))
  *                 i += 1             # <<<<<<<<<<<<<<
@@ -8382,27 +9084,27 @@ static int __pyx_pf_4cdec_5_cdec_5MRule___init__(struct __pyx_obj_4cdec_5_cdec_M
     }
     /*else*/ {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":190
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":196
  *                 i += 1
  *             else:
  *                 e.append(s)             # <<<<<<<<<<<<<<
  *         super(MRule, self).__init__(lhs, rhs, e, scores, None)
  * 
  */
-      __pyx_t_8 = __Pyx_PyList_Append(__pyx_v_e, __pyx_v_s); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_8 = __Pyx_PyList_Append(__pyx_v_e, __pyx_v_s); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
     __pyx_L5:;
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":191
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":197
  *             else:
  *                 e.append(s)
  *         super(MRule, self).__init__(lhs, rhs, e, scores, None)             # <<<<<<<<<<<<<<
  * 
  * cdef class Grammar:
  */
-  __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_INCREF(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_MRule)));
   PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_MRule)));
@@ -8410,13 +9112,13 @@ static int __pyx_pf_4cdec_5_cdec_5MRule___init__(struct __pyx_obj_4cdec_5_cdec_M
   __Pyx_INCREF(((PyObject *)__pyx_v_self));
   PyTuple_SET_ITEM(__pyx_t_1, 1, ((PyObject *)__pyx_v_self));
   __Pyx_GIVEREF(((PyObject *)__pyx_v_self));
-  __pyx_t_4 = PyObject_Call(__pyx_builtin_super, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_super, __pyx_t_1, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
-  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s____init__); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_init); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_4 = PyTuple_New(5); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = PyTuple_New(5); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_INCREF(__pyx_v_lhs);
   PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_v_lhs);
@@ -8424,21 +9126,30 @@ static int __pyx_pf_4cdec_5_cdec_5MRule___init__(struct __pyx_obj_4cdec_5_cdec_M
   __Pyx_INCREF(__pyx_v_rhs);
   PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_v_rhs);
   __Pyx_GIVEREF(__pyx_v_rhs);
-  __Pyx_INCREF(((PyObject *)__pyx_v_e));
-  PyTuple_SET_ITEM(__pyx_t_4, 2, ((PyObject *)__pyx_v_e));
-  __Pyx_GIVEREF(((PyObject *)__pyx_v_e));
+  __Pyx_INCREF(__pyx_v_e);
+  PyTuple_SET_ITEM(__pyx_t_4, 2, __pyx_v_e);
+  __Pyx_GIVEREF(__pyx_v_e);
   __Pyx_INCREF(__pyx_v_scores);
   PyTuple_SET_ITEM(__pyx_t_4, 3, __pyx_v_scores);
   __Pyx_GIVEREF(__pyx_v_scores);
   __Pyx_INCREF(Py_None);
   PyTuple_SET_ITEM(__pyx_t_4, 4, Py_None);
   __Pyx_GIVEREF(Py_None);
-  __pyx_t_7 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_4, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_7);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":184
+ * 
+ * cdef class MRule(TRule):
+ *     def __init__(self, lhs, rhs, scores):             # <<<<<<<<<<<<<<
+ *         """MRule(lhs, rhs, scores, a=None) -> Monolingual rule.
+ *         lhs: left hand side non-terminal
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -8454,28 +9165,30 @@ static int __pyx_pf_4cdec_5_cdec_5MRule___init__(struct __pyx_obj_4cdec_5_cdec_M
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":202
+ *     cdef shared_ptr[grammar.Grammar]* grammar
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.grammar
+ * 
+ */
+
 /* Python wrapper */
 static void __pyx_pw_4cdec_5_cdec_7Grammar_1__dealloc__(PyObject *__pyx_v_self); /*proto*/
 static void __pyx_pw_4cdec_5_cdec_7Grammar_1__dealloc__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__ (wrapper)", 0);
   __pyx_pf_4cdec_5_cdec_7Grammar___dealloc__(((struct __pyx_obj_4cdec_5_cdec_Grammar *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":196
- *     cdef shared_ptr[grammar.Grammar]* grammar
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         del self.grammar
- * 
- */
-
-static void __pyx_pf_4cdec_5_cdec_7Grammar___dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_Grammar *__pyx_v_self) {
+static void __pyx_pf_4cdec_5_cdec_7Grammar___dealloc__(struct __pyx_obj_4cdec_5_cdec_Grammar *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":197
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":203
  * 
  *     def __dealloc__(self):
  *         del self.grammar             # <<<<<<<<<<<<<<
@@ -8484,10 +9197,27 @@ static void __pyx_pf_4cdec_5_cdec_7Grammar___dealloc__(CYTHON_UNUSED struct __py
  */
   delete __pyx_v_self->grammar;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":202
+ *     cdef shared_ptr[grammar.Grammar]* grammar
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.grammar
+ * 
+ */
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_7Grammar_4generator3(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":205
+ *         del self.grammar
+ * 
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         cdef grammar.const_GrammarIter* root = self.grammar.get().GetRoot()
+ *         cdef grammar.const_RuleBin* rbin = root.GetRules()
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_7Grammar_3__iter__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_7Grammar_3__iter__(PyObject *__pyx_v_self) {
@@ -8495,18 +9225,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Grammar_3__iter__(PyObject *__pyx_v_self
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__iter__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Grammar_2__iter__(((struct __pyx_obj_4cdec_5_cdec_Grammar *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":199
- *         del self.grammar
- * 
- *     def __iter__(self):             # <<<<<<<<<<<<<<
- *         cdef grammar.const_GrammarIter* root = self.grammar.get().GetRoot()
- *         cdef grammar.const_RuleBin* rbin = root.GetRules()
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_7Grammar_2__iter__(struct __pyx_obj_4cdec_5_cdec_Grammar *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -8525,12 +9249,13 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Grammar_2__iter__(struct __pyx_obj_4cdec
   __Pyx_INCREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
   __Pyx_GIVEREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
   {
-    __pyx_GeneratorObject *gen = __Pyx_Generator_New((__pyx_generator_body_t) __pyx_gb_4cdec_5_cdec_7Grammar_4generator3, (PyObject *) __pyx_cur_scope); if (unlikely(!gen)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 199; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_GeneratorObject *gen = __Pyx_Generator_New((__pyx_generator_body_t) __pyx_gb_4cdec_5_cdec_7Grammar_4generator3, (PyObject *) __pyx_cur_scope); if (unlikely(!gen)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_cur_scope);
     __Pyx_RefNannyFinishContext();
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -8563,9 +9288,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Grammar_4generator3(__pyx_GeneratorObjec
     return NULL;
   }
   __pyx_L3_first_run:;
-  if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 199; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":200
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":206
  * 
  *     def __iter__(self):
  *         cdef grammar.const_GrammarIter* root = self.grammar.get().GetRoot()             # <<<<<<<<<<<<<<
@@ -8574,7 +9299,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Grammar_4generator3(__pyx_GeneratorObjec
  */
   __pyx_cur_scope->__pyx_v_root = __pyx_cur_scope->__pyx_v_self->grammar->get()->GetRoot();
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":201
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":207
  *     def __iter__(self):
  *         cdef grammar.const_GrammarIter* root = self.grammar.get().GetRoot()
  *         cdef grammar.const_RuleBin* rbin = root.GetRules()             # <<<<<<<<<<<<<<
@@ -8583,7 +9308,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Grammar_4generator3(__pyx_GeneratorObjec
  */
   __pyx_cur_scope->__pyx_v_rbin = __pyx_cur_scope->__pyx_v_root->GetRules();
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":204
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":210
  *         cdef TRule trule
  *         cdef unsigned i
  *         for i in range(rbin.GetNumRules()):             # <<<<<<<<<<<<<<
@@ -8594,23 +9319,22 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Grammar_4generator3(__pyx_GeneratorObjec
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_2;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":205
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":211
  *         cdef unsigned i
  *         for i in range(rbin.GetNumRules()):
  *             trule = TRule.__new__(TRule)             # <<<<<<<<<<<<<<
  *             trule.rule = new shared_ptr[grammar.TRule](rbin.GetIthRule(i))
  *             yield trule
  */
-    __pyx_t_3 = __pyx_tp_new_4cdec_5_cdec_TRule(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_TRule)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __pyx_tp_new_4cdec_5_cdec_TRule(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_TRule)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    if (!(likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_4cdec_5_cdec_TRule)))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (!(likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_4cdec_5_cdec_TRule)))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_XGOTREF(((PyObject *)__pyx_cur_scope->__pyx_v_trule));
-    __Pyx_XDECREF(((PyObject *)__pyx_cur_scope->__pyx_v_trule));
+    __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_trule, ((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_t_3));
     __Pyx_GIVEREF(__pyx_t_3);
-    __pyx_cur_scope->__pyx_v_trule = ((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_t_3);
     __pyx_t_3 = 0;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":206
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":212
  *         for i in range(rbin.GetNumRules()):
  *             trule = TRule.__new__(TRule)
  *             trule.rule = new shared_ptr[grammar.TRule](rbin.GetIthRule(i))             # <<<<<<<<<<<<<<
@@ -8619,7 +9343,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Grammar_4generator3(__pyx_GeneratorObjec
  */
     __pyx_cur_scope->__pyx_v_trule->rule = new boost::shared_ptr<TRule>(__pyx_cur_scope->__pyx_v_rbin->GetIthRule(__pyx_cur_scope->__pyx_v_i));
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":207
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":213
  *             trule = TRule.__new__(TRule)
  *             trule.rule = new shared_ptr[grammar.TRule](rbin.GetIthRule(i))
  *             yield trule             # <<<<<<<<<<<<<<
@@ -8638,8 +9362,18 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Grammar_4generator3(__pyx_GeneratorObjec
     __pyx_L6_resume_from_yield:;
     __pyx_t_1 = __pyx_cur_scope->__pyx_t_0;
     __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
-    if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 207; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 213; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":205
+ *         del self.grammar
+ * 
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         cdef grammar.const_GrammarIter* root = self.grammar.get().GetRoot()
+ *         cdef grammar.const_RuleBin* rbin = root.GetRules()
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -8653,6 +9387,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Grammar_4generator3(__pyx_GeneratorObjec
   return NULL;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":216
+ * 
+ *     property name:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             str(self.grammar.get().GetGrammarName().c_str())
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_7Grammar_4name_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_7Grammar_4name_1__get__(PyObject *__pyx_v_self) {
@@ -8660,18 +9402,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Grammar_4name_1__get__(PyObject *__pyx_v
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Grammar_4name___get__(((struct __pyx_obj_4cdec_5_cdec_Grammar *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":210
- * 
- *     property name:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             str(self.grammar.get().GetGrammarName().c_str())
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_7Grammar_4name___get__(struct __pyx_obj_4cdec_5_cdec_Grammar *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -8682,25 +9418,34 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Grammar_4name___get__(struct __pyx_obj_4
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":211
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":217
  *     property name:
  *         def __get__(self):
  *             str(self.grammar.get().GetGrammarName().c_str())             # <<<<<<<<<<<<<<
  * 
  *         def __set__(self, name):
  */
-  __pyx_t_1 = __Pyx_PyBytes_FromString(__pyx_v_self->grammar->get()->GetGrammarName().c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
-  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyBytes_FromString(__pyx_v_self->grammar->get()->GetGrammarName().c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 217; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 217; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_1));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 217; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":216
+ * 
+ *     property name:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             str(self.grammar.get().GetGrammarName().c_str())
+ * 
+ */
+
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -8714,6 +9459,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Grammar_4name___get__(struct __pyx_obj_4
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":219
+ *             str(self.grammar.get().GetGrammarName().c_str())
+ * 
+ *         def __set__(self, name):             # <<<<<<<<<<<<<<
+ *             name = as_str(name)
+ *             self.grammar.get().SetGrammarName(name)
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_7Grammar_4name_3__set__(PyObject *__pyx_v_self, PyObject *__pyx_v_name); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_7Grammar_4name_3__set__(PyObject *__pyx_v_self, PyObject *__pyx_v_name) {
@@ -8721,18 +9474,12 @@ static int __pyx_pw_4cdec_5_cdec_7Grammar_4name_3__set__(PyObject *__pyx_v_self,
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__set__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Grammar_4name_2__set__(((struct __pyx_obj_4cdec_5_cdec_Grammar *)__pyx_v_self), ((PyObject *)__pyx_v_name));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":213
- *             str(self.grammar.get().GetGrammarName().c_str())
- * 
- *         def __set__(self, name):             # <<<<<<<<<<<<<<
- *             name = as_str(name)
- *             self.grammar.get().SetGrammarName(name)
- */
-
 static int __pyx_pf_4cdec_5_cdec_7Grammar_4name_2__set__(struct __pyx_obj_4cdec_5_cdec_Grammar *__pyx_v_self, PyObject *__pyx_v_name) {
   int __pyx_r;
   __Pyx_RefNannyDeclarations
@@ -8744,29 +9491,37 @@ static int __pyx_pf_4cdec_5_cdec_7Grammar_4name_2__set__(struct __pyx_obj_4cdec_
   __Pyx_RefNannySetupContext("__set__", 0);
   __Pyx_INCREF(__pyx_v_name);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":214
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":220
  * 
  *         def __set__(self, name):
  *             name = as_str(name)             # <<<<<<<<<<<<<<
  *             self.grammar.get().SetGrammarName(name)
  * 
  */
-  __pyx_t_1 = ((PyObject *)__pyx_f_4cdec_5_cdec_as_str(__pyx_v_name, NULL)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 214; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_f_4cdec_5_cdec_as_str(__pyx_v_name, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_DECREF(__pyx_v_name);
-  __pyx_v_name = __pyx_t_1;
+  __Pyx_DECREF_SET(__pyx_v_name, __pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":215
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":221
  *         def __set__(self, name):
  *             name = as_str(name)
  *             self.grammar.get().SetGrammarName(name)             # <<<<<<<<<<<<<<
  * 
  * cdef class TextGrammar(Grammar):
  */
-  __pyx_t_2 = __pyx_convert_string_from_py_(__pyx_v_name); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 215; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __pyx_convert_string_from_py_(__pyx_v_name); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 221; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_self->grammar->get()->SetGrammarName(__pyx_t_2);
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":219
+ *             str(self.grammar.get().GetGrammarName().c_str())
+ * 
+ *         def __set__(self, name):             # <<<<<<<<<<<<<<
+ *             name = as_str(name)
+ *             self.grammar.get().SetGrammarName(name)
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -8779,6 +9534,14 @@ static int __pyx_pf_4cdec_5_cdec_7Grammar_4name_2__set__(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":224
+ * 
+ * cdef class TextGrammar(Grammar):
+ *     def __init__(self, rules):             # <<<<<<<<<<<<<<
+ *         """TextGrammar(rules) -> SCFG Grammar containing the rules."""
+ *         self.grammar = new shared_ptr[grammar.Grammar](new grammar.TextGrammar())
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_11TextGrammar_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_11TextGrammar___init__[] = "TextGrammar(rules) -> SCFG Grammar containing the rules.";
@@ -8794,7 +9557,7 @@ static int __pyx_pw_4cdec_5_cdec_11TextGrammar_1__init__(PyObject *__pyx_v_self,
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__init__ (wrapper)", 0);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__rules,0};
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_rules,0};
     PyObject* values[1] = {0};
     if (unlikely(__pyx_kwds)) {
       Py_ssize_t kw_args;
@@ -8807,11 +9570,11 @@ static int __pyx_pw_4cdec_5_cdec_11TextGrammar_1__init__(PyObject *__pyx_v_self,
       kw_args = PyDict_Size(__pyx_kwds);
       switch (pos_args) {
         case  0:
-        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__rules)) != 0)) kw_args--;
+        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_rules)) != 0)) kw_args--;
         else goto __pyx_L5_argtuple_error;
       }
       if (unlikely(kw_args > 0)) {
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "__init__") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 218; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, pos_args, "__init__") < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       }
     } else if (PyTuple_GET_SIZE(__pyx_args) != 1) {
       goto __pyx_L5_argtuple_error;
@@ -8822,25 +9585,19 @@ static int __pyx_pw_4cdec_5_cdec_11TextGrammar_1__init__(PyObject *__pyx_v_self,
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 218; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[2]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   __pyx_L3_error:;
   __Pyx_AddTraceback("cdec._cdec.TextGrammar.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __Pyx_RefNannyFinishContext();
   return -1;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_11TextGrammar___init__(((struct __pyx_obj_4cdec_5_cdec_TextGrammar *)__pyx_v_self), __pyx_v_rules);
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":218
- * 
- * cdef class TextGrammar(Grammar):
- *     def __init__(self, rules):             # <<<<<<<<<<<<<<
- *         """TextGrammar(rules) -> SCFG Grammar containing the rules."""
- *         self.grammar = new shared_ptr[grammar.Grammar](new grammar.TextGrammar())
- */
-
 static int __pyx_pf_4cdec_5_cdec_11TextGrammar___init__(struct __pyx_obj_4cdec_5_cdec_TextGrammar *__pyx_v_self, PyObject *__pyx_v_rules) {
   TextGrammar *__pyx_v__g;
   PyObject *__pyx_v_trule = NULL;
@@ -8857,7 +9614,7 @@ static int __pyx_pf_4cdec_5_cdec_11TextGrammar___init__(struct __pyx_obj_4cdec_5
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":220
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":226
  *     def __init__(self, rules):
  *         """TextGrammar(rules) -> SCFG Grammar containing the rules."""
  *         self.grammar = new shared_ptr[grammar.Grammar](new grammar.TextGrammar())             # <<<<<<<<<<<<<<
@@ -8866,7 +9623,7 @@ static int __pyx_pf_4cdec_5_cdec_11TextGrammar___init__(struct __pyx_obj_4cdec_5
  */
   __pyx_v_self->__pyx_base.grammar = new boost::shared_ptr<Grammar>(new TextGrammar());
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":221
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":227
  *         """TextGrammar(rules) -> SCFG Grammar containing the rules."""
  *         self.grammar = new shared_ptr[grammar.Grammar](new grammar.TextGrammar())
  *         cdef grammar.TextGrammar* _g = <grammar.TextGrammar*> self.grammar.get()             # <<<<<<<<<<<<<<
@@ -8875,7 +9632,7 @@ static int __pyx_pf_4cdec_5_cdec_11TextGrammar___init__(struct __pyx_obj_4cdec_5
  */
   __pyx_v__g = ((TextGrammar *)__pyx_v_self->__pyx_base.grammar->get());
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":222
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":228
  *         self.grammar = new shared_ptr[grammar.Grammar](new grammar.TextGrammar())
  *         cdef grammar.TextGrammar* _g = <grammar.TextGrammar*> self.grammar.get()
  *         for trule in rules:             # <<<<<<<<<<<<<<
@@ -8886,7 +9643,7 @@ static int __pyx_pf_4cdec_5_cdec_11TextGrammar___init__(struct __pyx_obj_4cdec_5
     __pyx_t_1 = __pyx_v_rules; __Pyx_INCREF(__pyx_t_1); __pyx_t_2 = 0;
     __pyx_t_3 = NULL;
   } else {
-    __pyx_t_2 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_v_rules); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 222; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_2 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_v_rules); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 228; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_1);
     __pyx_t_3 = Py_TYPE(__pyx_t_1)->tp_iternext;
   }
@@ -8894,33 +9651,33 @@ static int __pyx_pf_4cdec_5_cdec_11TextGrammar___init__(struct __pyx_obj_4cdec_5
     if (!__pyx_t_3 && PyList_CheckExact(__pyx_t_1)) {
       if (__pyx_t_2 >= PyList_GET_SIZE(__pyx_t_1)) break;
       #if CYTHON_COMPILING_IN_CPYTHON
-      __pyx_t_4 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 222; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 228; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #else
-      __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 222; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 228; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #endif
     } else if (!__pyx_t_3 && PyTuple_CheckExact(__pyx_t_1)) {
       if (__pyx_t_2 >= PyTuple_GET_SIZE(__pyx_t_1)) break;
       #if CYTHON_COMPILING_IN_CPYTHON
-      __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 222; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_2); __Pyx_INCREF(__pyx_t_4); __pyx_t_2++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 228; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #else
-      __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 222; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = PySequence_ITEM(__pyx_t_1, __pyx_t_2); __pyx_t_2++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 228; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #endif
     } else {
       __pyx_t_4 = __pyx_t_3(__pyx_t_1);
       if (unlikely(!__pyx_t_4)) {
-        if (PyErr_Occurred()) {
-          if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
-          else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 222; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        PyObject* exc_type = PyErr_Occurred();
+        if (exc_type) {
+          if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
+          else {__pyx_filename = __pyx_f[2]; __pyx_lineno = 228; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         }
         break;
       }
       __Pyx_GOTREF(__pyx_t_4);
     }
-    __Pyx_XDECREF(__pyx_v_trule);
-    __pyx_v_trule = __pyx_t_4;
+    __Pyx_XDECREF_SET(__pyx_v_trule, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":223
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":229
  *         cdef grammar.TextGrammar* _g = <grammar.TextGrammar*> self.grammar.get()
  *         for trule in rules:
  *             if isinstance(trule, _sa.Rule):             # <<<<<<<<<<<<<<
@@ -8931,23 +9688,22 @@ static int __pyx_pf_4cdec_5_cdec_11TextGrammar___init__(struct __pyx_obj_4cdec_5
     __pyx_t_6 = (__pyx_t_5 != 0);
     if (__pyx_t_6) {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":224
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":230
  *         for trule in rules:
  *             if isinstance(trule, _sa.Rule):
  *                 trule = convert_rule(trule)             # <<<<<<<<<<<<<<
  *             elif not isinstance(trule, TRule):
  *                 raise ValueError('the grammar should contain TRule objects')
  */
-      if (!(likely(((__pyx_v_trule) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_trule, __pyx_ptype_4cdec_2sa_3_sa_Rule))))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_4 = ((PyObject *)__pyx_f_4cdec_5_cdec_convert_rule(((struct __pyx_obj_4cdec_2sa_3_sa_Rule *)__pyx_v_trule))); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      if (!(likely(((__pyx_v_trule) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_trule, __pyx_ptype_4cdec_2sa_3_sa_Rule))))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = ((PyObject *)__pyx_f_4cdec_5_cdec_convert_rule(((struct __pyx_obj_4cdec_2sa_3_sa_Rule *)__pyx_v_trule))); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_4);
-      __Pyx_DECREF(__pyx_v_trule);
-      __pyx_v_trule = __pyx_t_4;
+      __Pyx_DECREF_SET(__pyx_v_trule, __pyx_t_4);
       __pyx_t_4 = 0;
       goto __pyx_L5;
     }
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":225
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":231
  *             if isinstance(trule, _sa.Rule):
  *                 trule = convert_rule(trule)
  *             elif not isinstance(trule, TRule):             # <<<<<<<<<<<<<<
@@ -8958,22 +9714,21 @@ static int __pyx_pf_4cdec_5_cdec_11TextGrammar___init__(struct __pyx_obj_4cdec_5
     __pyx_t_5 = ((!(__pyx_t_6 != 0)) != 0);
     if (__pyx_t_5) {
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":226
+      /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":232
  *                 trule = convert_rule(trule)
  *             elif not isinstance(trule, TRule):
  *                 raise ValueError('the grammar should contain TRule objects')             # <<<<<<<<<<<<<<
  *             _g.AddRule((<TRule> trule).rule[0])
  */
-      __pyx_t_4 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_k_tuple_14), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 226; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_ValueError, __pyx_tuple__5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_4);
       __Pyx_Raise(__pyx_t_4, 0, 0, 0);
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      {__pyx_filename = __pyx_f[2]; __pyx_lineno = 226; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      goto __pyx_L5;
+      {__pyx_filename = __pyx_f[2]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
     __pyx_L5:;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":227
+    /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":233
  *             elif not isinstance(trule, TRule):
  *                 raise ValueError('the grammar should contain TRule objects')
  *             _g.AddRule((<TRule> trule).rule[0])             # <<<<<<<<<<<<<<
@@ -8982,6 +9737,15 @@ static int __pyx_pf_4cdec_5_cdec_11TextGrammar___init__(struct __pyx_obj_4cdec_5
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":224
+ * 
+ * cdef class TextGrammar(Grammar):
+ *     def __init__(self, rules):             # <<<<<<<<<<<<<<
+ *         """TextGrammar(rules) -> SCFG Grammar containing the rules."""
+ *         self.grammar = new shared_ptr[grammar.Grammar](new grammar.TextGrammar())
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -8995,29 +9759,31 @@ static int __pyx_pf_4cdec_5_cdec_11TextGrammar___init__(struct __pyx_obj_4cdec_5
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":8
+ *     cdef MT19937* rng
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.hg
+ *         if self.rng != NULL:
+ */
+
 /* Python wrapper */
 static void __pyx_pw_4cdec_5_cdec_10Hypergraph_1__dealloc__(PyObject *__pyx_v_self); /*proto*/
 static void __pyx_pw_4cdec_5_cdec_10Hypergraph_1__dealloc__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__ (wrapper)", 0);
   __pyx_pf_4cdec_5_cdec_10Hypergraph___dealloc__(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":8
- *     cdef MT19937* rng
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         del self.hg
- *         if self.rng != NULL:
- */
-
 static void __pyx_pf_4cdec_5_cdec_10Hypergraph___dealloc__(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":9
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":9
  * 
  *     def __dealloc__(self):
  *         del self.hg             # <<<<<<<<<<<<<<
@@ -9026,7 +9792,7 @@ static void __pyx_pf_4cdec_5_cdec_10Hypergraph___dealloc__(struct __pyx_obj_4cde
  */
   delete __pyx_v_self->hg;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":10
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":10
  *     def __dealloc__(self):
  *         del self.hg
  *         if self.rng != NULL:             # <<<<<<<<<<<<<<
@@ -9036,7 +9802,7 @@ static void __pyx_pf_4cdec_5_cdec_10Hypergraph___dealloc__(struct __pyx_obj_4cde
   __pyx_t_1 = ((__pyx_v_self->rng != NULL) != 0);
   if (__pyx_t_1) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":11
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":11
  *         del self.hg
  *         if self.rng != NULL:
  *             del self.rng             # <<<<<<<<<<<<<<
@@ -9048,10 +9814,19 @@ static void __pyx_pf_4cdec_5_cdec_10Hypergraph___dealloc__(struct __pyx_obj_4cde
   }
   __pyx_L3:;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":8
+ *     cdef MT19937* rng
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.hg
+ *         if self.rng != NULL:
+ */
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":13
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":13
  *             del self.rng
  * 
  *     cdef MT19937* _rng(self):             # <<<<<<<<<<<<<<
@@ -9069,7 +9844,7 @@ static MT19937 *__pyx_f_4cdec_5_cdec_10Hypergraph__rng(struct __pyx_obj_4cdec_5_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_rng", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":14
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":14
  * 
  *     cdef MT19937* _rng(self):
  *         if self.rng == NULL:             # <<<<<<<<<<<<<<
@@ -9079,7 +9854,7 @@ static MT19937 *__pyx_f_4cdec_5_cdec_10Hypergraph__rng(struct __pyx_obj_4cdec_5_
   __pyx_t_1 = ((__pyx_v_self->rng == NULL) != 0);
   if (__pyx_t_1) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":15
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":15
  *     cdef MT19937* _rng(self):
  *         if self.rng == NULL:
  *             self.rng = new MT19937()             # <<<<<<<<<<<<<<
@@ -9097,7 +9872,7 @@ static MT19937 *__pyx_f_4cdec_5_cdec_10Hypergraph__rng(struct __pyx_obj_4cdec_5_
   }
   __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":16
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":16
  *         if self.rng == NULL:
  *             self.rng = new MT19937()
  *         return self.rng             # <<<<<<<<<<<<<<
@@ -9107,16 +9882,31 @@ static MT19937 *__pyx_f_4cdec_5_cdec_10Hypergraph__rng(struct __pyx_obj_4cdec_5_
   __pyx_r = __pyx_v_self->rng;
   goto __pyx_L0;
 
-  __pyx_r = 0;
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":13
+ *             del self.rng
+ * 
+ *     cdef MT19937* _rng(self):             # <<<<<<<<<<<<<<
+ *         if self.rng == NULL:
+ *             self.rng = new MT19937()
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
-  __Pyx_WriteUnraisable("cdec._cdec.Hypergraph._rng", __pyx_clineno, __pyx_lineno, __pyx_filename);
+  __Pyx_WriteUnraisable("cdec._cdec.Hypergraph._rng", __pyx_clineno, __pyx_lineno, __pyx_filename, 0);
   __pyx_r = 0;
   __pyx_L0:;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":18
+ *         return self.rng
+ * 
+ *     def viterbi(self):             # <<<<<<<<<<<<<<
+ *         """hg.viterbi() -> String for the best hypothesis in the hypergraph."""
+ *         cdef vector[WordID] trans
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_3viterbi(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_2viterbi[] = "hg.viterbi() -> String for the best hypothesis in the hypergraph.";
@@ -9125,18 +9915,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_3viterbi(PyObject *__pyx_v_s
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("viterbi (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_2viterbi(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":18
- *         return self.rng
- * 
- *     def viterbi(self):             # <<<<<<<<<<<<<<
- *         """hg.viterbi() -> String for the best hypothesis in the hypergraph."""
- *         cdef vector[WordID] trans
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_2viterbi(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self) {
   std::vector<WordID> __pyx_v_trans;
   PyObject *__pyx_r = NULL;
@@ -9148,7 +9932,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_2viterbi(struct __pyx_obj_4c
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("viterbi", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":21
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":21
  *         """hg.viterbi() -> String for the best hypothesis in the hypergraph."""
  *         cdef vector[WordID] trans
  *         hypergraph.ViterbiESentence(self.hg[0], &trans)             # <<<<<<<<<<<<<<
@@ -9157,7 +9941,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_2viterbi(struct __pyx_obj_4c
  */
   ViterbiESentence((__pyx_v_self->hg[0]), (&__pyx_v_trans));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":22
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":22
  *         cdef vector[WordID] trans
  *         hypergraph.ViterbiESentence(self.hg[0], &trans)
  *         return unicode(GetString(trans).c_str(), 'utf8')             # <<<<<<<<<<<<<<
@@ -9166,24 +9950,31 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_2viterbi(struct __pyx_obj_4c
  */
   __Pyx_XDECREF(__pyx_r);
   __pyx_t_1 = __Pyx_PyBytes_FromString(TD::GetString(__pyx_v_trans).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_1));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
-  __Pyx_INCREF(((PyObject *)__pyx_n_s__utf8));
-  PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_n_s__utf8));
-  __Pyx_GIVEREF(((PyObject *)__pyx_n_s__utf8));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
+  __Pyx_INCREF(__pyx_n_s_utf8);
+  PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_n_s_utf8);
+  __Pyx_GIVEREF(__pyx_n_s_utf8);
   __pyx_t_1 = 0;
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":18
+ *         return self.rng
+ * 
+ *     def viterbi(self):             # <<<<<<<<<<<<<<
+ *         """hg.viterbi() -> String for the best hypothesis in the hypergraph."""
+ *         cdef vector[WordID] trans
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -9195,6 +9986,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_2viterbi(struct __pyx_obj_4c
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":24
+ *         return unicode(GetString(trans).c_str(), 'utf8')
+ * 
+ *     def viterbi_trees(self):             # <<<<<<<<<<<<<<
+ *         """hg.viterbi_trees() -> (f_tree, e_tree)
+ *         f_tree: Source tree for the best hypothesis in the hypergraph.
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_5viterbi_trees(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_4viterbi_trees[] = "hg.viterbi_trees() -> (f_tree, e_tree)\n        f_tree: Source tree for the best hypothesis in the hypergraph.\n        e_tree: Target tree for the best hypothesis in the hypergraph.\n        ";
@@ -9203,18 +10002,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_5viterbi_trees(PyObject *__p
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("viterbi_trees (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_4viterbi_trees(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":24
- *         return unicode(GetString(trans).c_str(), 'utf8')
- * 
- *     def viterbi_trees(self):             # <<<<<<<<<<<<<<
- *         """hg.viterbi_trees() -> (f_tree, e_tree)
- *         f_tree: Source tree for the best hypothesis in the hypergraph.
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_4viterbi_trees(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self) {
   PyObject *__pyx_v_f_tree = NULL;
   PyObject *__pyx_v_e_tree = NULL;
@@ -9227,7 +10020,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_4viterbi_trees(struct __pyx_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("viterbi_trees", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":29
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":29
  *         e_tree: Target tree for the best hypothesis in the hypergraph.
  *         """
  *         f_tree = unicode(hypergraph.ViterbiFTree(self.hg[0]).c_str(), 'utf8')             # <<<<<<<<<<<<<<
@@ -9235,22 +10028,22 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_4viterbi_trees(struct __pyx_
  *         return (f_tree, e_tree)
  */
   __pyx_t_1 = __Pyx_PyBytes_FromString(ViterbiFTree((__pyx_v_self->hg[0])).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_1));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
-  __Pyx_INCREF(((PyObject *)__pyx_n_s__utf8));
-  PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_n_s__utf8));
-  __Pyx_GIVEREF(((PyObject *)__pyx_n_s__utf8));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
+  __Pyx_INCREF(__pyx_n_s_utf8);
+  PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_n_s_utf8);
+  __Pyx_GIVEREF(__pyx_n_s_utf8);
   __pyx_t_1 = 0;
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_v_f_tree = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":30
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":30
  *         """
  *         f_tree = unicode(hypergraph.ViterbiFTree(self.hg[0]).c_str(), 'utf8')
  *         e_tree = unicode(hypergraph.ViterbiETree(self.hg[0]).c_str(), 'utf8')             # <<<<<<<<<<<<<<
@@ -9258,22 +10051,22 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_4viterbi_trees(struct __pyx_
  * 
  */
   __pyx_t_1 = __Pyx_PyBytes_FromString(ViterbiETree((__pyx_v_self->hg[0])).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_1));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
-  __Pyx_INCREF(((PyObject *)__pyx_n_s__utf8));
-  PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_n_s__utf8));
-  __Pyx_GIVEREF(((PyObject *)__pyx_n_s__utf8));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
+  __Pyx_INCREF(__pyx_n_s_utf8);
+  PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_n_s_utf8);
+  __Pyx_GIVEREF(__pyx_n_s_utf8);
   __pyx_t_1 = 0;
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_v_e_tree = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":31
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":31
  *         f_tree = unicode(hypergraph.ViterbiFTree(self.hg[0]).c_str(), 'utf8')
  *         e_tree = unicode(hypergraph.ViterbiETree(self.hg[0]).c_str(), 'utf8')
  *         return (f_tree, e_tree)             # <<<<<<<<<<<<<<
@@ -9283,18 +10076,25 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_4viterbi_trees(struct __pyx_
   __Pyx_XDECREF(__pyx_r);
   __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_INCREF(((PyObject *)__pyx_v_f_tree));
-  PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_v_f_tree));
-  __Pyx_GIVEREF(((PyObject *)__pyx_v_f_tree));
-  __Pyx_INCREF(((PyObject *)__pyx_v_e_tree));
-  PyTuple_SET_ITEM(__pyx_t_1, 1, ((PyObject *)__pyx_v_e_tree));
-  __Pyx_GIVEREF(((PyObject *)__pyx_v_e_tree));
-  __pyx_r = ((PyObject *)__pyx_t_1);
+  __Pyx_INCREF(__pyx_v_f_tree);
+  PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_f_tree);
+  __Pyx_GIVEREF(__pyx_v_f_tree);
+  __Pyx_INCREF(__pyx_v_e_tree);
+  PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_v_e_tree);
+  __Pyx_GIVEREF(__pyx_v_e_tree);
+  __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":24
+ *         return unicode(GetString(trans).c_str(), 'utf8')
+ * 
+ *     def viterbi_trees(self):             # <<<<<<<<<<<<<<
+ *         """hg.viterbi_trees() -> (f_tree, e_tree)
+ *         f_tree: Source tree for the best hypothesis in the hypergraph.
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -9308,6 +10108,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_4viterbi_trees(struct __pyx_
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":33
+ *         return (f_tree, e_tree)
+ * 
+ *     def viterbi_features(self):             # <<<<<<<<<<<<<<
+ *         """hg.viterbi_features() -> SparseVector with the features corresponding
+ *         to the best derivation in the hypergraph."""
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_7viterbi_features(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_6viterbi_features[] = "hg.viterbi_features() -> SparseVector with the features corresponding\n        to the best derivation in the hypergraph.";
@@ -9316,18 +10124,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_7viterbi_features(PyObject *
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("viterbi_features (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_6viterbi_features(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":33
- *         return (f_tree, e_tree)
- * 
- *     def viterbi_features(self):             # <<<<<<<<<<<<<<
- *         """hg.viterbi_features() -> SparseVector with the features corresponding
- *         to the best derivation in the hypergraph."""
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_6viterbi_features(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_fmap = 0;
   PyObject *__pyx_r = NULL;
@@ -9338,20 +10140,20 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_6viterbi_features(struct __p
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("viterbi_features", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":36
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":36
  *         """hg.viterbi_features() -> SparseVector with the features corresponding
  *         to the best derivation in the hypergraph."""
  *         cdef SparseVector fmap = SparseVector.__new__(SparseVector)             # <<<<<<<<<<<<<<
  *         fmap.vector = new FastSparseVector[weight_t](hypergraph.ViterbiFeatures(self.hg[0]))
  *         return fmap
  */
-  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   if (!(likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_4cdec_5_cdec_SparseVector)))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_fmap = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":37
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":37
  *         to the best derivation in the hypergraph."""
  *         cdef SparseVector fmap = SparseVector.__new__(SparseVector)
  *         fmap.vector = new FastSparseVector[weight_t](hypergraph.ViterbiFeatures(self.hg[0]))             # <<<<<<<<<<<<<<
@@ -9360,7 +10162,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_6viterbi_features(struct __p
  */
   __pyx_v_fmap->vector = new FastSparseVector<weight_t>(ViterbiFeatures((__pyx_v_self->hg[0])));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":38
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":38
  *         cdef SparseVector fmap = SparseVector.__new__(SparseVector)
  *         fmap.vector = new FastSparseVector[weight_t](hypergraph.ViterbiFeatures(self.hg[0]))
  *         return fmap             # <<<<<<<<<<<<<<
@@ -9372,8 +10174,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_6viterbi_features(struct __p
   __pyx_r = ((PyObject *)__pyx_v_fmap);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":33
+ *         return (f_tree, e_tree)
+ * 
+ *     def viterbi_features(self):             # <<<<<<<<<<<<<<
+ *         """hg.viterbi_features() -> SparseVector with the features corresponding
+ *         to the best derivation in the hypergraph."""
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.Hypergraph.viterbi_features", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -9385,6 +10194,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_6viterbi_features(struct __p
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":40
+ *         return fmap
+ * 
+ *     def viterbi_forest(self):             # <<<<<<<<<<<<<<
+ *         cdef Hypergraph hg = Hypergraph()
+ *         hg.hg = new hypergraph.Hypergraph(self.hg[0].CreateViterbiHypergraph(NULL).get()[0])
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_9viterbi_forest(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_9viterbi_forest(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused) {
@@ -9392,18 +10209,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_9viterbi_forest(PyObject *__
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("viterbi_forest (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_8viterbi_forest(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":40
- *         return fmap
- * 
- *     def viterbi_forest(self):             # <<<<<<<<<<<<<<
- *         cdef Hypergraph hg = Hypergraph()
- *         hg.hg = new hypergraph.Hypergraph(self.hg[0].CreateViterbiHypergraph(NULL).get()[0])
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_8viterbi_forest(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_hg = 0;
   PyObject *__pyx_r = NULL;
@@ -9414,19 +10225,19 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_8viterbi_forest(struct __pyx
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("viterbi_forest", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":41
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":41
  * 
  *     def viterbi_forest(self):
  *         cdef Hypergraph hg = Hypergraph()             # <<<<<<<<<<<<<<
  *         hg.hg = new hypergraph.Hypergraph(self.hg[0].CreateViterbiHypergraph(NULL).get()[0])
  *         return hg
  */
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Hypergraph)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Hypergraph)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_v_hg = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":42
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":42
  *     def viterbi_forest(self):
  *         cdef Hypergraph hg = Hypergraph()
  *         hg.hg = new hypergraph.Hypergraph(self.hg[0].CreateViterbiHypergraph(NULL).get()[0])             # <<<<<<<<<<<<<<
@@ -9435,7 +10246,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_8viterbi_forest(struct __pyx
  */
   __pyx_v_hg->hg = new Hypergraph(((__pyx_v_self->hg[0]).CreateViterbiHypergraph(NULL).get()[0]));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":43
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":43
  *         cdef Hypergraph hg = Hypergraph()
  *         hg.hg = new hypergraph.Hypergraph(self.hg[0].CreateViterbiHypergraph(NULL).get()[0])
  *         return hg             # <<<<<<<<<<<<<<
@@ -9447,8 +10258,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_8viterbi_forest(struct __pyx
   __pyx_r = ((PyObject *)__pyx_v_hg);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":40
+ *         return fmap
+ * 
+ *     def viterbi_forest(self):             # <<<<<<<<<<<<<<
+ *         cdef Hypergraph hg = Hypergraph()
+ *         hg.hg = new hypergraph.Hypergraph(self.hg[0].CreateViterbiHypergraph(NULL).get()[0])
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.Hypergraph.viterbi_forest", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -9460,6 +10278,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_8viterbi_forest(struct __pyx
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":45
+ *         return hg
+ * 
+ *     def viterbi_joshua(self):             # <<<<<<<<<<<<<<
+ *         """hg.viterbi_joshua() -> Joshua representation of the best derivation."""
+ *         return unicode(hypergraph.JoshuaVisualizationString(self.hg[0]).c_str(), 'utf8')
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_11viterbi_joshua(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_10viterbi_joshua[] = "hg.viterbi_joshua() -> Joshua representation of the best derivation.";
@@ -9468,18 +10294,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_11viterbi_joshua(PyObject *_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("viterbi_joshua (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_10viterbi_joshua(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":45
- *         return hg
- * 
- *     def viterbi_joshua(self):             # <<<<<<<<<<<<<<
- *         """hg.viterbi_joshua() -> Joshua representation of the best derivation."""
- *         return unicode(hypergraph.JoshuaVisualizationString(self.hg[0]).c_str(), 'utf8')
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_10viterbi_joshua(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -9490,7 +10310,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_10viterbi_joshua(struct __py
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("viterbi_joshua", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":47
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":47
  *     def viterbi_joshua(self):
  *         """hg.viterbi_joshua() -> Joshua representation of the best derivation."""
  *         return unicode(hypergraph.JoshuaVisualizationString(self.hg[0]).c_str(), 'utf8')             # <<<<<<<<<<<<<<
@@ -9499,24 +10319,31 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_10viterbi_joshua(struct __py
  */
   __Pyx_XDECREF(__pyx_r);
   __pyx_t_1 = __Pyx_PyBytes_FromString(JoshuaVisualizationString((__pyx_v_self->hg[0])).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_1));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
-  __Pyx_INCREF(((PyObject *)__pyx_n_s__utf8));
-  PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_n_s__utf8));
-  __Pyx_GIVEREF(((PyObject *)__pyx_n_s__utf8));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
+  __Pyx_INCREF(__pyx_n_s_utf8);
+  PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_n_s_utf8);
+  __Pyx_GIVEREF(__pyx_n_s_utf8);
   __pyx_t_1 = 0;
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":45
+ *         return hg
+ * 
+ *     def viterbi_joshua(self):             # <<<<<<<<<<<<<<
+ *         """hg.viterbi_joshua() -> Joshua representation of the best derivation."""
+ *         return unicode(hypergraph.JoshuaVisualizationString(self.hg[0]).c_str(), 'utf8')
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -9529,6 +10356,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_10viterbi_joshua(struct __py
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_14generator4(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":49
+ *         return unicode(hypergraph.JoshuaVisualizationString(self.hg[0]).c_str(), 'utf8')
+ * 
+ *     def kbest(self, size):             # <<<<<<<<<<<<<<
+ *         """hg.kbest(size) -> List of k-best hypotheses in the hypergraph."""
+ *         cdef kbest.KBestDerivations[vector[WordID], kbest.ESentenceTraversal]* derivations = new kbest.KBestDerivations[vector[WordID], kbest.ESentenceTraversal](self.hg[0], size)
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_13kbest(PyObject *__pyx_v_self, PyObject *__pyx_v_size); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_12kbest[] = "hg.kbest(size) -> List of k-best hypotheses in the hypergraph.";
@@ -9537,18 +10372,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_13kbest(PyObject *__pyx_v_se
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("kbest (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_12kbest(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self), ((PyObject *)__pyx_v_size));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":49
- *         return unicode(hypergraph.JoshuaVisualizationString(self.hg[0]).c_str(), 'utf8')
- * 
- *     def kbest(self, size):             # <<<<<<<<<<<<<<
- *         """hg.kbest(size) -> List of k-best hypotheses in the hypergraph."""
- *         cdef kbest.KBestDerivations[vector[WordID], kbest.ESentenceTraversal]* derivations = new kbest.KBestDerivations[vector[WordID], kbest.ESentenceTraversal](self.hg[0], size)
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_12kbest(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self, PyObject *__pyx_v_size) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -9576,6 +10405,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_12kbest(struct __pyx_obj_4cd
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -9597,6 +10427,15 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_14generator4(__pyx_Generator
   int __pyx_t_3;
   PyObject *__pyx_t_4 = NULL;
   PyObject *__pyx_t_5 = NULL;
+  int __pyx_t_6;
+  int __pyx_t_7;
+  char const *__pyx_t_8;
+  PyObject *__pyx_t_9 = NULL;
+  PyObject *__pyx_t_10 = NULL;
+  PyObject *__pyx_t_11 = NULL;
+  PyObject *__pyx_t_12 = NULL;
+  PyObject *__pyx_t_13 = NULL;
+  PyObject *__pyx_t_14 = NULL;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -9612,17 +10451,17 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_14generator4(__pyx_Generator
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":51
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":51
  *     def kbest(self, size):
  *         """hg.kbest(size) -> List of k-best hypotheses in the hypergraph."""
  *         cdef kbest.KBestDerivations[vector[WordID], kbest.ESentenceTraversal]* derivations = new kbest.KBestDerivations[vector[WordID], kbest.ESentenceTraversal](self.hg[0], size)             # <<<<<<<<<<<<<<
  *         cdef kbest.KBestDerivations[vector[WordID], kbest.ESentenceTraversal].Derivation* derivation
  *         cdef unsigned k
  */
-  __pyx_t_1 = __Pyx_PyInt_AsUnsignedInt(__pyx_cur_scope->__pyx_v_size); if (unlikely((__pyx_t_1 == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_As_unsigned_int(__pyx_cur_scope->__pyx_v_size); if (unlikely((__pyx_t_1 == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_cur_scope->__pyx_v_derivations = new KBest::KBestDerivations<std::vector<WordID>,ESentenceTraversal>((__pyx_cur_scope->__pyx_v_self->hg[0]), __pyx_t_1);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":54
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":54
  *         cdef kbest.KBestDerivations[vector[WordID], kbest.ESentenceTraversal].Derivation* derivation
  *         cdef unsigned k
  *         try:             # <<<<<<<<<<<<<<
@@ -9631,18 +10470,18 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_14generator4(__pyx_Generator
  */
   /*try:*/ {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":55
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":55
  *         cdef unsigned k
  *         try:
  *             for k in range(size):             # <<<<<<<<<<<<<<
  *                 derivation = derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)
  *                 if not derivation: break
  */
-    __pyx_t_2 = __Pyx_PyInt_AsLong(__pyx_cur_scope->__pyx_v_size); if (unlikely((__pyx_t_2 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L5;}
+    __pyx_t_2 = __Pyx_PyInt_As_long(__pyx_cur_scope->__pyx_v_size); if (unlikely((__pyx_t_2 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
     for (__pyx_t_1 = 0; __pyx_t_1 < __pyx_t_2; __pyx_t_1+=1) {
       __pyx_cur_scope->__pyx_v_k = __pyx_t_1;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":56
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":56
  *         try:
  *             for k in range(size):
  *                 derivation = derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)             # <<<<<<<<<<<<<<
@@ -9651,7 +10490,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_14generator4(__pyx_Generator
  */
       __pyx_cur_scope->__pyx_v_derivation = __pyx_cur_scope->__pyx_v_derivations->LazyKthBest((__pyx_cur_scope->__pyx_v_self->hg->nodes_.size() - 1), __pyx_cur_scope->__pyx_v_k);
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":57
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":57
  *             for k in range(size):
  *                 derivation = derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)
  *                 if not derivation: break             # <<<<<<<<<<<<<<
@@ -9661,30 +10500,28 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_14generator4(__pyx_Generator
       __pyx_t_3 = ((!(__pyx_cur_scope->__pyx_v_derivation != 0)) != 0);
       if (__pyx_t_3) {
         goto __pyx_L8_break;
-        goto __pyx_L9;
       }
-      __pyx_L9:;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":58
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":58
  *                 derivation = derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)
  *                 if not derivation: break
  *                 yield unicode(GetString(derivation._yield).c_str(), 'utf8')             # <<<<<<<<<<<<<<
  *         finally:
  *             del derivations
  */
-      __pyx_t_4 = __Pyx_PyBytes_FromString(TD::GetString(__pyx_cur_scope->__pyx_v_derivation->yield).c_str()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L5;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_4));
-      __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_4 = __Pyx_PyBytes_FromString(TD::GetString(__pyx_cur_scope->__pyx_v_derivation->yield).c_str()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
+      __Pyx_GOTREF(__pyx_t_4);
+      __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_5);
-      PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_t_4));
-      __Pyx_GIVEREF(((PyObject *)__pyx_t_4));
-      __Pyx_INCREF(((PyObject *)__pyx_n_s__utf8));
-      PyTuple_SET_ITEM(__pyx_t_5, 1, ((PyObject *)__pyx_n_s__utf8));
-      __Pyx_GIVEREF(((PyObject *)__pyx_n_s__utf8));
+      PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4);
+      __Pyx_GIVEREF(__pyx_t_4);
+      __Pyx_INCREF(__pyx_n_s_utf8);
+      PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_n_s_utf8);
+      __Pyx_GIVEREF(__pyx_n_s_utf8);
       __pyx_t_4 = 0;
-      __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_4);
-      __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
+      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       __pyx_r = __pyx_t_4;
       __pyx_t_4 = 0;
       __pyx_cur_scope->__pyx_t_0 = __pyx_t_1;
@@ -9697,12 +10534,12 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_14generator4(__pyx_Generator
       __pyx_L10_resume_from_yield:;
       __pyx_t_1 = __pyx_cur_scope->__pyx_t_0;
       __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
-      if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
     }
     __pyx_L8_break:;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":60
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":60
  *                 yield unicode(GetString(derivation._yield).c_str(), 'utf8')
  *         finally:
  *             del derivations             # <<<<<<<<<<<<<<
@@ -9710,32 +10547,53 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_14generator4(__pyx_Generator
  *     def kbest_trees(self, size):
  */
   /*finally:*/ {
-    int __pyx_why;
-    PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;
-    int __pyx_exc_lineno;
-    __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;
-    __pyx_why = 0; goto __pyx_L6;
-    __pyx_L5: {
-      __pyx_why = 4;
-      __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
-      __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);
-      __pyx_exc_lineno = __pyx_lineno;
+    /*normal exit:*/{
+      delete __pyx_cur_scope->__pyx_v_derivations;
       goto __pyx_L6;
     }
-    __pyx_L6:;
-    delete __pyx_cur_scope->__pyx_v_derivations;
-    switch (__pyx_why) {
-      case 4: {
-        __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);
-        __pyx_lineno = __pyx_exc_lineno;
-        __pyx_exc_type = 0;
-        __pyx_exc_value = 0;
-        __pyx_exc_tb = 0;
-        goto __pyx_L1_error;
+    /*exception exit:*/{
+      __pyx_L5_error:;
+      __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; __pyx_t_12 = 0; __pyx_t_13 = 0; __pyx_t_14 = 0;
+      __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
+      __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
+      if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_12, &__pyx_t_13, &__pyx_t_14);
+      if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11) < 0)) __Pyx_ErrFetch(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11);
+      __Pyx_XGOTREF(__pyx_t_9);
+      __Pyx_XGOTREF(__pyx_t_10);
+      __Pyx_XGOTREF(__pyx_t_11);
+      __Pyx_XGOTREF(__pyx_t_12);
+      __Pyx_XGOTREF(__pyx_t_13);
+      __Pyx_XGOTREF(__pyx_t_14);
+      __pyx_t_6 = __pyx_lineno; __pyx_t_7 = __pyx_clineno; __pyx_t_8 = __pyx_filename;
+      {
+        delete __pyx_cur_scope->__pyx_v_derivations;
+      }
+      if (PY_MAJOR_VERSION >= 3) {
+        __Pyx_XGIVEREF(__pyx_t_12);
+        __Pyx_XGIVEREF(__pyx_t_13);
+        __Pyx_XGIVEREF(__pyx_t_14);
+        __Pyx_ExceptionReset(__pyx_t_12, __pyx_t_13, __pyx_t_14);
       }
+      __Pyx_XGIVEREF(__pyx_t_9);
+      __Pyx_XGIVEREF(__pyx_t_10);
+      __Pyx_XGIVEREF(__pyx_t_11);
+      __Pyx_ErrRestore(__pyx_t_9, __pyx_t_10, __pyx_t_11);
+      __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; __pyx_t_12 = 0; __pyx_t_13 = 0; __pyx_t_14 = 0;
+      __pyx_lineno = __pyx_t_6; __pyx_clineno = __pyx_t_7; __pyx_filename = __pyx_t_8;
+      goto __pyx_L1_error;
     }
+    __pyx_L6:;
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":49
+ *         return unicode(hypergraph.JoshuaVisualizationString(self.hg[0]).c_str(), 'utf8')
+ * 
+ *     def kbest(self, size):             # <<<<<<<<<<<<<<
+ *         """hg.kbest(size) -> List of k-best hypotheses in the hypergraph."""
+ *         cdef kbest.KBestDerivations[vector[WordID], kbest.ESentenceTraversal]* derivations = new kbest.KBestDerivations[vector[WordID], kbest.ESentenceTraversal](self.hg[0], size)
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -9751,6 +10609,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_14generator4(__pyx_Generator
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_17generator5(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":62
+ *             del derivations
+ * 
+ *     def kbest_trees(self, size):             # <<<<<<<<<<<<<<
+ *         """hg.kbest_trees(size) -> List of k-best trees in the hypergraph."""
+ *         cdef kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal]* f_derivations = new kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal](self.hg[0], size)
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_16kbest_trees(PyObject *__pyx_v_self, PyObject *__pyx_v_size); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_15kbest_trees[] = "hg.kbest_trees(size) -> List of k-best trees in the hypergraph.";
@@ -9759,18 +10625,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_16kbest_trees(PyObject *__py
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("kbest_trees (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_15kbest_trees(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self), ((PyObject *)__pyx_v_size));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":62
- *             del derivations
- * 
- *     def kbest_trees(self, size):             # <<<<<<<<<<<<<<
- *         """hg.kbest_trees(size) -> List of k-best trees in the hypergraph."""
- *         cdef kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal]* f_derivations = new kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal](self.hg[0], size)
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_15kbest_trees(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self, PyObject *__pyx_v_size) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -9798,6 +10658,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_15kbest_trees(struct __pyx_o
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -9821,6 +10682,15 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_17generator5(__pyx_Generator
   int __pyx_t_5;
   PyObject *__pyx_t_6 = NULL;
   PyObject *__pyx_t_7 = NULL;
+  int __pyx_t_8;
+  int __pyx_t_9;
+  char const *__pyx_t_10;
+  PyObject *__pyx_t_11 = NULL;
+  PyObject *__pyx_t_12 = NULL;
+  PyObject *__pyx_t_13 = NULL;
+  PyObject *__pyx_t_14 = NULL;
+  PyObject *__pyx_t_15 = NULL;
+  PyObject *__pyx_t_16 = NULL;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -9836,27 +10706,27 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_17generator5(__pyx_Generator
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":64
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":64
  *     def kbest_trees(self, size):
  *         """hg.kbest_trees(size) -> List of k-best trees in the hypergraph."""
  *         cdef kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal]* f_derivations = new kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal](self.hg[0], size)             # <<<<<<<<<<<<<<
  *         cdef kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal].Derivation* f_derivation
  *         cdef kbest.KBestDerivations[vector[WordID], kbest.ETreeTraversal]* e_derivations = new kbest.KBestDerivations[vector[WordID], kbest.ETreeTraversal](self.hg[0], size)
  */
-  __pyx_t_1 = __Pyx_PyInt_AsUnsignedInt(__pyx_cur_scope->__pyx_v_size); if (unlikely((__pyx_t_1 == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_As_unsigned_int(__pyx_cur_scope->__pyx_v_size); if (unlikely((__pyx_t_1 == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_cur_scope->__pyx_v_f_derivations = new KBest::KBestDerivations<std::vector<WordID>,FTreeTraversal>((__pyx_cur_scope->__pyx_v_self->hg[0]), __pyx_t_1);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":66
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":66
  *         cdef kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal]* f_derivations = new kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal](self.hg[0], size)
  *         cdef kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal].Derivation* f_derivation
  *         cdef kbest.KBestDerivations[vector[WordID], kbest.ETreeTraversal]* e_derivations = new kbest.KBestDerivations[vector[WordID], kbest.ETreeTraversal](self.hg[0], size)             # <<<<<<<<<<<<<<
  *         cdef kbest.KBestDerivations[vector[WordID], kbest.ETreeTraversal].Derivation* e_derivation
  *         cdef unsigned k
  */
-  __pyx_t_1 = __Pyx_PyInt_AsUnsignedInt(__pyx_cur_scope->__pyx_v_size); if (unlikely((__pyx_t_1 == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_As_unsigned_int(__pyx_cur_scope->__pyx_v_size); if (unlikely((__pyx_t_1 == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_cur_scope->__pyx_v_e_derivations = new KBest::KBestDerivations<std::vector<WordID>,ETreeTraversal>((__pyx_cur_scope->__pyx_v_self->hg[0]), __pyx_t_1);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":69
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":69
  *         cdef kbest.KBestDerivations[vector[WordID], kbest.ETreeTraversal].Derivation* e_derivation
  *         cdef unsigned k
  *         try:             # <<<<<<<<<<<<<<
@@ -9865,18 +10735,18 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_17generator5(__pyx_Generator
  */
   /*try:*/ {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":70
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":70
  *         cdef unsigned k
  *         try:
  *             for k in range(size):             # <<<<<<<<<<<<<<
  *                 f_derivation = f_derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)
  *                 e_derivation = e_derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)
  */
-    __pyx_t_2 = __Pyx_PyInt_AsLong(__pyx_cur_scope->__pyx_v_size); if (unlikely((__pyx_t_2 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L5;}
+    __pyx_t_2 = __Pyx_PyInt_As_long(__pyx_cur_scope->__pyx_v_size); if (unlikely((__pyx_t_2 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
     for (__pyx_t_1 = 0; __pyx_t_1 < __pyx_t_2; __pyx_t_1+=1) {
       __pyx_cur_scope->__pyx_v_k = __pyx_t_1;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":71
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":71
  *         try:
  *             for k in range(size):
  *                 f_derivation = f_derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)             # <<<<<<<<<<<<<<
@@ -9885,7 +10755,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_17generator5(__pyx_Generator
  */
       __pyx_cur_scope->__pyx_v_f_derivation = __pyx_cur_scope->__pyx_v_f_derivations->LazyKthBest((__pyx_cur_scope->__pyx_v_self->hg->nodes_.size() - 1), __pyx_cur_scope->__pyx_v_k);
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":72
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":72
  *             for k in range(size):
  *                 f_derivation = f_derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)
  *                 e_derivation = e_derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)             # <<<<<<<<<<<<<<
@@ -9894,7 +10764,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_17generator5(__pyx_Generator
  */
       __pyx_cur_scope->__pyx_v_e_derivation = __pyx_cur_scope->__pyx_v_e_derivations->LazyKthBest((__pyx_cur_scope->__pyx_v_self->hg->nodes_.size() - 1), __pyx_cur_scope->__pyx_v_k);
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":73
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":73
  *                 f_derivation = f_derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)
  *                 e_derivation = e_derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)
  *                 if not f_derivation or not e_derivation: break             # <<<<<<<<<<<<<<
@@ -9910,78 +10780,74 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_17generator5(__pyx_Generator
       }
       if (__pyx_t_5) {
         goto __pyx_L8_break;
-        goto __pyx_L9;
       }
-      __pyx_L9:;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":74
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":74
  *                 e_derivation = e_derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)
  *                 if not f_derivation or not e_derivation: break
  *                 f_tree = unicode(GetString(f_derivation._yield).c_str(), 'utf8')             # <<<<<<<<<<<<<<
  *                 e_tree = unicode(GetString(e_derivation._yield).c_str(), 'utf8')
  *                 yield (f_tree, e_tree)
  */
-      __pyx_t_6 = __Pyx_PyBytes_FromString(TD::GetString(__pyx_cur_scope->__pyx_v_f_derivation->yield).c_str()); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L5;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_6));
-      __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_6 = __Pyx_PyBytes_FromString(TD::GetString(__pyx_cur_scope->__pyx_v_f_derivation->yield).c_str()); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
+      __Pyx_GOTREF(__pyx_t_6);
+      __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_7);
-      PyTuple_SET_ITEM(__pyx_t_7, 0, ((PyObject *)__pyx_t_6));
-      __Pyx_GIVEREF(((PyObject *)__pyx_t_6));
-      __Pyx_INCREF(((PyObject *)__pyx_n_s__utf8));
-      PyTuple_SET_ITEM(__pyx_t_7, 1, ((PyObject *)__pyx_n_s__utf8));
-      __Pyx_GIVEREF(((PyObject *)__pyx_n_s__utf8));
+      PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_6);
+      __Pyx_GIVEREF(__pyx_t_6);
+      __Pyx_INCREF(__pyx_n_s_utf8);
+      PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_n_s_utf8);
+      __Pyx_GIVEREF(__pyx_n_s_utf8);
       __pyx_t_6 = 0;
-      __pyx_t_6 = PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), ((PyObject *)__pyx_t_7), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_6 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), __pyx_t_7, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_6);
-      __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0;
-      __Pyx_XGOTREF(((PyObject *)__pyx_cur_scope->__pyx_v_f_tree));
-      __Pyx_XDECREF(((PyObject *)__pyx_cur_scope->__pyx_v_f_tree));
+      __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
+      __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_f_tree);
+      __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_f_tree, ((PyObject*)__pyx_t_6));
       __Pyx_GIVEREF(__pyx_t_6);
-      __pyx_cur_scope->__pyx_v_f_tree = ((PyObject*)__pyx_t_6);
       __pyx_t_6 = 0;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":75
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":75
  *                 if not f_derivation or not e_derivation: break
  *                 f_tree = unicode(GetString(f_derivation._yield).c_str(), 'utf8')
  *                 e_tree = unicode(GetString(e_derivation._yield).c_str(), 'utf8')             # <<<<<<<<<<<<<<
  *                 yield (f_tree, e_tree)
  *         finally:
  */
-      __pyx_t_6 = __Pyx_PyBytes_FromString(TD::GetString(__pyx_cur_scope->__pyx_v_e_derivation->yield).c_str()); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L5;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_6));
-      __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_6 = __Pyx_PyBytes_FromString(TD::GetString(__pyx_cur_scope->__pyx_v_e_derivation->yield).c_str()); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
+      __Pyx_GOTREF(__pyx_t_6);
+      __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_7);
-      PyTuple_SET_ITEM(__pyx_t_7, 0, ((PyObject *)__pyx_t_6));
-      __Pyx_GIVEREF(((PyObject *)__pyx_t_6));
-      __Pyx_INCREF(((PyObject *)__pyx_n_s__utf8));
-      PyTuple_SET_ITEM(__pyx_t_7, 1, ((PyObject *)__pyx_n_s__utf8));
-      __Pyx_GIVEREF(((PyObject *)__pyx_n_s__utf8));
+      PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_6);
+      __Pyx_GIVEREF(__pyx_t_6);
+      __Pyx_INCREF(__pyx_n_s_utf8);
+      PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_n_s_utf8);
+      __Pyx_GIVEREF(__pyx_n_s_utf8);
       __pyx_t_6 = 0;
-      __pyx_t_6 = PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), ((PyObject *)__pyx_t_7), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_6 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), __pyx_t_7, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_6);
-      __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0;
-      __Pyx_XGOTREF(((PyObject *)__pyx_cur_scope->__pyx_v_e_tree));
-      __Pyx_XDECREF(((PyObject *)__pyx_cur_scope->__pyx_v_e_tree));
+      __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
+      __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_e_tree);
+      __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_e_tree, ((PyObject*)__pyx_t_6));
       __Pyx_GIVEREF(__pyx_t_6);
-      __pyx_cur_scope->__pyx_v_e_tree = ((PyObject*)__pyx_t_6);
       __pyx_t_6 = 0;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":76
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":76
  *                 f_tree = unicode(GetString(f_derivation._yield).c_str(), 'utf8')
  *                 e_tree = unicode(GetString(e_derivation._yield).c_str(), 'utf8')
  *                 yield (f_tree, e_tree)             # <<<<<<<<<<<<<<
  *         finally:
  *             del f_derivations
  */
-      __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_6);
-      __Pyx_INCREF(((PyObject *)__pyx_cur_scope->__pyx_v_f_tree));
-      PyTuple_SET_ITEM(__pyx_t_6, 0, ((PyObject *)__pyx_cur_scope->__pyx_v_f_tree));
-      __Pyx_GIVEREF(((PyObject *)__pyx_cur_scope->__pyx_v_f_tree));
-      __Pyx_INCREF(((PyObject *)__pyx_cur_scope->__pyx_v_e_tree));
-      PyTuple_SET_ITEM(__pyx_t_6, 1, ((PyObject *)__pyx_cur_scope->__pyx_v_e_tree));
-      __Pyx_GIVEREF(((PyObject *)__pyx_cur_scope->__pyx_v_e_tree));
-      __pyx_r = ((PyObject *)__pyx_t_6);
+      __Pyx_INCREF(__pyx_cur_scope->__pyx_v_f_tree);
+      PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_cur_scope->__pyx_v_f_tree);
+      __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_f_tree);
+      __Pyx_INCREF(__pyx_cur_scope->__pyx_v_e_tree);
+      PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_cur_scope->__pyx_v_e_tree);
+      __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_e_tree);
+      __pyx_r = __pyx_t_6;
       __pyx_t_6 = 0;
       __pyx_cur_scope->__pyx_t_0 = __pyx_t_1;
       __pyx_cur_scope->__pyx_t_1 = __pyx_t_2;
@@ -9993,12 +10859,12 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_17generator5(__pyx_Generator
       __pyx_L10_resume_from_yield:;
       __pyx_t_1 = __pyx_cur_scope->__pyx_t_0;
       __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
-      if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
     }
     __pyx_L8_break:;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":78
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":78
  *                 yield (f_tree, e_tree)
  *         finally:
  *             del f_derivations             # <<<<<<<<<<<<<<
@@ -10006,41 +10872,79 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_17generator5(__pyx_Generator
  * 
  */
   /*finally:*/ {
-    int __pyx_why;
-    PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;
-    int __pyx_exc_lineno;
-    __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;
-    __pyx_why = 0; goto __pyx_L6;
-    __pyx_L5: {
-      __pyx_why = 4;
-      __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;
-      __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;
-      __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);
-      __pyx_exc_lineno = __pyx_lineno;
+    /*normal exit:*/{
+      delete __pyx_cur_scope->__pyx_v_f_derivations;
+
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":79
+ *         finally:
+ *             del f_derivations
+ *             del e_derivations             # <<<<<<<<<<<<<<
+ * 
+ *     def kbest_features(self, size):
+ */
+      delete __pyx_cur_scope->__pyx_v_e_derivations;
       goto __pyx_L6;
     }
-    __pyx_L6:;
-    delete __pyx_cur_scope->__pyx_v_f_derivations;
+    /*exception exit:*/{
+      __pyx_L5_error:;
+      __pyx_t_11 = 0; __pyx_t_12 = 0; __pyx_t_13 = 0; __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0;
+      __Pyx_XDECREF(__pyx_t_7); __pyx_t_7 = 0;
+      __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0;
+      if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_14, &__pyx_t_15, &__pyx_t_16);
+      if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_11, &__pyx_t_12, &__pyx_t_13) < 0)) __Pyx_ErrFetch(&__pyx_t_11, &__pyx_t_12, &__pyx_t_13);
+      __Pyx_XGOTREF(__pyx_t_11);
+      __Pyx_XGOTREF(__pyx_t_12);
+      __Pyx_XGOTREF(__pyx_t_13);
+      __Pyx_XGOTREF(__pyx_t_14);
+      __Pyx_XGOTREF(__pyx_t_15);
+      __Pyx_XGOTREF(__pyx_t_16);
+      __pyx_t_8 = __pyx_lineno; __pyx_t_9 = __pyx_clineno; __pyx_t_10 = __pyx_filename;
+      {
+
+        /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":78
+ *                 yield (f_tree, e_tree)
+ *         finally:
+ *             del f_derivations             # <<<<<<<<<<<<<<
+ *             del e_derivations
+ * 
+ */
+        delete __pyx_cur_scope->__pyx_v_f_derivations;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":79
+        /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":79
  *         finally:
  *             del f_derivations
  *             del e_derivations             # <<<<<<<<<<<<<<
  * 
  *     def kbest_features(self, size):
  */
-    delete __pyx_cur_scope->__pyx_v_e_derivations;
-    switch (__pyx_why) {
-      case 4: {
-        __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);
-        __pyx_lineno = __pyx_exc_lineno;
-        __pyx_exc_type = 0;
-        __pyx_exc_value = 0;
-        __pyx_exc_tb = 0;
-        goto __pyx_L1_error;
+        delete __pyx_cur_scope->__pyx_v_e_derivations;
+      }
+      if (PY_MAJOR_VERSION >= 3) {
+        __Pyx_XGIVEREF(__pyx_t_14);
+        __Pyx_XGIVEREF(__pyx_t_15);
+        __Pyx_XGIVEREF(__pyx_t_16);
+        __Pyx_ExceptionReset(__pyx_t_14, __pyx_t_15, __pyx_t_16);
       }
+      __Pyx_XGIVEREF(__pyx_t_11);
+      __Pyx_XGIVEREF(__pyx_t_12);
+      __Pyx_XGIVEREF(__pyx_t_13);
+      __Pyx_ErrRestore(__pyx_t_11, __pyx_t_12, __pyx_t_13);
+      __pyx_t_11 = 0; __pyx_t_12 = 0; __pyx_t_13 = 0; __pyx_t_14 = 0; __pyx_t_15 = 0; __pyx_t_16 = 0;
+      __pyx_lineno = __pyx_t_8; __pyx_clineno = __pyx_t_9; __pyx_filename = __pyx_t_10;
+      goto __pyx_L1_error;
     }
+    __pyx_L6:;
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":62
+ *             del derivations
+ * 
+ *     def kbest_trees(self, size):             # <<<<<<<<<<<<<<
+ *         """hg.kbest_trees(size) -> List of k-best trees in the hypergraph."""
+ *         cdef kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal]* f_derivations = new kbest.KBestDerivations[vector[WordID], kbest.FTreeTraversal](self.hg[0], size)
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -10056,6 +10960,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_17generator5(__pyx_Generator
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_20generator6(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":81
+ *             del e_derivations
+ * 
+ *     def kbest_features(self, size):             # <<<<<<<<<<<<<<
+ *         """hg.kbest_trees(size) -> List of k-best feature vectors in the hypergraph."""
+ *         cdef kbest.KBestDerivations[FastSparseVector[weight_t], kbest.FeatureVectorTraversal]* derivations = new kbest.KBestDerivations[FastSparseVector[weight_t], kbest.FeatureVectorTraversal](self.hg[0], size)
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_19kbest_features(PyObject *__pyx_v_self, PyObject *__pyx_v_size); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_18kbest_features[] = "hg.kbest_trees(size) -> List of k-best feature vectors in the hypergraph.";
@@ -10064,18 +10976,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_19kbest_features(PyObject *_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("kbest_features (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_18kbest_features(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self), ((PyObject *)__pyx_v_size));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":81
- *             del e_derivations
- * 
- *     def kbest_features(self, size):             # <<<<<<<<<<<<<<
- *         """hg.kbest_trees(size) -> List of k-best feature vectors in the hypergraph."""
- *         cdef kbest.KBestDerivations[FastSparseVector[weight_t], kbest.FeatureVectorTraversal]* derivations = new kbest.KBestDerivations[FastSparseVector[weight_t], kbest.FeatureVectorTraversal](self.hg[0], size)
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_18kbest_features(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self, PyObject *__pyx_v_size) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -10103,6 +11009,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_18kbest_features(struct __py
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -10123,6 +11030,15 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_20generator6(__pyx_Generator
   long __pyx_t_2;
   int __pyx_t_3;
   PyObject *__pyx_t_4 = NULL;
+  int __pyx_t_5;
+  int __pyx_t_6;
+  char const *__pyx_t_7;
+  PyObject *__pyx_t_8 = NULL;
+  PyObject *__pyx_t_9 = NULL;
+  PyObject *__pyx_t_10 = NULL;
+  PyObject *__pyx_t_11 = NULL;
+  PyObject *__pyx_t_12 = NULL;
+  PyObject *__pyx_t_13 = NULL;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -10138,17 +11054,17 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_20generator6(__pyx_Generator
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":83
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":83
  *     def kbest_features(self, size):
  *         """hg.kbest_trees(size) -> List of k-best feature vectors in the hypergraph."""
  *         cdef kbest.KBestDerivations[FastSparseVector[weight_t], kbest.FeatureVectorTraversal]* derivations = new kbest.KBestDerivations[FastSparseVector[weight_t], kbest.FeatureVectorTraversal](self.hg[0], size)             # <<<<<<<<<<<<<<
  *         cdef kbest.KBestDerivations[FastSparseVector[weight_t], kbest.FeatureVectorTraversal].Derivation* derivation
  *         cdef SparseVector fmap
  */
-  __pyx_t_1 = __Pyx_PyInt_AsUnsignedInt(__pyx_cur_scope->__pyx_v_size); if (unlikely((__pyx_t_1 == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_As_unsigned_int(__pyx_cur_scope->__pyx_v_size); if (unlikely((__pyx_t_1 == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_cur_scope->__pyx_v_derivations = new KBest::KBestDerivations<FastSparseVector<weight_t>,FeatureVectorTraversal>((__pyx_cur_scope->__pyx_v_self->hg[0]), __pyx_t_1);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":87
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":87
  *         cdef SparseVector fmap
  *         cdef unsigned k
  *         try:             # <<<<<<<<<<<<<<
@@ -10157,18 +11073,18 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_20generator6(__pyx_Generator
  */
   /*try:*/ {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":88
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":88
  *         cdef unsigned k
  *         try:
  *             for k in range(size):             # <<<<<<<<<<<<<<
  *                 derivation = derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)
  *                 if not derivation: break
  */
-    __pyx_t_2 = __Pyx_PyInt_AsLong(__pyx_cur_scope->__pyx_v_size); if (unlikely((__pyx_t_2 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L5;}
+    __pyx_t_2 = __Pyx_PyInt_As_long(__pyx_cur_scope->__pyx_v_size); if (unlikely((__pyx_t_2 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
     for (__pyx_t_1 = 0; __pyx_t_1 < __pyx_t_2; __pyx_t_1+=1) {
       __pyx_cur_scope->__pyx_v_k = __pyx_t_1;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":89
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":89
  *         try:
  *             for k in range(size):
  *                 derivation = derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)             # <<<<<<<<<<<<<<
@@ -10177,7 +11093,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_20generator6(__pyx_Generator
  */
       __pyx_cur_scope->__pyx_v_derivation = __pyx_cur_scope->__pyx_v_derivations->LazyKthBest((__pyx_cur_scope->__pyx_v_self->hg->nodes_.size() - 1), __pyx_cur_scope->__pyx_v_k);
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":90
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":90
  *             for k in range(size):
  *                 derivation = derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)
  *                 if not derivation: break             # <<<<<<<<<<<<<<
@@ -10187,27 +11103,24 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_20generator6(__pyx_Generator
       __pyx_t_3 = ((!(__pyx_cur_scope->__pyx_v_derivation != 0)) != 0);
       if (__pyx_t_3) {
         goto __pyx_L8_break;
-        goto __pyx_L9;
       }
-      __pyx_L9:;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":91
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":91
  *                 derivation = derivations.LazyKthBest(self.hg.nodes_.size() - 1, k)
  *                 if not derivation: break
  *                 fmap = SparseVector.__new__(SparseVector)             # <<<<<<<<<<<<<<
  *                 fmap.vector = new FastSparseVector[weight_t](derivation._yield)
  *                 yield fmap
  */
-      __pyx_t_4 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_4 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_4);
-      if (!(likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_4cdec_5_cdec_SparseVector)))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      if (!(likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_4cdec_5_cdec_SparseVector)))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_XGOTREF(((PyObject *)__pyx_cur_scope->__pyx_v_fmap));
-      __Pyx_XDECREF(((PyObject *)__pyx_cur_scope->__pyx_v_fmap));
+      __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_fmap, ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_t_4));
       __Pyx_GIVEREF(__pyx_t_4);
-      __pyx_cur_scope->__pyx_v_fmap = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_t_4);
       __pyx_t_4 = 0;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":92
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":92
  *                 if not derivation: break
  *                 fmap = SparseVector.__new__(SparseVector)
  *                 fmap.vector = new FastSparseVector[weight_t](derivation._yield)             # <<<<<<<<<<<<<<
@@ -10216,7 +11129,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_20generator6(__pyx_Generator
  */
       __pyx_cur_scope->__pyx_v_fmap->vector = new FastSparseVector<weight_t>(__pyx_cur_scope->__pyx_v_derivation->yield);
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":93
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":93
  *                 fmap = SparseVector.__new__(SparseVector)
  *                 fmap.vector = new FastSparseVector[weight_t](derivation._yield)
  *                 yield fmap             # <<<<<<<<<<<<<<
@@ -10235,12 +11148,12 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_20generator6(__pyx_Generator
       __pyx_L10_resume_from_yield:;
       __pyx_t_1 = __pyx_cur_scope->__pyx_t_0;
       __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
-      if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
     }
     __pyx_L8_break:;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":95
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":95
  *                 yield fmap
  *         finally:
  *             del derivations             # <<<<<<<<<<<<<<
@@ -10248,31 +11161,52 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_20generator6(__pyx_Generator
  *     def sample(self, unsigned n):
  */
   /*finally:*/ {
-    int __pyx_why;
-    PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;
-    int __pyx_exc_lineno;
-    __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;
-    __pyx_why = 0; goto __pyx_L6;
-    __pyx_L5: {
-      __pyx_why = 4;
-      __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);
-      __pyx_exc_lineno = __pyx_lineno;
+    /*normal exit:*/{
+      delete __pyx_cur_scope->__pyx_v_derivations;
       goto __pyx_L6;
     }
-    __pyx_L6:;
-    delete __pyx_cur_scope->__pyx_v_derivations;
-    switch (__pyx_why) {
-      case 4: {
-        __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);
-        __pyx_lineno = __pyx_exc_lineno;
-        __pyx_exc_type = 0;
-        __pyx_exc_value = 0;
-        __pyx_exc_tb = 0;
-        goto __pyx_L1_error;
+    /*exception exit:*/{
+      __pyx_L5_error:;
+      __pyx_t_8 = 0; __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; __pyx_t_12 = 0; __pyx_t_13 = 0;
+      __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
+      if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_11, &__pyx_t_12, &__pyx_t_13);
+      if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_8, &__pyx_t_9, &__pyx_t_10) < 0)) __Pyx_ErrFetch(&__pyx_t_8, &__pyx_t_9, &__pyx_t_10);
+      __Pyx_XGOTREF(__pyx_t_8);
+      __Pyx_XGOTREF(__pyx_t_9);
+      __Pyx_XGOTREF(__pyx_t_10);
+      __Pyx_XGOTREF(__pyx_t_11);
+      __Pyx_XGOTREF(__pyx_t_12);
+      __Pyx_XGOTREF(__pyx_t_13);
+      __pyx_t_5 = __pyx_lineno; __pyx_t_6 = __pyx_clineno; __pyx_t_7 = __pyx_filename;
+      {
+        delete __pyx_cur_scope->__pyx_v_derivations;
       }
+      if (PY_MAJOR_VERSION >= 3) {
+        __Pyx_XGIVEREF(__pyx_t_11);
+        __Pyx_XGIVEREF(__pyx_t_12);
+        __Pyx_XGIVEREF(__pyx_t_13);
+        __Pyx_ExceptionReset(__pyx_t_11, __pyx_t_12, __pyx_t_13);
+      }
+      __Pyx_XGIVEREF(__pyx_t_8);
+      __Pyx_XGIVEREF(__pyx_t_9);
+      __Pyx_XGIVEREF(__pyx_t_10);
+      __Pyx_ErrRestore(__pyx_t_8, __pyx_t_9, __pyx_t_10);
+      __pyx_t_8 = 0; __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; __pyx_t_12 = 0; __pyx_t_13 = 0;
+      __pyx_lineno = __pyx_t_5; __pyx_clineno = __pyx_t_6; __pyx_filename = __pyx_t_7;
+      goto __pyx_L1_error;
     }
+    __pyx_L6:;
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":81
+ *             del e_derivations
+ * 
+ *     def kbest_features(self, size):             # <<<<<<<<<<<<<<
+ *         """hg.kbest_trees(size) -> List of k-best feature vectors in the hypergraph."""
+ *         cdef kbest.KBestDerivations[FastSparseVector[weight_t], kbest.FeatureVectorTraversal]* derivations = new kbest.KBestDerivations[FastSparseVector[weight_t], kbest.FeatureVectorTraversal](self.hg[0], size)
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -10287,6 +11221,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_20generator6(__pyx_Generator
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_23generator7(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":97
+ *             del derivations
+ * 
+ *     def sample(self, unsigned n):             # <<<<<<<<<<<<<<
+ *         """hg.sample(n) -> Sample of n hypotheses from the hypergraph."""
+ *         cdef vector[hypergraph.Hypothesis]* hypos = new vector[hypergraph.Hypothesis]()
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_22sample(PyObject *__pyx_v_self, PyObject *__pyx_arg_n); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_21sample[] = "hg.sample(n) -> Sample of n hypotheses from the hypergraph.";
@@ -10299,7 +11241,7 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_22sample(PyObject *__pyx_v_s
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("sample (wrapper)", 0);
   assert(__pyx_arg_n); {
-    __pyx_v_n = __Pyx_PyInt_AsUnsignedInt(__pyx_arg_n); if (unlikely((__pyx_v_n == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    __pyx_v_n = __Pyx_PyInt_As_unsigned_int(__pyx_arg_n); if (unlikely((__pyx_v_n == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -10308,18 +11250,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_22sample(PyObject *__pyx_v_s
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_21sample(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self), ((unsigned int)__pyx_v_n));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":97
- *             del derivations
- * 
- *     def sample(self, unsigned n):             # <<<<<<<<<<<<<<
- *         """hg.sample(n) -> Sample of n hypotheses from the hypergraph."""
- *         cdef vector[hypergraph.Hypothesis]* hypos = new vector[hypergraph.Hypothesis]()
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_21sample(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self, unsigned int __pyx_v_n) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -10345,6 +11281,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_21sample(struct __pyx_obj_4c
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -10366,6 +11303,15 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_23generator7(__pyx_Generator
   unsigned int __pyx_t_3;
   PyObject *__pyx_t_4 = NULL;
   PyObject *__pyx_t_5 = NULL;
+  int __pyx_t_6;
+  int __pyx_t_7;
+  char const *__pyx_t_8;
+  PyObject *__pyx_t_9 = NULL;
+  PyObject *__pyx_t_10 = NULL;
+  PyObject *__pyx_t_11 = NULL;
+  PyObject *__pyx_t_12 = NULL;
+  PyObject *__pyx_t_13 = NULL;
+  PyObject *__pyx_t_14 = NULL;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -10381,7 +11327,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_23generator7(__pyx_Generator
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":99
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":99
  *     def sample(self, unsigned n):
  *         """hg.sample(n) -> Sample of n hypotheses from the hypergraph."""
  *         cdef vector[hypergraph.Hypothesis]* hypos = new vector[hypergraph.Hypothesis]()             # <<<<<<<<<<<<<<
@@ -10396,7 +11342,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_23generator7(__pyx_Generator
   }
   __pyx_cur_scope->__pyx_v_hypos = __pyx_t_1;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":100
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":100
  *         """hg.sample(n) -> Sample of n hypotheses from the hypergraph."""
  *         cdef vector[hypergraph.Hypothesis]* hypos = new vector[hypergraph.Hypothesis]()
  *         hypergraph.sample_hypotheses(self.hg[0], n, self._rng(), hypos)             # <<<<<<<<<<<<<<
@@ -10405,7 +11351,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_23generator7(__pyx_Generator
  */
   HypergraphSampler::sample_hypotheses((__pyx_cur_scope->__pyx_v_self->hg[0]), __pyx_cur_scope->__pyx_v_n, ((struct __pyx_vtabstruct_4cdec_5_cdec_Hypergraph *)__pyx_cur_scope->__pyx_v_self->__pyx_vtab)->_rng(__pyx_cur_scope->__pyx_v_self), __pyx_cur_scope->__pyx_v_hypos);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":102
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":102
  *         hypergraph.sample_hypotheses(self.hg[0], n, self._rng(), hypos)
  *         cdef unsigned k
  *         try:             # <<<<<<<<<<<<<<
@@ -10414,7 +11360,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_23generator7(__pyx_Generator
  */
   /*try:*/ {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":103
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":103
  *         cdef unsigned k
  *         try:
  *             for k in range(hypos.size()):             # <<<<<<<<<<<<<<
@@ -10425,26 +11371,26 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_23generator7(__pyx_Generator
     for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {
       __pyx_cur_scope->__pyx_v_k = __pyx_t_3;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":104
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":104
  *         try:
  *             for k in range(hypos.size()):
  *                 yield unicode(GetString(hypos[0][k].words).c_str(), 'utf8')             # <<<<<<<<<<<<<<
  *         finally:
  *             del hypos
  */
-      __pyx_t_4 = __Pyx_PyBytes_FromString(TD::GetString(((__pyx_cur_scope->__pyx_v_hypos[0])[__pyx_cur_scope->__pyx_v_k]).words).c_str()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L5;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_4));
-      __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_4 = __Pyx_PyBytes_FromString(TD::GetString(((__pyx_cur_scope->__pyx_v_hypos[0])[__pyx_cur_scope->__pyx_v_k]).words).c_str()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
+      __Pyx_GOTREF(__pyx_t_4);
+      __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_5);
-      PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_t_4));
-      __Pyx_GIVEREF(((PyObject *)__pyx_t_4));
-      __Pyx_INCREF(((PyObject *)__pyx_n_s__utf8));
-      PyTuple_SET_ITEM(__pyx_t_5, 1, ((PyObject *)__pyx_n_s__utf8));
-      __Pyx_GIVEREF(((PyObject *)__pyx_n_s__utf8));
+      PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4);
+      __Pyx_GIVEREF(__pyx_t_4);
+      __Pyx_INCREF(__pyx_n_s_utf8);
+      PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_n_s_utf8);
+      __Pyx_GIVEREF(__pyx_n_s_utf8);
       __pyx_t_4 = 0;
-      __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_4);
-      __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
+      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       __pyx_r = __pyx_t_4;
       __pyx_t_4 = 0;
       __pyx_cur_scope->__pyx_t_0 = __pyx_t_2;
@@ -10457,11 +11403,11 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_23generator7(__pyx_Generator
       __pyx_L9_resume_from_yield:;
       __pyx_t_2 = __pyx_cur_scope->__pyx_t_0;
       __pyx_t_3 = __pyx_cur_scope->__pyx_t_1;
-      if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
     }
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":106
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":106
  *                 yield unicode(GetString(hypos[0][k].words).c_str(), 'utf8')
  *         finally:
  *             del hypos             # <<<<<<<<<<<<<<
@@ -10469,32 +11415,53 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_23generator7(__pyx_Generator
  *     def sample_trees(self, unsigned n):
  */
   /*finally:*/ {
-    int __pyx_why;
-    PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;
-    int __pyx_exc_lineno;
-    __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;
-    __pyx_why = 0; goto __pyx_L6;
-    __pyx_L5: {
-      __pyx_why = 4;
-      __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
-      __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);
-      __pyx_exc_lineno = __pyx_lineno;
+    /*normal exit:*/{
+      delete __pyx_cur_scope->__pyx_v_hypos;
       goto __pyx_L6;
     }
-    __pyx_L6:;
-    delete __pyx_cur_scope->__pyx_v_hypos;
-    switch (__pyx_why) {
-      case 4: {
-        __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);
-        __pyx_lineno = __pyx_exc_lineno;
-        __pyx_exc_type = 0;
-        __pyx_exc_value = 0;
-        __pyx_exc_tb = 0;
-        goto __pyx_L1_error;
+    /*exception exit:*/{
+      __pyx_L5_error:;
+      __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; __pyx_t_12 = 0; __pyx_t_13 = 0; __pyx_t_14 = 0;
+      __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
+      __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
+      if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_12, &__pyx_t_13, &__pyx_t_14);
+      if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11) < 0)) __Pyx_ErrFetch(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11);
+      __Pyx_XGOTREF(__pyx_t_9);
+      __Pyx_XGOTREF(__pyx_t_10);
+      __Pyx_XGOTREF(__pyx_t_11);
+      __Pyx_XGOTREF(__pyx_t_12);
+      __Pyx_XGOTREF(__pyx_t_13);
+      __Pyx_XGOTREF(__pyx_t_14);
+      __pyx_t_6 = __pyx_lineno; __pyx_t_7 = __pyx_clineno; __pyx_t_8 = __pyx_filename;
+      {
+        delete __pyx_cur_scope->__pyx_v_hypos;
+      }
+      if (PY_MAJOR_VERSION >= 3) {
+        __Pyx_XGIVEREF(__pyx_t_12);
+        __Pyx_XGIVEREF(__pyx_t_13);
+        __Pyx_XGIVEREF(__pyx_t_14);
+        __Pyx_ExceptionReset(__pyx_t_12, __pyx_t_13, __pyx_t_14);
       }
+      __Pyx_XGIVEREF(__pyx_t_9);
+      __Pyx_XGIVEREF(__pyx_t_10);
+      __Pyx_XGIVEREF(__pyx_t_11);
+      __Pyx_ErrRestore(__pyx_t_9, __pyx_t_10, __pyx_t_11);
+      __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; __pyx_t_12 = 0; __pyx_t_13 = 0; __pyx_t_14 = 0;
+      __pyx_lineno = __pyx_t_6; __pyx_clineno = __pyx_t_7; __pyx_filename = __pyx_t_8;
+      goto __pyx_L1_error;
     }
+    __pyx_L6:;
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":97
+ *             del derivations
+ * 
+ *     def sample(self, unsigned n):             # <<<<<<<<<<<<<<
+ *         """hg.sample(n) -> Sample of n hypotheses from the hypergraph."""
+ *         cdef vector[hypergraph.Hypothesis]* hypos = new vector[hypergraph.Hypothesis]()
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -10510,6 +11477,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_23generator7(__pyx_Generator
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_26generator8(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":108
+ *             del hypos
+ * 
+ *     def sample_trees(self, unsigned n):             # <<<<<<<<<<<<<<
+ *        """hg.sample_trees(n) -> Sample of n trees from the hypergraph."""
+ *        cdef vector[string]* trees = new vector[string]()
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_25sample_trees(PyObject *__pyx_v_self, PyObject *__pyx_arg_n); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_24sample_trees[] = "hg.sample_trees(n) -> Sample of n trees from the hypergraph.";
@@ -10522,7 +11497,7 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_25sample_trees(PyObject *__p
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("sample_trees (wrapper)", 0);
   assert(__pyx_arg_n); {
-    __pyx_v_n = __Pyx_PyInt_AsUnsignedInt(__pyx_arg_n); if (unlikely((__pyx_v_n == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    __pyx_v_n = __Pyx_PyInt_As_unsigned_int(__pyx_arg_n); if (unlikely((__pyx_v_n == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -10531,18 +11506,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_25sample_trees(PyObject *__p
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_24sample_trees(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self), ((unsigned int)__pyx_v_n));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":108
- *             del hypos
- * 
- *     def sample_trees(self, unsigned n):             # <<<<<<<<<<<<<<
- *        """hg.sample_trees(n) -> Sample of n trees from the hypergraph."""
- *        cdef vector[string]* trees = new vector[string]()
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_24sample_trees(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self, unsigned int __pyx_v_n) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -10568,6 +11537,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_24sample_trees(struct __pyx_
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -10589,6 +11559,15 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_26generator8(__pyx_Generator
   unsigned int __pyx_t_3;
   PyObject *__pyx_t_4 = NULL;
   PyObject *__pyx_t_5 = NULL;
+  int __pyx_t_6;
+  int __pyx_t_7;
+  char const *__pyx_t_8;
+  PyObject *__pyx_t_9 = NULL;
+  PyObject *__pyx_t_10 = NULL;
+  PyObject *__pyx_t_11 = NULL;
+  PyObject *__pyx_t_12 = NULL;
+  PyObject *__pyx_t_13 = NULL;
+  PyObject *__pyx_t_14 = NULL;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -10604,7 +11583,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_26generator8(__pyx_Generator
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":110
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":110
  *     def sample_trees(self, unsigned n):
  *        """hg.sample_trees(n) -> Sample of n trees from the hypergraph."""
  *        cdef vector[string]* trees = new vector[string]()             # <<<<<<<<<<<<<<
@@ -10619,7 +11598,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_26generator8(__pyx_Generator
   }
   __pyx_cur_scope->__pyx_v_trees = __pyx_t_1;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":111
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":111
  *        """hg.sample_trees(n) -> Sample of n trees from the hypergraph."""
  *        cdef vector[string]* trees = new vector[string]()
  *        hypergraph.sample_trees(self.hg[0], n, self._rng(), trees)             # <<<<<<<<<<<<<<
@@ -10628,7 +11607,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_26generator8(__pyx_Generator
  */
   HypergraphSampler::sample_trees((__pyx_cur_scope->__pyx_v_self->hg[0]), __pyx_cur_scope->__pyx_v_n, ((struct __pyx_vtabstruct_4cdec_5_cdec_Hypergraph *)__pyx_cur_scope->__pyx_v_self->__pyx_vtab)->_rng(__pyx_cur_scope->__pyx_v_self), __pyx_cur_scope->__pyx_v_trees);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":113
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":113
  *        hypergraph.sample_trees(self.hg[0], n, self._rng(), trees)
  *        cdef unsigned k
  *        try:             # <<<<<<<<<<<<<<
@@ -10637,7 +11616,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_26generator8(__pyx_Generator
  */
   /*try:*/ {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":114
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":114
  *        cdef unsigned k
  *        try:
  *            for k in range(trees.size()):             # <<<<<<<<<<<<<<
@@ -10648,26 +11627,26 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_26generator8(__pyx_Generator
     for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {
       __pyx_cur_scope->__pyx_v_k = __pyx_t_3;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":115
+      /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":115
  *        try:
  *            for k in range(trees.size()):
  *                yield unicode(trees[0][k].c_str(), 'utf8')             # <<<<<<<<<<<<<<
  *        finally:
  *            del trees
  */
-      __pyx_t_4 = __Pyx_PyBytes_FromString(((__pyx_cur_scope->__pyx_v_trees[0])[__pyx_cur_scope->__pyx_v_k]).c_str()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L5;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_4));
-      __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_4 = __Pyx_PyBytes_FromString(((__pyx_cur_scope->__pyx_v_trees[0])[__pyx_cur_scope->__pyx_v_k]).c_str()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
+      __Pyx_GOTREF(__pyx_t_4);
+      __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_5);
-      PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_t_4));
-      __Pyx_GIVEREF(((PyObject *)__pyx_t_4));
-      __Pyx_INCREF(((PyObject *)__pyx_n_s__utf8));
-      PyTuple_SET_ITEM(__pyx_t_5, 1, ((PyObject *)__pyx_n_s__utf8));
-      __Pyx_GIVEREF(((PyObject *)__pyx_n_s__utf8));
+      PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4);
+      __Pyx_GIVEREF(__pyx_t_4);
+      __Pyx_INCREF(__pyx_n_s_utf8);
+      PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_n_s_utf8);
+      __Pyx_GIVEREF(__pyx_n_s_utf8);
       __pyx_t_4 = 0;
-      __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
       __Pyx_GOTREF(__pyx_t_4);
-      __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
+      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       __pyx_r = __pyx_t_4;
       __pyx_t_4 = 0;
       __pyx_cur_scope->__pyx_t_0 = __pyx_t_2;
@@ -10680,11 +11659,11 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_26generator8(__pyx_Generator
       __pyx_L9_resume_from_yield:;
       __pyx_t_2 = __pyx_cur_scope->__pyx_t_0;
       __pyx_t_3 = __pyx_cur_scope->__pyx_t_1;
-      if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L5;}
+      if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L5_error;}
     }
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":117
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":117
  *                yield unicode(trees[0][k].c_str(), 'utf8')
  *        finally:
  *            del trees             # <<<<<<<<<<<<<<
@@ -10692,32 +11671,53 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_26generator8(__pyx_Generator
  *     def intersect(self, inp):
  */
   /*finally:*/ {
-    int __pyx_why;
-    PyObject *__pyx_exc_type, *__pyx_exc_value, *__pyx_exc_tb;
-    int __pyx_exc_lineno;
-    __pyx_exc_type = 0; __pyx_exc_value = 0; __pyx_exc_tb = 0; __pyx_exc_lineno = 0;
-    __pyx_why = 0; goto __pyx_L6;
-    __pyx_L5: {
-      __pyx_why = 4;
-      __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
-      __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __Pyx_ErrFetch(&__pyx_exc_type, &__pyx_exc_value, &__pyx_exc_tb);
-      __pyx_exc_lineno = __pyx_lineno;
+    /*normal exit:*/{
+      delete __pyx_cur_scope->__pyx_v_trees;
       goto __pyx_L6;
     }
-    __pyx_L6:;
-    delete __pyx_cur_scope->__pyx_v_trees;
-    switch (__pyx_why) {
-      case 4: {
-        __Pyx_ErrRestore(__pyx_exc_type, __pyx_exc_value, __pyx_exc_tb);
-        __pyx_lineno = __pyx_exc_lineno;
-        __pyx_exc_type = 0;
-        __pyx_exc_value = 0;
-        __pyx_exc_tb = 0;
-        goto __pyx_L1_error;
+    /*exception exit:*/{
+      __pyx_L5_error:;
+      __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; __pyx_t_12 = 0; __pyx_t_13 = 0; __pyx_t_14 = 0;
+      __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0;
+      __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
+      if (PY_MAJOR_VERSION >= 3) __Pyx_ExceptionSwap(&__pyx_t_12, &__pyx_t_13, &__pyx_t_14);
+      if ((PY_MAJOR_VERSION < 3) || unlikely(__Pyx_GetException(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11) < 0)) __Pyx_ErrFetch(&__pyx_t_9, &__pyx_t_10, &__pyx_t_11);
+      __Pyx_XGOTREF(__pyx_t_9);
+      __Pyx_XGOTREF(__pyx_t_10);
+      __Pyx_XGOTREF(__pyx_t_11);
+      __Pyx_XGOTREF(__pyx_t_12);
+      __Pyx_XGOTREF(__pyx_t_13);
+      __Pyx_XGOTREF(__pyx_t_14);
+      __pyx_t_6 = __pyx_lineno; __pyx_t_7 = __pyx_clineno; __pyx_t_8 = __pyx_filename;
+      {
+        delete __pyx_cur_scope->__pyx_v_trees;
+      }
+      if (PY_MAJOR_VERSION >= 3) {
+        __Pyx_XGIVEREF(__pyx_t_12);
+        __Pyx_XGIVEREF(__pyx_t_13);
+        __Pyx_XGIVEREF(__pyx_t_14);
+        __Pyx_ExceptionReset(__pyx_t_12, __pyx_t_13, __pyx_t_14);
       }
+      __Pyx_XGIVEREF(__pyx_t_9);
+      __Pyx_XGIVEREF(__pyx_t_10);
+      __Pyx_XGIVEREF(__pyx_t_11);
+      __Pyx_ErrRestore(__pyx_t_9, __pyx_t_10, __pyx_t_11);
+      __pyx_t_9 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; __pyx_t_12 = 0; __pyx_t_13 = 0; __pyx_t_14 = 0;
+      __pyx_lineno = __pyx_t_6; __pyx_clineno = __pyx_t_7; __pyx_filename = __pyx_t_8;
+      goto __pyx_L1_error;
     }
+    __pyx_L6:;
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":108
+ *             del hypos
+ * 
+ *     def sample_trees(self, unsigned n):             # <<<<<<<<<<<<<<
+ *        """hg.sample_trees(n) -> Sample of n trees from the hypergraph."""
+ *        cdef vector[string]* trees = new vector[string]()
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -10732,6 +11732,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_26generator8(__pyx_Generator
   return NULL;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":119
+ *            del trees
+ * 
+ *     def intersect(self, inp):             # <<<<<<<<<<<<<<
+ *         """hg.intersect(Lattice/string): Intersect the hypergraph with the provided reference."""
+ *         cdef Lattice lat
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_28intersect(PyObject *__pyx_v_self, PyObject *__pyx_v_inp); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_27intersect[] = "hg.intersect(Lattice/string): Intersect the hypergraph with the provided reference.";
@@ -10740,18 +11748,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_28intersect(PyObject *__pyx_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("intersect (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_27intersect(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self), ((PyObject *)__pyx_v_inp));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":119
- *            del trees
- * 
- *     def intersect(self, inp):             # <<<<<<<<<<<<<<
- *         """hg.intersect(Lattice/string): Intersect the hypergraph with the provided reference."""
- *         cdef Lattice lat
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_27intersect(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self, PyObject *__pyx_v_inp) {
   struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_lat = 0;
   PyObject *__pyx_r = NULL;
@@ -10765,7 +11767,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_27intersect(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("intersect", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":122
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":122
  *         """hg.intersect(Lattice/string): Intersect the hypergraph with the provided reference."""
  *         cdef Lattice lat
  *         if isinstance(inp, Lattice):             # <<<<<<<<<<<<<<
@@ -10776,19 +11778,21 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_27intersect(struct __pyx_obj
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":123
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":123
  *         cdef Lattice lat
  *         if isinstance(inp, Lattice):
  *             lat = <Lattice> inp             # <<<<<<<<<<<<<<
  *         elif isinstance(inp, basestring):
  *             lat = Lattice(inp)
  */
-    __Pyx_INCREF(((PyObject *)((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_v_inp)));
-    __pyx_v_lat = ((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_v_inp);
+    __pyx_t_3 = __pyx_v_inp;
+    __Pyx_INCREF(__pyx_t_3);
+    __pyx_v_lat = ((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_t_3);
+    __pyx_t_3 = 0;
     goto __pyx_L3;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":124
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":124
  *         if isinstance(inp, Lattice):
  *             lat = <Lattice> inp
  *         elif isinstance(inp, basestring):             # <<<<<<<<<<<<<<
@@ -10799,7 +11803,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_27intersect(struct __pyx_obj
   __pyx_t_1 = (__pyx_t_2 != 0);
   if (__pyx_t_1) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":125
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":125
  *             lat = <Lattice> inp
  *         elif isinstance(inp, basestring):
  *             lat = Lattice(inp)             # <<<<<<<<<<<<<<
@@ -10811,39 +11815,39 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_27intersect(struct __pyx_obj
     __Pyx_INCREF(__pyx_v_inp);
     PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_inp);
     __Pyx_GIVEREF(__pyx_v_inp);
-    __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Lattice)), ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Lattice)), __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __pyx_v_lat = ((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_t_4);
     __pyx_t_4 = 0;
     goto __pyx_L3;
   }
   /*else*/ {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":127
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":127
  *             lat = Lattice(inp)
  *         else:
  *             raise TypeError('cannot intersect hypergraph with %s' % type(inp))             # <<<<<<<<<<<<<<
  *         return hypergraph.Intersect(lat.lattice[0], self.hg)
  * 
  */
-    __pyx_t_4 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_15), ((PyObject *)Py_TYPE(__pyx_v_inp))); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_4));
+    __pyx_t_4 = __Pyx_PyString_Format(__pyx_kp_s_cannot_intersect_hypergraph_with, ((PyObject *)Py_TYPE(__pyx_v_inp))); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_4);
     __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_t_4));
-    __Pyx_GIVEREF(((PyObject *)__pyx_t_4));
+    PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4);
+    __Pyx_GIVEREF(__pyx_t_4);
     __pyx_t_4 = 0;
-    __pyx_t_4 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __Pyx_Raise(__pyx_t_4, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     {__pyx_filename = __pyx_f[3]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
   __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":128
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":128
  *         else:
  *             raise TypeError('cannot intersect hypergraph with %s' % type(inp))
  *         return hypergraph.Intersect(lat.lattice[0], self.hg)             # <<<<<<<<<<<<<<
@@ -10857,8 +11861,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_27intersect(struct __pyx_obj
   __pyx_t_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":119
+ *            del trees
+ * 
+ *     def intersect(self, inp):             # <<<<<<<<<<<<<<
+ *         """hg.intersect(Lattice/string): Intersect the hypergraph with the provided reference."""
+ *         cdef Lattice lat
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_3);
   __Pyx_XDECREF(__pyx_t_4);
@@ -10871,6 +11882,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_27intersect(struct __pyx_obj
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":130
+ *         return hypergraph.Intersect(lat.lattice[0], self.hg)
+ * 
+ *     def prune(self, beam_alpha=0, density=0, **kwargs):             # <<<<<<<<<<<<<<
+ *         """hg.prune(beam_alpha=0, density=0): Prune the hypergraph.
+ *         beam_alpha: use beam pruning
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_30prune(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_29prune[] = "hg.prune(beam_alpha=0, density=0): Prune the hypergraph.\n        beam_alpha: use beam pruning\n        density: use density pruning";
@@ -10887,7 +11906,7 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_30prune(PyObject *__pyx_v_se
   __pyx_v_kwargs = PyDict_New(); if (unlikely(!__pyx_v_kwargs)) return NULL;
   __Pyx_GOTREF(__pyx_v_kwargs);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__beam_alpha,&__pyx_n_s__density,0};
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_beam_alpha,&__pyx_n_s_density,0};
     PyObject* values[2] = {0,0};
     values[0] = ((PyObject *)__pyx_int_0);
     values[1] = ((PyObject *)__pyx_int_0);
@@ -10904,12 +11923,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_30prune(PyObject *__pyx_v_se
       switch (pos_args) {
         case  0:
         if (kw_args > 0) {
-          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__beam_alpha);
+          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_beam_alpha);
           if (value) { values[0] = value; kw_args--; }
         }
         case  1:
         if (kw_args > 0) {
-          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__density);
+          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_density);
           if (value) { values[1] = value; kw_args--; }
         }
       }
@@ -10937,19 +11956,13 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_30prune(PyObject *__pyx_v_se
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_29prune(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self), __pyx_v_beam_alpha, __pyx_v_density, __pyx_v_kwargs);
+
+  /* function exit code */
   __Pyx_XDECREF(__pyx_v_kwargs);
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":130
- *         return hypergraph.Intersect(lat.lattice[0], self.hg)
- * 
- *     def prune(self, beam_alpha=0, density=0, **kwargs):             # <<<<<<<<<<<<<<
- *         """hg.prune(beam_alpha=0, density=0): Prune the hypergraph.
- *         beam_alpha: use beam pruning
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_29prune(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self, PyObject *__pyx_v_beam_alpha, PyObject *__pyx_v_density, PyObject *__pyx_v_kwargs) {
   std::vector<bool> *__pyx_v_preserve_mask;
   PyObject *__pyx_r = NULL;
@@ -10963,7 +11976,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_29prune(struct __pyx_obj_4cd
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("prune", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":134
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":134
  *         beam_alpha: use beam pruning
  *         density: use density pruning"""
  *         cdef hypergraph.EdgeMask* preserve_mask = NULL             # <<<<<<<<<<<<<<
@@ -10972,18 +11985,18 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_29prune(struct __pyx_obj_4cd
  */
   __pyx_v_preserve_mask = NULL;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":135
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":135
  *         density: use density pruning"""
  *         cdef hypergraph.EdgeMask* preserve_mask = NULL
  *         if 'csplit_preserve_full_word' in kwargs:             # <<<<<<<<<<<<<<
  *              preserve_mask = new hypergraph.EdgeMask(self.hg.edges_.size())
  *              preserve_mask[0][hypergraph.GetFullWordEdgeIndex(self.hg[0])] = True
  */
-  __pyx_t_1 = (__Pyx_PyDict_Contains(((PyObject *)__pyx_n_s_16), ((PyObject *)__pyx_v_kwargs), Py_EQ)); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = (__Pyx_PyDict_Contains(__pyx_n_s_csplit_preserve_full_word, __pyx_v_kwargs, Py_EQ)); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":136
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":136
  *         cdef hypergraph.EdgeMask* preserve_mask = NULL
  *         if 'csplit_preserve_full_word' in kwargs:
  *              preserve_mask = new hypergraph.EdgeMask(self.hg.edges_.size())             # <<<<<<<<<<<<<<
@@ -10992,7 +12005,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_29prune(struct __pyx_obj_4cd
  */
     __pyx_v_preserve_mask = new std::vector<bool>(__pyx_v_self->hg->edges_.size());
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":137
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":137
  *         if 'csplit_preserve_full_word' in kwargs:
  *              preserve_mask = new hypergraph.EdgeMask(self.hg.edges_.size())
  *              preserve_mask[0][hypergraph.GetFullWordEdgeIndex(self.hg[0])] = True             # <<<<<<<<<<<<<<
@@ -11004,7 +12017,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_29prune(struct __pyx_obj_4cd
   }
   __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":138
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":138
  *              preserve_mask = new hypergraph.EdgeMask(self.hg.edges_.size())
  *              preserve_mask[0][hypergraph.GetFullWordEdgeIndex(self.hg[0])] = True
  *         self.hg.PruneInsideOutside(beam_alpha, density, preserve_mask, False, 1, False)             # <<<<<<<<<<<<<<
@@ -11015,7 +12028,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_29prune(struct __pyx_obj_4cd
   __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_v_density); if (unlikely((__pyx_t_4 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_self->hg->PruneInsideOutside(__pyx_t_3, __pyx_t_4, __pyx_v_preserve_mask, 0, 1.0, 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":139
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":139
  *              preserve_mask[0][hypergraph.GetFullWordEdgeIndex(self.hg[0])] = True
  *         self.hg.PruneInsideOutside(beam_alpha, density, preserve_mask, False, 1, False)
  *         if preserve_mask:             # <<<<<<<<<<<<<<
@@ -11025,7 +12038,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_29prune(struct __pyx_obj_4cd
   __pyx_t_2 = (__pyx_v_preserve_mask != 0);
   if (__pyx_t_2) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":140
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":140
  *         self.hg.PruneInsideOutside(beam_alpha, density, preserve_mask, False, 1, False)
  *         if preserve_mask:
  *             del preserve_mask             # <<<<<<<<<<<<<<
@@ -11037,6 +12050,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_29prune(struct __pyx_obj_4cd
   }
   __pyx_L4:;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":130
+ *         return hypergraph.Intersect(lat.lattice[0], self.hg)
+ * 
+ *     def prune(self, beam_alpha=0, density=0, **kwargs):             # <<<<<<<<<<<<<<
+ *         """hg.prune(beam_alpha=0, density=0): Prune the hypergraph.
+ *         beam_alpha: use beam pruning
+ */
+
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -11048,6 +12070,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_29prune(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":142
+ *             del preserve_mask
+ * 
+ *     def lattice(self): # TODO direct hg -> lattice conversion in cdec             # <<<<<<<<<<<<<<
+ *         """hg.lattice() -> Lattice corresponding to the hypergraph."""
+ *         cdef bytes plf = hypergraph.AsPLF(self.hg[0], True).c_str()
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_32lattice(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_31lattice[] = "hg.lattice() -> Lattice corresponding to the hypergraph.";
@@ -11056,18 +12086,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_32lattice(PyObject *__pyx_v_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("lattice (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_31lattice(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":142
- *             del preserve_mask
- * 
- *     def lattice(self): # TODO direct hg -> lattice conversion in cdec             # <<<<<<<<<<<<<<
- *         """hg.lattice() -> Lattice corresponding to the hypergraph."""
- *         cdef bytes plf = hypergraph.AsPLF(self.hg[0], True).c_str()
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_31lattice(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self) {
   PyObject *__pyx_v_plf = 0;
   PyObject *__pyx_r = NULL;
@@ -11080,7 +12104,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_31lattice(struct __pyx_obj_4
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("lattice", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":144
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":144
  *     def lattice(self): # TODO direct hg -> lattice conversion in cdec
  *         """hg.lattice() -> Lattice corresponding to the hypergraph."""
  *         cdef bytes plf = hypergraph.AsPLF(self.hg[0], True).c_str()             # <<<<<<<<<<<<<<
@@ -11088,11 +12112,11 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_31lattice(struct __pyx_obj_4
  * 
  */
   __pyx_t_1 = __Pyx_PyBytes_FromString(HypergraphIO::AsPLF((__pyx_v_self->hg[0]), 1).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_GOTREF(__pyx_t_1);
   __pyx_v_plf = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":145
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":145
  *         """hg.lattice() -> Lattice corresponding to the hypergraph."""
  *         cdef bytes plf = hypergraph.AsPLF(self.hg[0], True).c_str()
  *         return Lattice(eval(plf))             # <<<<<<<<<<<<<<
@@ -11103,41 +12127,48 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_31lattice(struct __pyx_obj_4
   __pyx_t_1 = __Pyx_Globals(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyDict_New(); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
-  if (((PyObject *)__pyx_v_plf)) {
-    if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__plf), ((PyObject *)__pyx_v_plf)) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  if (__pyx_v_plf) {
+    if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_plf, __pyx_v_plf) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
   if (((PyObject *)__pyx_v_self)) {
-    if (PyDict_SetItem(__pyx_t_2, ((PyObject *)__pyx_n_s__self), ((PyObject *)__pyx_v_self)) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_self, ((PyObject *)__pyx_v_self)) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
   __pyx_t_3 = PyTuple_New(3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_INCREF(((PyObject *)__pyx_v_plf));
-  PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_v_plf));
-  __Pyx_GIVEREF(((PyObject *)__pyx_v_plf));
-  PyTuple_SET_ITEM(__pyx_t_3, 1, ((PyObject *)__pyx_t_1));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
-  PyTuple_SET_ITEM(__pyx_t_3, 2, ((PyObject *)__pyx_t_2));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_v_plf);
+  PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_plf);
+  __Pyx_GIVEREF(__pyx_v_plf);
+  PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
+  PyTuple_SET_ITEM(__pyx_t_3, 2, __pyx_t_2);
+  __Pyx_GIVEREF(__pyx_t_2);
   __pyx_t_1 = 0;
   __pyx_t_2 = 0;
-  __pyx_t_2 = PyObject_Call(__pyx_builtin_eval, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_eval, __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_2);
   __pyx_t_2 = 0;
-  __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Lattice)), ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Lattice)), __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_r = __pyx_t_2;
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":142
+ *             del preserve_mask
+ * 
+ *     def lattice(self): # TODO direct hg -> lattice conversion in cdec             # <<<<<<<<<<<<<<
+ *         """hg.lattice() -> Lattice corresponding to the hypergraph."""
+ *         cdef bytes plf = hypergraph.AsPLF(self.hg[0], True).c_str()
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -11151,6 +12182,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_31lattice(struct __pyx_obj_4
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":147
+ *         return Lattice(eval(plf))
+ * 
+ *     def plf(self):             # <<<<<<<<<<<<<<
+ *         """hg.plf() -> Lattice PLF representation corresponding to the hypergraph."""
+ *         return bytes(hypergraph.AsPLF(self.hg[0], True).c_str())
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_34plf(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_33plf[] = "hg.plf() -> Lattice PLF representation corresponding to the hypergraph.";
@@ -11159,18 +12198,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_34plf(PyObject *__pyx_v_self
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("plf (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_33plf(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":147
- *         return Lattice(eval(plf))
- * 
- *     def plf(self):             # <<<<<<<<<<<<<<
- *         """hg.plf() -> Lattice PLF representation corresponding to the hypergraph."""
- *         return bytes(hypergraph.AsPLF(self.hg[0], True).c_str())
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_33plf(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -11181,7 +12214,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_33plf(struct __pyx_obj_4cdec
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("plf", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":149
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":149
  *     def plf(self):
  *         """hg.plf() -> Lattice PLF representation corresponding to the hypergraph."""
  *         return bytes(hypergraph.AsPLF(self.hg[0], True).c_str())             # <<<<<<<<<<<<<<
@@ -11190,21 +12223,28 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_33plf(struct __pyx_obj_4cdec
  */
   __Pyx_XDECREF(__pyx_r);
   __pyx_t_1 = __Pyx_PyBytes_FromString(HypergraphIO::AsPLF((__pyx_v_self->hg[0]), 1).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_1));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)(&PyBytes_Type))), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyBytes_Type))), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":147
+ *         return Lattice(eval(plf))
+ * 
+ *     def plf(self):             # <<<<<<<<<<<<<<
+ *         """hg.plf() -> Lattice PLF representation corresponding to the hypergraph."""
+ *         return bytes(hypergraph.AsPLF(self.hg[0], True).c_str())
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -11216,6 +12256,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_33plf(struct __pyx_obj_4cdec
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":151
+ *         return bytes(hypergraph.AsPLF(self.hg[0], True).c_str())
+ * 
+ *     def reweight(self, weights):             # <<<<<<<<<<<<<<
+ *         """hg.reweight(SparseVector/DenseVector): Reweight the hypergraph with a new vector."""
+ *         if isinstance(weights, SparseVector):
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_36reweight(PyObject *__pyx_v_self, PyObject *__pyx_v_weights); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_35reweight[] = "hg.reweight(SparseVector/DenseVector): Reweight the hypergraph with a new vector.";
@@ -11224,18 +12272,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_36reweight(PyObject *__pyx_v
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("reweight (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_35reweight(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self), ((PyObject *)__pyx_v_weights));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":151
- *         return bytes(hypergraph.AsPLF(self.hg[0], True).c_str())
- * 
- *     def reweight(self, weights):             # <<<<<<<<<<<<<<
- *         """hg.reweight(SparseVector/DenseVector): Reweight the hypergraph with a new vector."""
- *         if isinstance(weights, SparseVector):
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_35reweight(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self, PyObject *__pyx_v_weights) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -11248,7 +12290,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_35reweight(struct __pyx_obj_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("reweight", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":153
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":153
  *     def reweight(self, weights):
  *         """hg.reweight(SparseVector/DenseVector): Reweight the hypergraph with a new vector."""
  *         if isinstance(weights, SparseVector):             # <<<<<<<<<<<<<<
@@ -11259,7 +12301,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_35reweight(struct __pyx_obj_
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":154
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":154
  *         """hg.reweight(SparseVector/DenseVector): Reweight the hypergraph with a new vector."""
  *         if isinstance(weights, SparseVector):
  *             self.hg.Reweight((<SparseVector> weights).vector[0])             # <<<<<<<<<<<<<<
@@ -11270,7 +12312,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_35reweight(struct __pyx_obj_
     goto __pyx_L3;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":155
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":155
  *         if isinstance(weights, SparseVector):
  *             self.hg.Reweight((<SparseVector> weights).vector[0])
  *         elif isinstance(weights, DenseVector):             # <<<<<<<<<<<<<<
@@ -11281,7 +12323,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_35reweight(struct __pyx_obj_
   __pyx_t_1 = (__pyx_t_2 != 0);
   if (__pyx_t_1) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":156
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":156
  *             self.hg.Reweight((<SparseVector> weights).vector[0])
  *         elif isinstance(weights, DenseVector):
  *             self.hg.Reweight((<DenseVector> weights).vector[0])             # <<<<<<<<<<<<<<
@@ -11293,29 +12335,38 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_35reweight(struct __pyx_obj_
   }
   /*else*/ {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":158
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":158
  *             self.hg.Reweight((<DenseVector> weights).vector[0])
  *         else:
  *             raise TypeError('cannot reweight hypergraph with %s' % type(weights))             # <<<<<<<<<<<<<<
  * 
  *     property edges:
  */
-    __pyx_t_3 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_17), ((PyObject *)Py_TYPE(__pyx_v_weights))); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+    __pyx_t_3 = __Pyx_PyString_Format(__pyx_kp_s_cannot_reweight_hypergraph_with, ((PyObject *)Py_TYPE(__pyx_v_weights))); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_3);
     __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
-    PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_t_3));
-    __Pyx_GIVEREF(((PyObject *)__pyx_t_3));
+    PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3);
+    __Pyx_GIVEREF(__pyx_t_3);
     __pyx_t_3 = 0;
-    __pyx_t_3 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_Raise(__pyx_t_3, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     {__pyx_filename = __pyx_f[3]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
   __pyx_L3:;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":151
+ *         return bytes(hypergraph.AsPLF(self.hg[0], True).c_str())
+ * 
+ *     def reweight(self, weights):             # <<<<<<<<<<<<<<
+ *         """hg.reweight(SparseVector/DenseVector): Reweight the hypergraph with a new vector."""
+ *         if isinstance(weights, SparseVector):
+ */
+
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -11330,6 +12381,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_35reweight(struct __pyx_obj_
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_5edges_2generator9(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":161
+ * 
+ *     property edges:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             for i in range(self.hg.edges_.size()):
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_5edges_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_5edges_1__get__(PyObject *__pyx_v_self) {
@@ -11337,18 +12396,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_5edges_1__get__(PyObject *__
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_5edges___get__(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":161
- * 
- *     property edges:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef unsigned i
- *             for i in range(self.hg.edges_.size()):
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_5edges___get__(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -11373,6 +12426,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_5edges___get__(struct __pyx_
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -11408,7 +12462,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_5edges_2generator9(__pyx_Gen
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":163
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":163
  *         def __get__(self):
  *             cdef unsigned i
  *             for i in range(self.hg.edges_.size()):             # <<<<<<<<<<<<<<
@@ -11419,14 +12473,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_5edges_2generator9(__pyx_Gen
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_2;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":164
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":164
  *             cdef unsigned i
  *             for i in range(self.hg.edges_.size()):
  *                 yield HypergraphEdge().init(self.hg, i)             # <<<<<<<<<<<<<<
  * 
  *     property nodes:
  */
-    __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_HypergraphEdge)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_HypergraphEdge)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
     __pyx_t_4 = ((struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphEdge *)((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_t_3)->__pyx_vtab)->init(((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_t_3), __pyx_cur_scope->__pyx_v_self->hg, __pyx_cur_scope->__pyx_v_i); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
@@ -11445,6 +12499,16 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_5edges_2generator9(__pyx_Gen
     __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
     if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":161
+ * 
+ *     property edges:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             for i in range(self.hg.edges_.size()):
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -11460,6 +12524,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_5edges_2generator9(__pyx_Gen
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_5nodes_2generator10(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":167
+ * 
+ *     property nodes:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             for i in range(self.hg.nodes_.size()):
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_5nodes_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_5nodes_1__get__(PyObject *__pyx_v_self) {
@@ -11467,18 +12539,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_5nodes_1__get__(PyObject *__
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_5nodes___get__(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":167
- * 
- *     property nodes:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef unsigned i
- *             for i in range(self.hg.nodes_.size()):
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_5nodes___get__(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -11503,6 +12569,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_5nodes___get__(struct __pyx_
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -11538,7 +12605,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_5nodes_2generator10(__pyx_Ge
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":169
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":169
  *         def __get__(self):
  *             cdef unsigned i
  *             for i in range(self.hg.nodes_.size()):             # <<<<<<<<<<<<<<
@@ -11549,14 +12616,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_5nodes_2generator10(__pyx_Ge
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_2;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":170
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":170
  *             cdef unsigned i
  *             for i in range(self.hg.nodes_.size()):
  *                 yield HypergraphNode().init(self.hg, i)             # <<<<<<<<<<<<<<
  * 
  *     property goal:
  */
-    __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_HypergraphNode)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_HypergraphNode)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
     __pyx_t_4 = ((struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphNode *)((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_t_3)->__pyx_vtab)->init(((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_t_3), __pyx_cur_scope->__pyx_v_self->hg, __pyx_cur_scope->__pyx_v_i); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
@@ -11575,6 +12642,16 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_5nodes_2generator10(__pyx_Ge
     __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
     if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":167
+ * 
+ *     property nodes:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             for i in range(self.hg.nodes_.size()):
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -11589,6 +12666,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_10Hypergraph_5nodes_2generator10(__pyx_Ge
   return NULL;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":173
+ * 
+ *     property goal:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return HypergraphNode().init(self.hg, self.hg.GoalNode())
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_4goal_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_4goal_1__get__(PyObject *__pyx_v_self) {
@@ -11596,18 +12681,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_4goal_1__get__(PyObject *__p
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_4goal___get__(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":173
- * 
- *     property goal:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             return HypergraphNode().init(self.hg, self.hg.GoalNode())
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_4goal___get__(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -11618,7 +12697,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_4goal___get__(struct __pyx_o
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":174
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":174
  *     property goal:
  *         def __get__(self):
  *             return HypergraphNode().init(self.hg, self.hg.GoalNode())             # <<<<<<<<<<<<<<
@@ -11626,7 +12705,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_4goal___get__(struct __pyx_o
  *     property npaths:
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_HypergraphNode)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_HypergraphNode)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = ((struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphNode *)((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_t_1)->__pyx_vtab)->init(((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_t_1), __pyx_v_self->hg, __pyx_v_self->hg->GoalNode()); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
@@ -11635,8 +12714,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_4goal___get__(struct __pyx_o
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":173
+ * 
+ *     property goal:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return HypergraphNode().init(self.hg, self.hg.GoalNode())
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -11648,6 +12734,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_4goal___get__(struct __pyx_o
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":177
+ * 
+ *     property npaths:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return self.hg.NumberOfPaths()
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_6npaths_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_6npaths_1__get__(PyObject *__pyx_v_self) {
@@ -11655,18 +12749,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_6npaths_1__get__(PyObject *_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_6npaths___get__(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":177
- * 
- *     property npaths:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             return self.hg.NumberOfPaths()
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_6npaths___get__(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -11676,7 +12764,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_6npaths___get__(struct __pyx
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":178
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":178
  *     property npaths:
  *         def __get__(self):
  *             return self.hg.NumberOfPaths()             # <<<<<<<<<<<<<<
@@ -11690,8 +12778,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_6npaths___get__(struct __pyx
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":177
+ * 
+ *     property npaths:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return self.hg.NumberOfPaths()
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.Hypergraph.npaths.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -11702,6 +12797,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_6npaths___get__(struct __pyx
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":180
+ *             return self.hg.NumberOfPaths()
+ * 
+ *     def inside_outside(self):             # <<<<<<<<<<<<<<
+ *         """hg.inside_outside() -> SparseVector with inside-outside scores for each feature."""
+ *         cdef FastSparseVector[prob_t]* result = new FastSparseVector[prob_t]()
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_38inside_outside(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_10Hypergraph_37inside_outside[] = "hg.inside_outside() -> SparseVector with inside-outside scores for each feature.";
@@ -11710,18 +12813,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_10Hypergraph_38inside_outside(PyObject *_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("inside_outside (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":180
- *             return self.hg.NumberOfPaths()
- * 
- *     def inside_outside(self):             # <<<<<<<<<<<<<<
- *         """hg.inside_outside() -> SparseVector with inside-outside scores for each feature."""
- *         cdef FastSparseVector[prob_t]* result = new FastSparseVector[prob_t]()
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_self) {
   FastSparseVector<prob_t> *__pyx_v_result;
   prob_t __pyx_v_z;
@@ -11738,7 +12835,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(struct __py
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("inside_outside", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":182
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":182
  *     def inside_outside(self):
  *         """hg.inside_outside() -> SparseVector with inside-outside scores for each feature."""
  *         cdef FastSparseVector[prob_t]* result = new FastSparseVector[prob_t]()             # <<<<<<<<<<<<<<
@@ -11747,7 +12844,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(struct __py
  */
   __pyx_v_result = new FastSparseVector<prob_t>();
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":183
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":183
  *         """hg.inside_outside() -> SparseVector with inside-outside scores for each feature."""
  *         cdef FastSparseVector[prob_t]* result = new FastSparseVector[prob_t]()
  *         cdef prob_t z = hypergraph.InsideOutside(self.hg[0], result)             # <<<<<<<<<<<<<<
@@ -11756,7 +12853,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(struct __py
  */
   __pyx_v_z = InsideOutside<prob_t, EdgeProb, SparseVector<prob_t>, EdgeFeaturesAndProbWeightFunction>((__pyx_v_self->hg[0]), __pyx_v_result);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":184
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":184
  *         cdef FastSparseVector[prob_t]* result = new FastSparseVector[prob_t]()
  *         cdef prob_t z = hypergraph.InsideOutside(self.hg[0], result)
  *         result[0] /= z             # <<<<<<<<<<<<<<
@@ -11765,20 +12862,20 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(struct __py
  */
   (__pyx_v_result[0]) /= __pyx_v_z;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":185
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":185
  *         cdef prob_t z = hypergraph.InsideOutside(self.hg[0], result)
  *         result[0] /= z
  *         cdef SparseVector vector = SparseVector.__new__(SparseVector)             # <<<<<<<<<<<<<<
  *         vector.vector = new FastSparseVector[double]()
  *         cdef FastSparseVector[prob_t].const_iterator* it = new FastSparseVector[prob_t].const_iterator(result[0], False)
  */
-  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   if (!(likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_4cdec_5_cdec_SparseVector)))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_vector = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":186
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":186
  *         result[0] /= z
  *         cdef SparseVector vector = SparseVector.__new__(SparseVector)
  *         vector.vector = new FastSparseVector[double]()             # <<<<<<<<<<<<<<
@@ -11787,7 +12884,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(struct __py
  */
   __pyx_v_vector->vector = new FastSparseVector<double>();
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":187
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":187
  *         cdef SparseVector vector = SparseVector.__new__(SparseVector)
  *         vector.vector = new FastSparseVector[double]()
  *         cdef FastSparseVector[prob_t].const_iterator* it = new FastSparseVector[prob_t].const_iterator(result[0], False)             # <<<<<<<<<<<<<<
@@ -11796,7 +12893,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(struct __py
  */
   __pyx_v_it = new FastSparseVector<prob_t>::const_iterator((__pyx_v_result[0]), 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":189
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":189
  *         cdef FastSparseVector[prob_t].const_iterator* it = new FastSparseVector[prob_t].const_iterator(result[0], False)
  *         cdef unsigned i
  *         for i in range(result.size()):             # <<<<<<<<<<<<<<
@@ -11807,7 +12904,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(struct __py
   for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {
     __pyx_v_i = __pyx_t_3;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":190
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":190
  *         cdef unsigned i
  *         for i in range(result.size()):
  *             vector.vector.set_value(it[0].ptr().first, log(it[0].ptr().second))             # <<<<<<<<<<<<<<
@@ -11816,7 +12913,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(struct __py
  */
     __pyx_v_vector->vector->set_value((__pyx_v_it[0]).operator->()->first, log((__pyx_v_it[0]).operator->()->second));
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":191
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":191
  *         for i in range(result.size()):
  *             vector.vector.set_value(it[0].ptr().first, log(it[0].ptr().second))
  *             pinc(it[0]) # ++it             # <<<<<<<<<<<<<<
@@ -11826,7 +12923,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(struct __py
     (++(__pyx_v_it[0]));
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":192
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":192
  *             vector.vector.set_value(it[0].ptr().first, log(it[0].ptr().second))
  *             pinc(it[0]) # ++it
  *         del it             # <<<<<<<<<<<<<<
@@ -11835,7 +12932,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(struct __py
  */
   delete __pyx_v_it;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":193
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":193
  *             pinc(it[0]) # ++it
  *         del it
  *         del result             # <<<<<<<<<<<<<<
@@ -11844,7 +12941,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(struct __py
  */
   delete __pyx_v_result;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":194
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":194
  *         del it
  *         del result
  *         return vector             # <<<<<<<<<<<<<<
@@ -11856,8 +12953,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(struct __py
   __pyx_r = ((PyObject *)__pyx_v_vector);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":180
+ *             return self.hg.NumberOfPaths()
+ * 
+ *     def inside_outside(self):             # <<<<<<<<<<<<<<
+ *         """hg.inside_outside() -> SparseVector with inside-outside scores for each feature."""
+ *         cdef FastSparseVector[prob_t]* result = new FastSparseVector[prob_t]()
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.Hypergraph.inside_outside", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -11869,7 +12973,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_10Hypergraph_37inside_outside(struct __py
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":201
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":201
  *     cdef public TRule trule
  * 
  *     cdef init(self, hypergraph.Hypergraph* hg, unsigned i):             # <<<<<<<<<<<<<<
@@ -11886,7 +12990,7 @@ static PyObject *__pyx_f_4cdec_5_cdec_14HypergraphEdge_init(struct __pyx_obj_4cd
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("init", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":202
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":202
  * 
  *     cdef init(self, hypergraph.Hypergraph* hg, unsigned i):
  *         self.hg = hg             # <<<<<<<<<<<<<<
@@ -11895,7 +12999,7 @@ static PyObject *__pyx_f_4cdec_5_cdec_14HypergraphEdge_init(struct __pyx_obj_4cd
  */
   __pyx_v_self->hg = __pyx_v_hg;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":203
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":203
  *     cdef init(self, hypergraph.Hypergraph* hg, unsigned i):
  *         self.hg = hg
  *         self.edge = &hg.edges_[i]             # <<<<<<<<<<<<<<
@@ -11904,14 +13008,14 @@ static PyObject *__pyx_f_4cdec_5_cdec_14HypergraphEdge_init(struct __pyx_obj_4cd
  */
   __pyx_v_self->edge = (&(__pyx_v_hg->edges_[__pyx_v_i]));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":204
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":204
  *         self.hg = hg
  *         self.edge = &hg.edges_[i]
  *         self.trule = TRule.__new__(TRule)             # <<<<<<<<<<<<<<
  *         self.trule.rule = new shared_ptr[grammar.TRule](self.edge.rule_)
  *         return self
  */
-  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_TRule(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_TRule)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 204; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_TRule(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_TRule)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 204; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   if (!(likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_4cdec_5_cdec_TRule)))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 204; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GIVEREF(__pyx_t_1);
@@ -11920,7 +13024,7 @@ static PyObject *__pyx_f_4cdec_5_cdec_14HypergraphEdge_init(struct __pyx_obj_4cd
   __pyx_v_self->trule = ((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":205
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":205
  *         self.edge = &hg.edges_[i]
  *         self.trule = TRule.__new__(TRule)
  *         self.trule.rule = new shared_ptr[grammar.TRule](self.edge.rule_)             # <<<<<<<<<<<<<<
@@ -11929,7 +13033,7 @@ static PyObject *__pyx_f_4cdec_5_cdec_14HypergraphEdge_init(struct __pyx_obj_4cd
  */
   __pyx_v_self->trule->rule = new boost::shared_ptr<TRule>(__pyx_v_self->edge->rule_);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":206
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":206
  *         self.trule = TRule.__new__(TRule)
  *         self.trule.rule = new shared_ptr[grammar.TRule](self.edge.rule_)
  *         return self             # <<<<<<<<<<<<<<
@@ -11941,8 +13045,15 @@ static PyObject *__pyx_f_4cdec_5_cdec_14HypergraphEdge_init(struct __pyx_obj_4cd
   __pyx_r = ((PyObject *)__pyx_v_self);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":201
+ *     cdef public TRule trule
+ * 
+ *     cdef init(self, hypergraph.Hypergraph* hg, unsigned i):             # <<<<<<<<<<<<<<
+ *         self.hg = hg
+ *         self.edge = &hg.edges_[i]
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.HypergraphEdge.init", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -11953,6 +13064,14 @@ static PyObject *__pyx_f_4cdec_5_cdec_14HypergraphEdge_init(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":208
+ *         return self
+ * 
+ *     def __len__(self):             # <<<<<<<<<<<<<<
+ *         return self.edge.tail_nodes_.size()
+ * 
+ */
+
 /* Python wrapper */
 static Py_ssize_t __pyx_pw_4cdec_5_cdec_14HypergraphEdge_1__len__(PyObject *__pyx_v_self); /*proto*/
 static Py_ssize_t __pyx_pw_4cdec_5_cdec_14HypergraphEdge_1__len__(PyObject *__pyx_v_self) {
@@ -11960,24 +13079,18 @@ static Py_ssize_t __pyx_pw_4cdec_5_cdec_14HypergraphEdge_1__len__(PyObject *__py
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphEdge___len__(((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":208
- *         return self
- * 
- *     def __len__(self):             # <<<<<<<<<<<<<<
- *         return self.edge.tail_nodes_.size()
- * 
- */
-
 static Py_ssize_t __pyx_pf_4cdec_5_cdec_14HypergraphEdge___len__(struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *__pyx_v_self) {
   Py_ssize_t __pyx_r;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":209
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":209
  * 
  *     def __len__(self):
  *         return self.edge.tail_nodes_.size()             # <<<<<<<<<<<<<<
@@ -11987,12 +13100,28 @@ static Py_ssize_t __pyx_pf_4cdec_5_cdec_14HypergraphEdge___len__(struct __pyx_ob
   __pyx_r = __pyx_v_self->edge->tail_nodes_.size();
   goto __pyx_L0;
 
-  __pyx_r = 0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":208
+ *         return self
+ * 
+ *     def __len__(self):             # <<<<<<<<<<<<<<
+ *         return self.edge.tail_nodes_.size()
+ * 
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":212
+ * 
+ *     property head_node:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return HypergraphNode().init(self.hg, self.edge.head_node_)
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_9head_node_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_9head_node_1__get__(PyObject *__pyx_v_self) {
@@ -12000,18 +13129,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_9head_node_1__get__(PyOb
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphEdge_9head_node___get__(((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":212
- * 
- *     property head_node:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             return HypergraphNode().init(self.hg, self.edge.head_node_)
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_9head_node___get__(struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -12022,7 +13145,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_9head_node___get__(struc
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":213
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":213
  *     property head_node:
  *         def __get__(self):
  *             return HypergraphNode().init(self.hg, self.edge.head_node_)             # <<<<<<<<<<<<<<
@@ -12030,7 +13153,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_9head_node___get__(struc
  *     property tail_nodes:
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_HypergraphNode)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 213; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_HypergraphNode)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 213; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = ((struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphNode *)((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_t_1)->__pyx_vtab)->init(((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_t_1), __pyx_v_self->hg, __pyx_v_self->edge->head_node_); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 213; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
@@ -12039,8 +13162,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_9head_node___get__(struc
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":212
+ * 
+ *     property head_node:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return HypergraphNode().init(self.hg, self.edge.head_node_)
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -12053,6 +13183,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_9head_node___get__(struc
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphEdge_10tail_nodes_2generator11(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":216
+ * 
+ *     property tail_nodes:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             for i in range(self.edge.tail_nodes_.size()):
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_10tail_nodes_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_10tail_nodes_1__get__(PyObject *__pyx_v_self) {
@@ -12060,18 +13198,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_10tail_nodes_1__get__(Py
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphEdge_10tail_nodes___get__(((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":216
- * 
- *     property tail_nodes:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef unsigned i
- *             for i in range(self.edge.tail_nodes_.size()):
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_10tail_nodes___get__(struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -12096,6 +13228,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_10tail_nodes___get__(str
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -12131,7 +13264,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphEdge_10tail_nodes_2generator1
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 216; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":218
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":218
  *         def __get__(self):
  *             cdef unsigned i
  *             for i in range(self.edge.tail_nodes_.size()):             # <<<<<<<<<<<<<<
@@ -12142,14 +13275,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphEdge_10tail_nodes_2generator1
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_2;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":219
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":219
  *             cdef unsigned i
  *             for i in range(self.edge.tail_nodes_.size()):
  *                 yield HypergraphNode().init(self.hg, self.edge.tail_nodes_[i])             # <<<<<<<<<<<<<<
  * 
  *     property span:
  */
-    __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_HypergraphNode)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_HypergraphNode)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
     __pyx_t_4 = ((struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphNode *)((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_t_3)->__pyx_vtab)->init(((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_t_3), __pyx_cur_scope->__pyx_v_self->hg, (__pyx_cur_scope->__pyx_v_self->edge->tail_nodes_[__pyx_cur_scope->__pyx_v_i])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
@@ -12168,6 +13301,16 @@ static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphEdge_10tail_nodes_2generator1
     __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
     if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":216
+ * 
+ *     property tail_nodes:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             for i in range(self.edge.tail_nodes_.size()):
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -12182,6 +13325,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphEdge_10tail_nodes_2generator1
   return NULL;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":222
+ * 
+ *     property span:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return (self.edge.i_, self.edge.j_)
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_4span_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_4span_1__get__(PyObject *__pyx_v_self) {
@@ -12189,18 +13340,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_4span_1__get__(PyObject
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphEdge_4span___get__(((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":222
- * 
- *     property span:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             return (self.edge.i_, self.edge.j_)
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_4span___get__(struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -12212,7 +13357,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_4span___get__(struct __p
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":223
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":223
  *     property span:
  *         def __get__(self):
  *             return (self.edge.i_, self.edge.j_)             # <<<<<<<<<<<<<<
@@ -12220,9 +13365,9 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_4span___get__(struct __p
  *     property src_span:
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = PyInt_FromLong(__pyx_v_self->edge->i_); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_From_short(__pyx_v_self->edge->i_); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = PyInt_FromLong(__pyx_v_self->edge->j_); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyInt_From_short(__pyx_v_self->edge->j_); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
@@ -12232,12 +13377,19 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_4span___get__(struct __p
   __Pyx_GIVEREF(__pyx_t_2);
   __pyx_t_1 = 0;
   __pyx_t_2 = 0;
-  __pyx_r = ((PyObject *)__pyx_t_3);
+  __pyx_r = __pyx_t_3;
   __pyx_t_3 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":222
+ * 
+ *     property span:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return (self.edge.i_, self.edge.j_)
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -12250,6 +13402,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_4span___get__(struct __p
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":226
+ * 
+ *     property src_span:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return (self.edge.prev_i_, self.edge.prev_j_)
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_8src_span_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_8src_span_1__get__(PyObject *__pyx_v_self) {
@@ -12257,18 +13417,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_8src_span_1__get__(PyObj
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphEdge_8src_span___get__(((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":226
- * 
- *     property src_span:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             return (self.edge.prev_i_, self.edge.prev_j_)
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_8src_span___get__(struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -12280,7 +13434,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_8src_span___get__(struct
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":227
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":227
  *     property src_span:
  *         def __get__(self):
  *             return (self.edge.prev_i_, self.edge.prev_j_)             # <<<<<<<<<<<<<<
@@ -12288,9 +13442,9 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_8src_span___get__(struct
  *     property feature_values:
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = PyInt_FromLong(__pyx_v_self->edge->prev_i_); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_From_short(__pyx_v_self->edge->prev_i_); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = PyInt_FromLong(__pyx_v_self->edge->prev_j_); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyInt_From_short(__pyx_v_self->edge->prev_j_); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 227; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
@@ -12300,12 +13454,19 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_8src_span___get__(struct
   __Pyx_GIVEREF(__pyx_t_2);
   __pyx_t_1 = 0;
   __pyx_t_2 = 0;
-  __pyx_r = ((PyObject *)__pyx_t_3);
+  __pyx_r = __pyx_t_3;
   __pyx_t_3 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":226
+ * 
+ *     property src_span:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return (self.edge.prev_i_, self.edge.prev_j_)
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -12318,6 +13479,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_8src_span___get__(struct
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":230
+ * 
+ *     property feature_values:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef SparseVector vector = SparseVector.__new__(SparseVector)
+ *             vector.vector = new FastSparseVector[double](self.edge.feature_values_)
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_14feature_values_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_14feature_values_1__get__(PyObject *__pyx_v_self) {
@@ -12325,18 +13494,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_14feature_values_1__get_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphEdge_14feature_values___get__(((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":230
- * 
- *     property feature_values:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef SparseVector vector = SparseVector.__new__(SparseVector)
- *             vector.vector = new FastSparseVector[double](self.edge.feature_values_)
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_14feature_values___get__(struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_vector = 0;
   PyObject *__pyx_r = NULL;
@@ -12347,20 +13510,20 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_14feature_values___get__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":231
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":231
  *     property feature_values:
  *         def __get__(self):
  *             cdef SparseVector vector = SparseVector.__new__(SparseVector)             # <<<<<<<<<<<<<<
  *             vector.vector = new FastSparseVector[double](self.edge.feature_values_)
  *             return vector
  */
-  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   if (!(likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_4cdec_5_cdec_SparseVector)))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_vector = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":232
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":232
  *         def __get__(self):
  *             cdef SparseVector vector = SparseVector.__new__(SparseVector)
  *             vector.vector = new FastSparseVector[double](self.edge.feature_values_)             # <<<<<<<<<<<<<<
@@ -12369,7 +13532,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_14feature_values___get__
  */
   __pyx_v_vector->vector = new FastSparseVector<double>(__pyx_v_self->edge->feature_values_);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":233
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":233
  *             cdef SparseVector vector = SparseVector.__new__(SparseVector)
  *             vector.vector = new FastSparseVector[double](self.edge.feature_values_)
  *             return vector             # <<<<<<<<<<<<<<
@@ -12381,8 +13544,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_14feature_values___get__
   __pyx_r = ((PyObject *)__pyx_v_vector);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":230
+ * 
+ *     property feature_values:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef SparseVector vector = SparseVector.__new__(SparseVector)
+ *             vector.vector = new FastSparseVector[double](self.edge.feature_values_)
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.HypergraphEdge.feature_values.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -12394,6 +13564,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_14feature_values___get__
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":236
+ * 
+ *     property prob:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return self.edge.edge_prob_.as_float()
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_4prob_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_4prob_1__get__(PyObject *__pyx_v_self) {
@@ -12401,18 +13579,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_4prob_1__get__(PyObject
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphEdge_4prob___get__(((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":236
- * 
- *     property prob:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             return self.edge.edge_prob_.as_float()
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_4prob___get__(struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -12422,7 +13594,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_4prob___get__(struct __p
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":237
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":237
  *     property prob:
  *         def __get__(self):
  *             return self.edge.edge_prob_.as_float()             # <<<<<<<<<<<<<<
@@ -12436,8 +13608,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_4prob___get__(struct __p
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":236
+ * 
+ *     property prob:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return self.edge.edge_prob_.as_float()
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.HypergraphEdge.prob.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -12448,6 +13627,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_4prob___get__(struct __p
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":239
+ *             return self.edge.edge_prob_.as_float()
+ * 
+ *     def __richcmp__(HypergraphEdge x, HypergraphEdge y, int op):             # <<<<<<<<<<<<<<
+ *         if op == 2: # ==
+ *             return x.edge == y.edge
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_3__richcmp__(PyObject *__pyx_v_x, PyObject *__pyx_v_y, int __pyx_v_op); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_3__richcmp__(PyObject *__pyx_v_x, PyObject *__pyx_v_y, int __pyx_v_op) {
@@ -12460,6 +13647,8 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_3__richcmp__(PyObject *_
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x), __pyx_ptype_4cdec_5_cdec_HypergraphEdge, 1, "x", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y), __pyx_ptype_4cdec_5_cdec_HypergraphEdge, 1, "y", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphEdge_2__richcmp__(((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_v_x), ((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_v_y), ((int)__pyx_v_op));
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __pyx_r = NULL;
@@ -12468,14 +13657,6 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_3__richcmp__(PyObject *_
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":239
- *             return self.edge.edge_prob_.as_float()
- * 
- *     def __richcmp__(HypergraphEdge x, HypergraphEdge y, int op):             # <<<<<<<<<<<<<<
- *         if op == 2: # ==
- *             return x.edge == y.edge
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_2__richcmp__(struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *__pyx_v_x, struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *__pyx_v_y, int __pyx_v_op) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -12486,7 +13667,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_2__richcmp__(struct __py
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__richcmp__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":242
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":242
  *         if op == 2: # ==
  *             return x.edge == y.edge
  *         elif op == 3: # !=             # <<<<<<<<<<<<<<
@@ -12495,7 +13676,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_2__richcmp__(struct __py
  */
   switch (__pyx_v_op) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":240
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":240
  * 
  *     def __richcmp__(HypergraphEdge x, HypergraphEdge y, int op):
  *         if op == 2: # ==             # <<<<<<<<<<<<<<
@@ -12504,7 +13685,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_2__richcmp__(struct __py
  */
     case 2:
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":241
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":241
  *     def __richcmp__(HypergraphEdge x, HypergraphEdge y, int op):
  *         if op == 2: # ==
  *             return x.edge == y.edge             # <<<<<<<<<<<<<<
@@ -12519,7 +13700,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_2__richcmp__(struct __py
     goto __pyx_L0;
     break;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":242
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":242
  *         if op == 2: # ==
  *             return x.edge == y.edge
  *         elif op == 3: # !=             # <<<<<<<<<<<<<<
@@ -12528,7 +13709,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_2__richcmp__(struct __py
  */
     case 3:
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":243
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":243
  *             return x.edge == y.edge
  *         elif op == 3: # !=
  *             return not (x == y)             # <<<<<<<<<<<<<<
@@ -12545,23 +13726,31 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_2__richcmp__(struct __py
     __pyx_t_1 = 0;
     goto __pyx_L0;
     break;
+    default: break;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":244
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":244
  *         elif op == 3: # !=
  *             return not (x == y)
  *         raise NotImplemented('comparison not implemented for HypergraphEdge')             # <<<<<<<<<<<<<<
  * 
  * cdef class HypergraphNode:
  */
-  __pyx_t_1 = PyObject_Call(__pyx_builtin_NotImplemented, ((PyObject *)__pyx_k_tuple_19), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_NotImplemented, __pyx_tuple__6, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_Raise(__pyx_t_1, 0, 0, 0);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   {__pyx_filename = __pyx_f[3]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":239
+ *             return self.edge.edge_prob_.as_float()
+ * 
+ *     def __richcmp__(HypergraphEdge x, HypergraphEdge y, int op):             # <<<<<<<<<<<<<<
+ *         if op == 2: # ==
+ *             return x.edge == y.edge
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.HypergraphEdge.__richcmp__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -12572,6 +13761,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_2__richcmp__(struct __py
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":199
+ *     cdef hypergraph.Hypergraph* hg
+ *     cdef hypergraph.HypergraphEdge* edge
+ *     cdef public TRule trule             # <<<<<<<<<<<<<<
+ * 
+ *     cdef init(self, hypergraph.Hypergraph* hg, unsigned i):
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_5trule_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_5trule_1__get__(PyObject *__pyx_v_self) {
@@ -12579,18 +13776,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphEdge_5trule_1__get__(PyObject
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphEdge_5trule___get__(((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":199
- *     cdef hypergraph.Hypergraph* hg
- *     cdef hypergraph.HypergraphEdge* edge
- *     cdef public TRule trule             # <<<<<<<<<<<<<<
- * 
- *     cdef init(self, hypergraph.Hypergraph* hg, unsigned i):
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_5trule___get__(struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -12600,7 +13791,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphEdge_5trule___get__(struct __
   __pyx_r = ((PyObject *)__pyx_v_self->trule);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
+  /* function exit code */
   __pyx_L0:;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
@@ -12614,6 +13805,8 @@ static int __pyx_pw_4cdec_5_cdec_14HypergraphEdge_5trule_3__set__(PyObject *__py
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__set__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphEdge_5trule_2__set__(((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_v_self), ((PyObject *)__pyx_v_value));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
@@ -12621,20 +13814,25 @@ static int __pyx_pw_4cdec_5_cdec_14HypergraphEdge_5trule_3__set__(PyObject *__py
 static int __pyx_pf_4cdec_5_cdec_14HypergraphEdge_5trule_2__set__(struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *__pyx_v_self, PyObject *__pyx_v_value) {
   int __pyx_r;
   __Pyx_RefNannyDeclarations
+  PyObject *__pyx_t_1 = NULL;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__set__", 0);
   if (!(likely(((__pyx_v_value) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_value, __pyx_ptype_4cdec_5_cdec_TRule))))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 199; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_INCREF(__pyx_v_value);
-  __Pyx_GIVEREF(__pyx_v_value);
+  __pyx_t_1 = __pyx_v_value;
+  __Pyx_INCREF(__pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
   __Pyx_GOTREF(__pyx_v_self->trule);
   __Pyx_DECREF(((PyObject *)__pyx_v_self->trule));
-  __pyx_v_self->trule = ((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_v_value);
+  __pyx_v_self->trule = ((struct __pyx_obj_4cdec_5_cdec_TRule *)__pyx_t_1);
+  __pyx_t_1 = 0;
 
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
+  __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.HypergraphEdge.trule.__set__", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = -1;
   __pyx_L0:;
@@ -12649,6 +13847,8 @@ static int __pyx_pw_4cdec_5_cdec_14HypergraphEdge_5trule_5__del__(PyObject *__py
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__del__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphEdge_5trule_4__del__(((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
@@ -12663,12 +13863,13 @@ static int __pyx_pf_4cdec_5_cdec_14HypergraphEdge_5trule_4__del__(struct __pyx_o
   __Pyx_DECREF(((PyObject *)__pyx_v_self->trule));
   __pyx_v_self->trule = ((struct __pyx_obj_4cdec_5_cdec_TRule *)Py_None);
 
+  /* function exit code */
   __pyx_r = 0;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":250
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":250
  *     cdef hypergraph.HypergraphNode* node
  * 
  *     cdef init(self, hypergraph.Hypergraph* hg, unsigned i):             # <<<<<<<<<<<<<<
@@ -12681,7 +13882,7 @@ static PyObject *__pyx_f_4cdec_5_cdec_14HypergraphNode_init(struct __pyx_obj_4cd
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("init", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":251
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":251
  * 
  *     cdef init(self, hypergraph.Hypergraph* hg, unsigned i):
  *         self.hg = hg             # <<<<<<<<<<<<<<
@@ -12690,7 +13891,7 @@ static PyObject *__pyx_f_4cdec_5_cdec_14HypergraphNode_init(struct __pyx_obj_4cd
  */
   __pyx_v_self->hg = __pyx_v_hg;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":252
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":252
  *     cdef init(self, hypergraph.Hypergraph* hg, unsigned i):
  *         self.hg = hg
  *         self.node = &hg.nodes_[i]             # <<<<<<<<<<<<<<
@@ -12699,7 +13900,7 @@ static PyObject *__pyx_f_4cdec_5_cdec_14HypergraphNode_init(struct __pyx_obj_4cd
  */
   __pyx_v_self->node = (&(__pyx_v_hg->nodes_[__pyx_v_i]));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":253
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":253
  *         self.hg = hg
  *         self.node = &hg.nodes_[i]
  *         return self             # <<<<<<<<<<<<<<
@@ -12711,13 +13912,29 @@ static PyObject *__pyx_f_4cdec_5_cdec_14HypergraphNode_init(struct __pyx_obj_4cd
   __pyx_r = ((PyObject *)__pyx_v_self);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":250
+ *     cdef hypergraph.HypergraphNode* node
+ * 
+ *     cdef init(self, hypergraph.Hypergraph* hg, unsigned i):             # <<<<<<<<<<<<<<
+ *         self.hg = hg
+ *         self.node = &hg.nodes_[i]
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":256
+ * 
+ *     property id:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return self.node.id_
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_2id_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_2id_1__get__(PyObject *__pyx_v_self) {
@@ -12725,18 +13942,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_2id_1__get__(PyObject *_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphNode_2id___get__(((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":256
- * 
- *     property id:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             return self.node.id_
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_2id___get__(struct __pyx_obj_4cdec_5_cdec_HypergraphNode *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -12746,7 +13957,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_2id___get__(struct __pyx
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":257
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":257
  *     property id:
  *         def __get__(self):
  *             return self.node.id_             # <<<<<<<<<<<<<<
@@ -12754,14 +13965,21 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_2id___get__(struct __pyx
  *     property in_edges:
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = PyInt_FromLong(__pyx_v_self->node->id_); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 257; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_From_int(__pyx_v_self->node->id_); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 257; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":256
+ * 
+ *     property id:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return self.node.id_
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.HypergraphNode.id.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -12773,6 +13991,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_2id___get__(struct __pyx
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphNode_8in_edges_2generator12(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":260
+ * 
+ *     property in_edges:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             for i in range(self.node.in_edges_.size()):
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_8in_edges_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_8in_edges_1__get__(PyObject *__pyx_v_self) {
@@ -12780,18 +14006,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_8in_edges_1__get__(PyObj
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphNode_8in_edges___get__(((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":260
- * 
- *     property in_edges:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef unsigned i
- *             for i in range(self.node.in_edges_.size()):
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_8in_edges___get__(struct __pyx_obj_4cdec_5_cdec_HypergraphNode *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -12816,6 +14036,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_8in_edges___get__(struct
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -12851,7 +14072,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphNode_8in_edges_2generator12(_
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":262
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":262
  *         def __get__(self):
  *             cdef unsigned i
  *             for i in range(self.node.in_edges_.size()):             # <<<<<<<<<<<<<<
@@ -12862,14 +14083,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphNode_8in_edges_2generator12(_
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_2;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":263
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":263
  *             cdef unsigned i
  *             for i in range(self.node.in_edges_.size()):
  *                 yield HypergraphEdge().init(self.hg, self.node.in_edges_[i])             # <<<<<<<<<<<<<<
  * 
  *     property out_edges:
  */
-    __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_HypergraphEdge)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_HypergraphEdge)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
     __pyx_t_4 = ((struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphEdge *)((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_t_3)->__pyx_vtab)->init(((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_t_3), __pyx_cur_scope->__pyx_v_self->hg, (__pyx_cur_scope->__pyx_v_self->node->in_edges_[__pyx_cur_scope->__pyx_v_i])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
@@ -12888,6 +14109,16 @@ static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphNode_8in_edges_2generator12(_
     __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
     if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":260
+ * 
+ *     property in_edges:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             for i in range(self.node.in_edges_.size()):
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -12903,6 +14134,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphNode_8in_edges_2generator12(_
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphNode_9out_edges_2generator13(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":266
+ * 
+ *     property out_edges:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             for i in range(self.node.out_edges_.size()):
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_9out_edges_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_9out_edges_1__get__(PyObject *__pyx_v_self) {
@@ -12910,18 +14149,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_9out_edges_1__get__(PyOb
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphNode_9out_edges___get__(((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":266
- * 
- *     property out_edges:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef unsigned i
- *             for i in range(self.node.out_edges_.size()):
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_9out_edges___get__(struct __pyx_obj_4cdec_5_cdec_HypergraphNode *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_17___get__ *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -12946,6 +14179,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_9out_edges___get__(struc
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -12981,7 +14215,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphNode_9out_edges_2generator13(
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":268
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":268
  *         def __get__(self):
  *             cdef unsigned i
  *             for i in range(self.node.out_edges_.size()):             # <<<<<<<<<<<<<<
@@ -12992,14 +14226,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphNode_9out_edges_2generator13(
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_2;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":269
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":269
  *             cdef unsigned i
  *             for i in range(self.node.out_edges_.size()):
  *                 yield HypergraphEdge().init(self.hg, self.node.out_edges_[i])             # <<<<<<<<<<<<<<
  * 
  *     property span:
  */
-    __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_HypergraphEdge)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 269; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_HypergraphEdge)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 269; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
     __pyx_t_4 = ((struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphEdge *)((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_t_3)->__pyx_vtab)->init(((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)__pyx_t_3), __pyx_cur_scope->__pyx_v_self->hg, (__pyx_cur_scope->__pyx_v_self->node->out_edges_[__pyx_cur_scope->__pyx_v_i])); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 269; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
@@ -13018,6 +14252,16 @@ static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphNode_9out_edges_2generator13(
     __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
     if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 269; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":266
+ * 
+ *     property out_edges:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef unsigned i
+ *             for i in range(self.node.out_edges_.size()):
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -13032,6 +14276,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_14HypergraphNode_9out_edges_2generator13(
   return NULL;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":272
+ * 
+ *     property span:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return next(self.in_edges).span
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_4span_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_4span_1__get__(PyObject *__pyx_v_self) {
@@ -13039,18 +14291,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_4span_1__get__(PyObject
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphNode_4span___get__(((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":272
- * 
- *     property span:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             return next(self.in_edges).span
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_4span___get__(struct __pyx_obj_4cdec_5_cdec_HypergraphNode *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -13061,7 +14307,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_4span___get__(struct __p
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":273
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":273
  *     property span:
  *         def __get__(self):
  *             return next(self.in_edges).span             # <<<<<<<<<<<<<<
@@ -13069,20 +14315,27 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_4span___get__(struct __p
  *     property cat:
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s__in_edges); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 273; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_in_edges); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 273; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = __Pyx_PyIter_Next(__pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 273; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s__span); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 273; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_span); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 273; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":272
+ * 
+ *     property span:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return next(self.in_edges).span
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -13094,6 +14347,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_4span___get__(struct __p
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":276
+ * 
+ *     property cat:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             if self.node.cat_:
+ *                 return str(TDConvert(-self.node.cat_).c_str())
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_3cat_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_3cat_1__get__(PyObject *__pyx_v_self) {
@@ -13101,18 +14362,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_3cat_1__get__(PyObject *
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphNode_3cat___get__(((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":276
- * 
- *     property cat:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             if self.node.cat_:
- *                 return str(TDConvert(-self.node.cat_).c_str())
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_3cat___get__(struct __pyx_obj_4cdec_5_cdec_HypergraphNode *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -13124,7 +14379,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_3cat___get__(struct __py
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":277
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":277
  *     property cat:
  *         def __get__(self):
  *             if self.node.cat_:             # <<<<<<<<<<<<<<
@@ -13134,7 +14389,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_3cat___get__(struct __py
   __pyx_t_1 = (__pyx_v_self->node->cat_ != 0);
   if (__pyx_t_1) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":278
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":278
  *         def __get__(self):
  *             if self.node.cat_:
  *                 return str(TDConvert(-self.node.cat_).c_str())             # <<<<<<<<<<<<<<
@@ -13143,22 +14398,29 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_3cat___get__(struct __py
  */
     __Pyx_XDECREF(__pyx_r);
     __pyx_t_2 = __Pyx_PyBytes_FromString(TD::Convert((-__pyx_v_self->node->cat_)).c_str()); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_GOTREF(__pyx_t_2);
     __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_t_2));
-    __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+    PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
+    __Pyx_GIVEREF(__pyx_t_2);
     __pyx_t_2 = 0;
-    __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_3, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __pyx_r = __pyx_t_2;
     __pyx_t_2 = 0;
     goto __pyx_L0;
-    goto __pyx_L3;
   }
-  __pyx_L3:;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":276
+ * 
+ *     property cat:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             if self.node.cat_:
+ *                 return str(TDConvert(-self.node.cat_).c_str())
+ */
+
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -13172,6 +14434,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode_3cat___get__(struct __py
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":280
+ *                 return str(TDConvert(-self.node.cat_).c_str())
+ * 
+ *     def __richcmp__(HypergraphNode x, HypergraphNode y, int op):             # <<<<<<<<<<<<<<
+ *         if op == 2: # ==
+ *             return x.node == y.node
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_1__richcmp__(PyObject *__pyx_v_x, PyObject *__pyx_v_y, int __pyx_v_op); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_1__richcmp__(PyObject *__pyx_v_x, PyObject *__pyx_v_y, int __pyx_v_op) {
@@ -13184,6 +14454,8 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_1__richcmp__(PyObject *_
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_x), __pyx_ptype_4cdec_5_cdec_HypergraphNode, 1, "x", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 280; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_y), __pyx_ptype_4cdec_5_cdec_HypergraphNode, 1, "y", 0))) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 280; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_5_cdec_14HypergraphNode___richcmp__(((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_v_x), ((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)__pyx_v_y), ((int)__pyx_v_op));
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __pyx_r = NULL;
@@ -13192,14 +14464,6 @@ static PyObject *__pyx_pw_4cdec_5_cdec_14HypergraphNode_1__richcmp__(PyObject *_
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":280
- *                 return str(TDConvert(-self.node.cat_).c_str())
- * 
- *     def __richcmp__(HypergraphNode x, HypergraphNode y, int op):             # <<<<<<<<<<<<<<
- *         if op == 2: # ==
- *             return x.node == y.node
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode___richcmp__(struct __pyx_obj_4cdec_5_cdec_HypergraphNode *__pyx_v_x, struct __pyx_obj_4cdec_5_cdec_HypergraphNode *__pyx_v_y, int __pyx_v_op) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -13210,7 +14474,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode___richcmp__(struct __pyx
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__richcmp__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":283
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":283
  *         if op == 2: # ==
  *             return x.node == y.node
  *         elif op == 3: # !=             # <<<<<<<<<<<<<<
@@ -13219,7 +14483,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode___richcmp__(struct __pyx
  */
   switch (__pyx_v_op) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":281
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":281
  * 
  *     def __richcmp__(HypergraphNode x, HypergraphNode y, int op):
  *         if op == 2: # ==             # <<<<<<<<<<<<<<
@@ -13228,7 +14492,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode___richcmp__(struct __pyx
  */
     case 2:
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":282
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":282
  *     def __richcmp__(HypergraphNode x, HypergraphNode y, int op):
  *         if op == 2: # ==
  *             return x.node == y.node             # <<<<<<<<<<<<<<
@@ -13243,7 +14507,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode___richcmp__(struct __pyx
     goto __pyx_L0;
     break;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":283
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":283
  *         if op == 2: # ==
  *             return x.node == y.node
  *         elif op == 3: # !=             # <<<<<<<<<<<<<<
@@ -13252,7 +14516,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode___richcmp__(struct __pyx
  */
     case 3:
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":284
+    /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":284
  *             return x.node == y.node
  *         elif op == 3: # !=
  *             return not (x == y)             # <<<<<<<<<<<<<<
@@ -13268,21 +14532,29 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode___richcmp__(struct __pyx
     __pyx_t_1 = 0;
     goto __pyx_L0;
     break;
+    default: break;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":285
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":285
  *         elif op == 3: # !=
  *             return not (x == y)
  *         raise NotImplemented('comparison not implemented for HypergraphNode')             # <<<<<<<<<<<<<<
  */
-  __pyx_t_1 = PyObject_Call(__pyx_builtin_NotImplemented, ((PyObject *)__pyx_k_tuple_21), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_NotImplemented, __pyx_tuple__7, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_Raise(__pyx_t_1, 0, 0, 0);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   {__pyx_filename = __pyx_f[3]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":280
+ *                 return str(TDConvert(-self.node.cat_).c_str())
+ * 
+ *     def __richcmp__(HypergraphNode x, HypergraphNode y, int op):             # <<<<<<<<<<<<<<
+ *         if op == 2: # ==
+ *             return x.node == y.node
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.HypergraphNode.__richcmp__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -13293,6 +14565,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_14HypergraphNode___richcmp__(struct __pyx
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":6
+ *     cdef lattice.Lattice* lattice
+ * 
+ *     def __cinit__(self):             # <<<<<<<<<<<<<<
+ *         self.lattice = new lattice.Lattice()
+ * 
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_7Lattice_1__cinit__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_7Lattice_1__cinit__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -13303,24 +14583,18 @@ static int __pyx_pw_4cdec_5_cdec_7Lattice_1__cinit__(PyObject *__pyx_v_self, PyO
     __Pyx_RaiseArgtupleInvalid("__cinit__", 1, 0, 0, PyTuple_GET_SIZE(__pyx_args)); return -1;}
   if (unlikely(__pyx_kwds) && unlikely(PyDict_Size(__pyx_kwds) > 0) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "__cinit__", 0))) return -1;
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Lattice___cinit__(((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":6
- *     cdef lattice.Lattice* lattice
- * 
- *     def __cinit__(self):             # <<<<<<<<<<<<<<
- *         self.lattice = new lattice.Lattice()
- * 
- */
-
 static int __pyx_pf_4cdec_5_cdec_7Lattice___cinit__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self) {
   int __pyx_r;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":7
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":7
  * 
  *     def __cinit__(self):
  *         self.lattice = new lattice.Lattice()             # <<<<<<<<<<<<<<
@@ -13329,11 +14603,28 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice___cinit__(struct __pyx_obj_4cdec_5_cde
  */
   __pyx_v_self->lattice = new Lattice();
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":6
+ *     cdef lattice.Lattice* lattice
+ * 
+ *     def __cinit__(self):             # <<<<<<<<<<<<<<
+ *         self.lattice = new lattice.Lattice()
+ * 
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":9
+ *         self.lattice = new lattice.Lattice()
+ * 
+ *     def __init__(self, inp):             # <<<<<<<<<<<<<<
+ *         """Lattice(tuple) -> Lattice from node list.
+ *         Lattice(string) -> Lattice from PLF representation."""
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_7Lattice_3__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_7Lattice_2__init__[] = "Lattice(tuple) -> Lattice from node list.\n        Lattice(string) -> Lattice from PLF representation.";
@@ -13349,7 +14640,7 @@ static int __pyx_pw_4cdec_5_cdec_7Lattice_3__init__(PyObject *__pyx_v_self, PyOb
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__init__ (wrapper)", 0);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__inp,0};
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_inp,0};
     PyObject* values[1] = {0};
     if (unlikely(__pyx_kwds)) {
       Py_ssize_t kw_args;
@@ -13362,7 +14653,7 @@ static int __pyx_pw_4cdec_5_cdec_7Lattice_3__init__(PyObject *__pyx_v_self, PyOb
       kw_args = PyDict_Size(__pyx_kwds);
       switch (pos_args) {
         case  0:
-        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__inp)) != 0)) kw_args--;
+        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_inp)) != 0)) kw_args--;
         else goto __pyx_L5_argtuple_error;
       }
       if (unlikely(kw_args > 0)) {
@@ -13384,18 +14675,12 @@ static int __pyx_pw_4cdec_5_cdec_7Lattice_3__init__(PyObject *__pyx_v_self, PyOb
   return -1;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Lattice_2__init__(((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_v_self), __pyx_v_inp);
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":9
- *         self.lattice = new lattice.Lattice()
- * 
- *     def __init__(self, inp):             # <<<<<<<<<<<<<<
- *         """Lattice(tuple) -> Lattice from node list.
- *         Lattice(string) -> Lattice from PLF representation."""
- */
-
 static int __pyx_pf_4cdec_5_cdec_7Lattice_2__init__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self, PyObject *__pyx_v_inp) {
   PyObject *__pyx_v_i = NULL;
   PyObject *__pyx_v_arcs = NULL;
@@ -13414,7 +14699,7 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice_2__init__(struct __pyx_obj_4cdec_5_cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":12
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":12
  *         """Lattice(tuple) -> Lattice from node list.
  *         Lattice(string) -> Lattice from PLF representation."""
  *         if isinstance(inp, tuple):             # <<<<<<<<<<<<<<
@@ -13425,7 +14710,7 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice_2__init__(struct __pyx_obj_4cdec_5_cde
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":13
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":13
  *         Lattice(string) -> Lattice from PLF representation."""
  *         if isinstance(inp, tuple):
  *             self.lattice.resize(len(inp))             # <<<<<<<<<<<<<<
@@ -13435,7 +14720,7 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice_2__init__(struct __pyx_obj_4cdec_5_cde
     __pyx_t_3 = PyObject_Length(__pyx_v_inp); if (unlikely(__pyx_t_3 == -1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __pyx_v_self->lattice->resize(__pyx_t_3);
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":14
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":14
  *         if isinstance(inp, tuple):
  *             self.lattice.resize(len(inp))
  *             for i, arcs in enumerate(inp):             # <<<<<<<<<<<<<<
@@ -13470,41 +14755,40 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice_2__init__(struct __pyx_obj_4cdec_5_cde
       } else {
         __pyx_t_7 = __pyx_t_6(__pyx_t_5);
         if (unlikely(!__pyx_t_7)) {
-          if (PyErr_Occurred()) {
-            if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
+          PyObject* exc_type = PyErr_Occurred();
+          if (exc_type) {
+            if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
             else {__pyx_filename = __pyx_f[4]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           }
           break;
         }
         __Pyx_GOTREF(__pyx_t_7);
       }
-      __Pyx_XDECREF(__pyx_v_arcs);
-      __pyx_v_arcs = __pyx_t_7;
+      __Pyx_XDECREF_SET(__pyx_v_arcs, __pyx_t_7);
       __pyx_t_7 = 0;
       __Pyx_INCREF(__pyx_t_4);
-      __Pyx_XDECREF(__pyx_v_i);
-      __pyx_v_i = __pyx_t_4;
+      __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_4);
       __pyx_t_7 = PyNumber_Add(__pyx_t_4, __pyx_int_1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_7);
       __Pyx_DECREF(__pyx_t_4);
       __pyx_t_4 = __pyx_t_7;
       __pyx_t_7 = 0;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":15
+      /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":15
  *             self.lattice.resize(len(inp))
  *             for i, arcs in enumerate(inp):
  *                 self[i] = arcs             # <<<<<<<<<<<<<<
  *         elif isinstance(inp, basestring):
  *             lattice.ConvertTextOrPLF(as_str(inp), self.lattice)
  */
-      if (PyObject_SetItem(((PyObject *)__pyx_v_self), __pyx_v_i, __pyx_v_arcs) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      if (unlikely(PyObject_SetItem(((PyObject *)__pyx_v_self), __pyx_v_i, __pyx_v_arcs) < 0)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     goto __pyx_L3;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":16
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":16
  *             for i, arcs in enumerate(inp):
  *                 self[i] = arcs
  *         elif isinstance(inp, basestring):             # <<<<<<<<<<<<<<
@@ -13515,14 +14799,14 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice_2__init__(struct __pyx_obj_4cdec_5_cde
   __pyx_t_1 = (__pyx_t_2 != 0);
   if (__pyx_t_1) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":17
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":17
  *                 self[i] = arcs
  *         elif isinstance(inp, basestring):
  *             lattice.ConvertTextOrPLF(as_str(inp), self.lattice)             # <<<<<<<<<<<<<<
  *         else:
  *             raise TypeError('cannot create lattice from %s' % type(inp))
  */
-    __pyx_t_4 = ((PyObject *)__pyx_f_4cdec_5_cdec_as_str(__pyx_v_inp, NULL)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __pyx_f_4cdec_5_cdec_as_str(__pyx_v_inp, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
     __pyx_t_8 = __pyx_convert_string_from_py_(__pyx_t_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
@@ -13531,29 +14815,38 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice_2__init__(struct __pyx_obj_4cdec_5_cde
   }
   /*else*/ {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":19
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":19
  *             lattice.ConvertTextOrPLF(as_str(inp), self.lattice)
  *         else:
  *             raise TypeError('cannot create lattice from %s' % type(inp))             # <<<<<<<<<<<<<<
  * 
  *     def __dealloc__(self):
  */
-    __pyx_t_4 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_22), ((PyObject *)Py_TYPE(__pyx_v_inp))); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_4));
+    __pyx_t_4 = __Pyx_PyString_Format(__pyx_kp_s_cannot_create_lattice_from_s, ((PyObject *)Py_TYPE(__pyx_v_inp))); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_4);
     __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
-    PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_t_4));
-    __Pyx_GIVEREF(((PyObject *)__pyx_t_4));
+    PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4);
+    __Pyx_GIVEREF(__pyx_t_4);
     __pyx_t_4 = 0;
-    __pyx_t_4 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __Pyx_Raise(__pyx_t_4, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     {__pyx_filename = __pyx_f[4]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
   __pyx_L3:;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":9
+ *         self.lattice = new lattice.Lattice()
+ * 
+ *     def __init__(self, inp):             # <<<<<<<<<<<<<<
+ *         """Lattice(tuple) -> Lattice from node list.
+ *         Lattice(string) -> Lattice from PLF representation."""
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -13569,28 +14862,30 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice_2__init__(struct __pyx_obj_4cdec_5_cde
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":21
+ *             raise TypeError('cannot create lattice from %s' % type(inp))
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.lattice
+ * 
+ */
+
 /* Python wrapper */
 static void __pyx_pw_4cdec_5_cdec_7Lattice_5__dealloc__(PyObject *__pyx_v_self); /*proto*/
 static void __pyx_pw_4cdec_5_cdec_7Lattice_5__dealloc__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__ (wrapper)", 0);
   __pyx_pf_4cdec_5_cdec_7Lattice_4__dealloc__(((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":21
- *             raise TypeError('cannot create lattice from %s' % type(inp))
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         del self.lattice
- * 
- */
-
-static void __pyx_pf_4cdec_5_cdec_7Lattice_4__dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self) {
+static void __pyx_pf_4cdec_5_cdec_7Lattice_4__dealloc__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":22
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":22
  * 
  *     def __dealloc__(self):
  *         del self.lattice             # <<<<<<<<<<<<<<
@@ -13599,9 +14894,26 @@ static void __pyx_pf_4cdec_5_cdec_7Lattice_4__dealloc__(CYTHON_UNUSED struct __p
  */
   delete __pyx_v_self->lattice;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":21
+ *             raise TypeError('cannot create lattice from %s' % type(inp))
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.lattice
+ * 
+ */
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":24
+ *         del self.lattice
+ * 
+ *     def __getitem__(self, int index):             # <<<<<<<<<<<<<<
+ *         if not 0 <= index < len(self):
+ *             raise IndexError('lattice index out of range')
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_7__getitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_index); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_7__getitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_index) {
@@ -13613,7 +14925,7 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_7__getitem__(PyObject *__pyx_v_s
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__getitem__ (wrapper)", 0);
   assert(__pyx_arg_index); {
-    __pyx_v_index = __Pyx_PyInt_AsInt(__pyx_arg_index); if (unlikely((__pyx_v_index == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    __pyx_v_index = __Pyx_PyInt_As_int(__pyx_arg_index); if (unlikely((__pyx_v_index == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -13622,18 +14934,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_7__getitem__(PyObject *__pyx_v_s
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Lattice_6__getitem__(((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_v_self), ((int)__pyx_v_index));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":24
- *         del self.lattice
- * 
- *     def __getitem__(self, int index):             # <<<<<<<<<<<<<<
- *         if not 0 <= index < len(self):
- *             raise IndexError('lattice index out of range')
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_6__getitem__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self, int __pyx_v_index) {
   PyObject *__pyx_v_arcs = NULL;
   std::vector<LatticeArc> __pyx_v_arc_vector;
@@ -13656,7 +14962,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_6__getitem__(struct __pyx_obj_4c
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__getitem__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":25
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":25
  * 
  *     def __getitem__(self, int index):
  *         if not 0 <= index < len(self):             # <<<<<<<<<<<<<<
@@ -13671,23 +14977,21 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_6__getitem__(struct __pyx_obj_4c
   __pyx_t_3 = ((!(__pyx_t_1 != 0)) != 0);
   if (__pyx_t_3) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":26
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":26
  *     def __getitem__(self, int index):
  *         if not 0 <= index < len(self):
  *             raise IndexError('lattice index out of range')             # <<<<<<<<<<<<<<
  *         arcs = []
  *         cdef vector[lattice.LatticeArc] arc_vector = self.lattice[0][index]
  */
-    __pyx_t_4 = PyObject_Call(__pyx_builtin_IndexError, ((PyObject *)__pyx_k_tuple_24), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_IndexError, __pyx_tuple__8, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_Raise(__pyx_t_4, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     {__pyx_filename = __pyx_f[4]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    goto __pyx_L3;
   }
-  __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":27
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":27
  *         if not 0 <= index < len(self):
  *             raise IndexError('lattice index out of range')
  *         arcs = []             # <<<<<<<<<<<<<<
@@ -13699,7 +15003,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_6__getitem__(struct __pyx_obj_4c
   __pyx_v_arcs = ((PyObject*)__pyx_t_4);
   __pyx_t_4 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":28
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":28
  *             raise IndexError('lattice index out of range')
  *         arcs = []
  *         cdef vector[lattice.LatticeArc] arc_vector = self.lattice[0][index]             # <<<<<<<<<<<<<<
@@ -13708,7 +15012,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_6__getitem__(struct __pyx_obj_4c
  */
   __pyx_v_arc_vector = ((__pyx_v_self->lattice[0])[__pyx_v_index]);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":31
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":31
  *         cdef lattice.LatticeArc* arc
  *         cdef unsigned i
  *         for i in range(arc_vector.size()):             # <<<<<<<<<<<<<<
@@ -13719,7 +15023,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_6__getitem__(struct __pyx_obj_4c
   for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {
     __pyx_v_i = __pyx_t_6;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":32
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":32
  *         cdef unsigned i
  *         for i in range(arc_vector.size()):
  *             arc = &arc_vector[i]             # <<<<<<<<<<<<<<
@@ -13728,7 +15032,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_6__getitem__(struct __pyx_obj_4c
  */
     __pyx_v_arc = (&(__pyx_v_arc_vector[__pyx_v_i]));
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":33
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":33
  *         for i in range(arc_vector.size()):
  *             arc = &arc_vector[i]
  *             label = unicode(TDConvert(arc.label).c_str(), 'utf8')             # <<<<<<<<<<<<<<
@@ -13736,23 +15040,22 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_6__getitem__(struct __pyx_obj_4c
  *         return tuple(arcs)
  */
     __pyx_t_4 = __Pyx_PyBytes_FromString(TD::Convert(__pyx_v_arc->label).c_str()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_4));
+    __Pyx_GOTREF(__pyx_t_4);
     __pyx_t_7 = PyTuple_New(2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_7);
-    PyTuple_SET_ITEM(__pyx_t_7, 0, ((PyObject *)__pyx_t_4));
-    __Pyx_GIVEREF(((PyObject *)__pyx_t_4));
-    __Pyx_INCREF(((PyObject *)__pyx_n_s__utf8));
-    PyTuple_SET_ITEM(__pyx_t_7, 1, ((PyObject *)__pyx_n_s__utf8));
-    __Pyx_GIVEREF(((PyObject *)__pyx_n_s__utf8));
+    PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_4);
+    __Pyx_GIVEREF(__pyx_t_4);
+    __Pyx_INCREF(__pyx_n_s_utf8);
+    PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_n_s_utf8);
+    __Pyx_GIVEREF(__pyx_n_s_utf8);
     __pyx_t_4 = 0;
-    __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), ((PyObject *)__pyx_t_7), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), __pyx_t_7, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_DECREF(((PyObject *)__pyx_t_7)); __pyx_t_7 = 0;
-    __Pyx_XDECREF(((PyObject *)__pyx_v_label));
-    __pyx_v_label = ((PyObject*)__pyx_t_4);
+    __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
+    __Pyx_XDECREF_SET(__pyx_v_label, ((PyObject*)__pyx_t_4));
     __pyx_t_4 = 0;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":34
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":34
  *             arc = &arc_vector[i]
  *             label = unicode(TDConvert(arc.label).c_str(), 'utf8')
  *             arcs.append((label, arc.cost, arc.dist2next))             # <<<<<<<<<<<<<<
@@ -13761,24 +15064,24 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_6__getitem__(struct __pyx_obj_4c
  */
     __pyx_t_4 = PyFloat_FromDouble(__pyx_v_arc->cost); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
-    __pyx_t_7 = PyInt_FromLong(__pyx_v_arc->dist2next); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_7 = __Pyx_PyInt_From_int(__pyx_v_arc->dist2next); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_7);
     __pyx_t_8 = PyTuple_New(3); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_8);
-    __Pyx_INCREF(((PyObject *)__pyx_v_label));
-    PyTuple_SET_ITEM(__pyx_t_8, 0, ((PyObject *)__pyx_v_label));
-    __Pyx_GIVEREF(((PyObject *)__pyx_v_label));
+    __Pyx_INCREF(__pyx_v_label);
+    PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_v_label);
+    __Pyx_GIVEREF(__pyx_v_label);
     PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_t_4);
     __Pyx_GIVEREF(__pyx_t_4);
     PyTuple_SET_ITEM(__pyx_t_8, 2, __pyx_t_7);
     __Pyx_GIVEREF(__pyx_t_7);
     __pyx_t_4 = 0;
     __pyx_t_7 = 0;
-    __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_arcs, ((PyObject *)__pyx_t_8)); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_DECREF(((PyObject *)__pyx_t_8)); __pyx_t_8 = 0;
+    __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_arcs, __pyx_t_8); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":35
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":35
  *             label = unicode(TDConvert(arc.label).c_str(), 'utf8')
  *             arcs.append((label, arc.cost, arc.dist2next))
  *         return tuple(arcs)             # <<<<<<<<<<<<<<
@@ -13786,14 +15089,21 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_6__getitem__(struct __pyx_obj_4c
  *     def __setitem__(self, int index, tuple arcs):
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_8 = ((PyObject *)PyList_AsTuple(__pyx_v_arcs)); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_8));
-  __pyx_r = ((PyObject *)__pyx_t_8);
+  __pyx_t_8 = PyList_AsTuple(__pyx_v_arcs); if (unlikely(!__pyx_t_8)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_8);
+  __pyx_r = __pyx_t_8;
   __pyx_t_8 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":24
+ *         del self.lattice
+ * 
+ *     def __getitem__(self, int index):             # <<<<<<<<<<<<<<
+ *         if not 0 <= index < len(self):
+ *             raise IndexError('lattice index out of range')
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_4);
   __Pyx_XDECREF(__pyx_t_7);
@@ -13808,6 +15118,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_6__getitem__(struct __pyx_obj_4c
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":37
+ *         return tuple(arcs)
+ * 
+ *     def __setitem__(self, int index, tuple arcs):             # <<<<<<<<<<<<<<
+ *         if not 0 <= index < len(self):
+ *             raise IndexError('lattice index out of range')
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_7Lattice_9__setitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_index, PyObject *__pyx_v_arcs); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_7Lattice_9__setitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_index, PyObject *__pyx_v_arcs) {
@@ -13819,7 +15137,7 @@ static int __pyx_pw_4cdec_5_cdec_7Lattice_9__setitem__(PyObject *__pyx_v_self, P
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__setitem__ (wrapper)", 0);
   assert(__pyx_arg_index); {
-    __pyx_v_index = __Pyx_PyInt_AsInt(__pyx_arg_index); if (unlikely((__pyx_v_index == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    __pyx_v_index = __Pyx_PyInt_As_int(__pyx_arg_index); if (unlikely((__pyx_v_index == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -13829,6 +15147,8 @@ static int __pyx_pw_4cdec_5_cdec_7Lattice_9__setitem__(PyObject *__pyx_v_self, P
   __pyx_L4_argument_unpacking_done:;
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_arcs), (&PyTuple_Type), 1, "arcs", 1))) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Lattice_8__setitem__(((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_v_self), ((int)__pyx_v_index), ((PyObject*)__pyx_v_arcs));
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __pyx_r = -1;
@@ -13837,14 +15157,6 @@ static int __pyx_pw_4cdec_5_cdec_7Lattice_9__setitem__(PyObject *__pyx_v_self, P
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":37
- *         return tuple(arcs)
- * 
- *     def __setitem__(self, int index, tuple arcs):             # <<<<<<<<<<<<<<
- *         if not 0 <= index < len(self):
- *             raise IndexError('lattice index out of range')
- */
-
 static int __pyx_pf_4cdec_5_cdec_7Lattice_8__setitem__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self, int __pyx_v_index, PyObject *__pyx_v_arcs) {
   LatticeArc *__pyx_v_arc;
   PyObject *__pyx_v_label = NULL;
@@ -13871,7 +15183,7 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice_8__setitem__(struct __pyx_obj_4cdec_5_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__setitem__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":38
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":38
  * 
  *     def __setitem__(self, int index, tuple arcs):
  *         if not 0 <= index < len(self):             # <<<<<<<<<<<<<<
@@ -13886,34 +15198,32 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice_8__setitem__(struct __pyx_obj_4cdec_5_
   __pyx_t_3 = ((!(__pyx_t_1 != 0)) != 0);
   if (__pyx_t_3) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":39
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":39
  *     def __setitem__(self, int index, tuple arcs):
  *         if not 0 <= index < len(self):
  *             raise IndexError('lattice index out of range')             # <<<<<<<<<<<<<<
  *         cdef lattice.LatticeArc* arc
  *         for (label, cost, dist2next) in arcs:
  */
-    __pyx_t_4 = PyObject_Call(__pyx_builtin_IndexError, ((PyObject *)__pyx_k_tuple_25), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_IndexError, __pyx_tuple__9, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_Raise(__pyx_t_4, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     {__pyx_filename = __pyx_f[4]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    goto __pyx_L3;
   }
-  __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":41
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":41
  *             raise IndexError('lattice index out of range')
  *         cdef lattice.LatticeArc* arc
  *         for (label, cost, dist2next) in arcs:             # <<<<<<<<<<<<<<
  *             label_str = as_str(label)
  *             arc = new lattice.LatticeArc(TDConvert(label_str), cost, dist2next)
  */
-  if (unlikely(((PyObject *)__pyx_v_arcs) == Py_None)) {
+  if (unlikely(__pyx_v_arcs == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable");
     {__pyx_filename = __pyx_f[4]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
-  __pyx_t_4 = ((PyObject *)__pyx_v_arcs); __Pyx_INCREF(__pyx_t_4); __pyx_t_2 = 0;
+  __pyx_t_4 = __pyx_v_arcs; __Pyx_INCREF(__pyx_t_4); __pyx_t_2 = 0;
   for (;;) {
     if (__pyx_t_2 >= PyTuple_GET_SIZE(__pyx_t_4)) break;
     #if CYTHON_COMPILING_IN_CPYTHON
@@ -13955,8 +15265,7 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice_8__setitem__(struct __pyx_obj_4cdec_5_
       __Pyx_GOTREF(__pyx_t_8);
       #endif
       __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-    } else
-    {
+    } else {
       Py_ssize_t index = -1;
       __pyx_t_9 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_9);
@@ -13979,42 +15288,38 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice_8__setitem__(struct __pyx_obj_4cdec_5_
       {__pyx_filename = __pyx_f[4]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __pyx_L7_unpacking_done:;
     }
-    __Pyx_XDECREF(__pyx_v_label);
-    __pyx_v_label = __pyx_t_6;
+    __Pyx_XDECREF_SET(__pyx_v_label, __pyx_t_6);
     __pyx_t_6 = 0;
-    __Pyx_XDECREF(__pyx_v_cost);
-    __pyx_v_cost = __pyx_t_7;
+    __Pyx_XDECREF_SET(__pyx_v_cost, __pyx_t_7);
     __pyx_t_7 = 0;
-    __Pyx_XDECREF(__pyx_v_dist2next);
-    __pyx_v_dist2next = __pyx_t_8;
+    __Pyx_XDECREF_SET(__pyx_v_dist2next, __pyx_t_8);
     __pyx_t_8 = 0;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":42
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":42
  *         cdef lattice.LatticeArc* arc
  *         for (label, cost, dist2next) in arcs:
  *             label_str = as_str(label)             # <<<<<<<<<<<<<<
  *             arc = new lattice.LatticeArc(TDConvert(label_str), cost, dist2next)
  *             self.lattice[0][index].push_back(arc[0])
  */
-    __pyx_t_5 = ((PyObject *)__pyx_f_4cdec_5_cdec_as_str(__pyx_v_label, NULL)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_5 = __pyx_f_4cdec_5_cdec_as_str(__pyx_v_label, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
-    __Pyx_XDECREF(((PyObject *)__pyx_v_label_str));
-    __pyx_v_label_str = ((PyObject*)__pyx_t_5);
+    __Pyx_XDECREF_SET(__pyx_v_label_str, ((PyObject*)__pyx_t_5));
     __pyx_t_5 = 0;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":43
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":43
  *         for (label, cost, dist2next) in arcs:
  *             label_str = as_str(label)
  *             arc = new lattice.LatticeArc(TDConvert(label_str), cost, dist2next)             # <<<<<<<<<<<<<<
  *             self.lattice[0][index].push_back(arc[0])
  *             del arc
  */
-    __pyx_t_11 = __Pyx_PyObject_AsString(((PyObject *)__pyx_v_label_str)); if (unlikely((!__pyx_t_11) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_11 = __Pyx_PyObject_AsString(__pyx_v_label_str); if (unlikely((!__pyx_t_11) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __pyx_t_12 = __pyx_PyFloat_AsDouble(__pyx_v_cost); if (unlikely((__pyx_t_12 == (double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __pyx_t_13 = __Pyx_PyInt_AsInt(__pyx_v_dist2next); if (unlikely((__pyx_t_13 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_13 = __Pyx_PyInt_As_int(__pyx_v_dist2next); if (unlikely((__pyx_t_13 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __pyx_v_arc = new LatticeArc(TD::Convert(__pyx_t_11), __pyx_t_12, __pyx_t_13);
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":44
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":44
  *             label_str = as_str(label)
  *             arc = new lattice.LatticeArc(TDConvert(label_str), cost, dist2next)
  *             self.lattice[0][index].push_back(arc[0])             # <<<<<<<<<<<<<<
@@ -14023,7 +15328,7 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice_8__setitem__(struct __pyx_obj_4cdec_5_
  */
     ((__pyx_v_self->lattice[0])[__pyx_v_index]).push_back((__pyx_v_arc[0]));
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":45
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":45
  *             arc = new lattice.LatticeArc(TDConvert(label_str), cost, dist2next)
  *             self.lattice[0][index].push_back(arc[0])
  *             del arc             # <<<<<<<<<<<<<<
@@ -14034,6 +15339,15 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice_8__setitem__(struct __pyx_obj_4cdec_5_
   }
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":37
+ *         return tuple(arcs)
+ * 
+ *     def __setitem__(self, int index, tuple arcs):             # <<<<<<<<<<<<<<
+ *         if not 0 <= index < len(self):
+ *             raise IndexError('lattice index out of range')
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -14054,6 +15368,14 @@ static int __pyx_pf_4cdec_5_cdec_7Lattice_8__setitem__(struct __pyx_obj_4cdec_5_
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":47
+ *             del arc
+ * 
+ *     def __len__(self):             # <<<<<<<<<<<<<<
+ *         return self.lattice.size()
+ * 
+ */
+
 /* Python wrapper */
 static Py_ssize_t __pyx_pw_4cdec_5_cdec_7Lattice_11__len__(PyObject *__pyx_v_self); /*proto*/
 static Py_ssize_t __pyx_pw_4cdec_5_cdec_7Lattice_11__len__(PyObject *__pyx_v_self) {
@@ -14061,24 +15383,18 @@ static Py_ssize_t __pyx_pw_4cdec_5_cdec_7Lattice_11__len__(PyObject *__pyx_v_sel
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Lattice_10__len__(((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":47
- *             del arc
- * 
- *     def __len__(self):             # <<<<<<<<<<<<<<
- *         return self.lattice.size()
- * 
- */
-
 static Py_ssize_t __pyx_pf_4cdec_5_cdec_7Lattice_10__len__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self) {
   Py_ssize_t __pyx_r;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":48
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":48
  * 
  *     def __len__(self):
  *         return self.lattice.size()             # <<<<<<<<<<<<<<
@@ -14088,12 +15404,28 @@ static Py_ssize_t __pyx_pf_4cdec_5_cdec_7Lattice_10__len__(struct __pyx_obj_4cde
   __pyx_r = __pyx_v_self->lattice->size();
   goto __pyx_L0;
 
-  __pyx_r = 0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":47
+ *             del arc
+ * 
+ *     def __len__(self):             # <<<<<<<<<<<<<<
+ *         return self.lattice.size()
+ * 
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":50
+ *         return self.lattice.size()
+ * 
+ *     def __str__(self):             # <<<<<<<<<<<<<<
+ *         return str(hypergraph.AsPLF(self.lattice[0], True).c_str())
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_13__str__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_13__str__(PyObject *__pyx_v_self) {
@@ -14101,18 +15433,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_13__str__(PyObject *__pyx_v_self
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__str__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Lattice_12__str__(((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":50
- *         return self.lattice.size()
- * 
- *     def __str__(self):             # <<<<<<<<<<<<<<
- *         return str(hypergraph.AsPLF(self.lattice[0], True).c_str())
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_12__str__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -14123,7 +15449,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_12__str__(struct __pyx_obj_4cdec
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__str__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":51
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":51
  * 
  *     def __str__(self):
  *         return str(hypergraph.AsPLF(self.lattice[0], True).c_str())             # <<<<<<<<<<<<<<
@@ -14132,21 +15458,28 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_12__str__(struct __pyx_obj_4cdec
  */
   __Pyx_XDECREF(__pyx_r);
   __pyx_t_1 = __Pyx_PyBytes_FromString(HypergraphIO::AsPLF((__pyx_v_self->lattice[0]), 1).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_1));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":50
+ *         return self.lattice.size()
+ * 
+ *     def __str__(self):             # <<<<<<<<<<<<<<
+ *         return str(hypergraph.AsPLF(self.lattice[0], True).c_str())
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -14158,6 +15491,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_12__str__(struct __pyx_obj_4cdec
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":53
+ *         return str(hypergraph.AsPLF(self.lattice[0], True).c_str())
+ * 
+ *     def __unicode__(self):             # <<<<<<<<<<<<<<
+ *         return unicode(str(self), 'utf8')
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_15__unicode__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_15__unicode__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused) {
@@ -14165,18 +15506,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_15__unicode__(PyObject *__pyx_v_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__unicode__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Lattice_14__unicode__(((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":53
- *         return str(hypergraph.AsPLF(self.lattice[0], True).c_str())
- * 
- *     def __unicode__(self):             # <<<<<<<<<<<<<<
- *         return unicode(str(self), 'utf8')
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_14__unicode__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -14187,7 +15522,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_14__unicode__(struct __pyx_obj_4
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__unicode__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":54
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":54
  * 
  *     def __unicode__(self):
  *         return unicode(str(self), 'utf8')             # <<<<<<<<<<<<<<
@@ -14200,26 +15535,33 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_14__unicode__(struct __pyx_obj_4
   __Pyx_INCREF(((PyObject *)__pyx_v_self));
   PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_v_self));
   __Pyx_GIVEREF(((PyObject *)__pyx_v_self));
-  __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_2);
-  __Pyx_INCREF(((PyObject *)__pyx_n_s__utf8));
-  PyTuple_SET_ITEM(__pyx_t_1, 1, ((PyObject *)__pyx_n_s__utf8));
-  __Pyx_GIVEREF(((PyObject *)__pyx_n_s__utf8));
+  __Pyx_INCREF(__pyx_n_s_utf8);
+  PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_n_s_utf8);
+  __Pyx_GIVEREF(__pyx_n_s_utf8);
   __pyx_t_2 = 0;
-  __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_r = __pyx_t_2;
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":53
+ *         return str(hypergraph.AsPLF(self.lattice[0], True).c_str())
+ * 
+ *     def __unicode__(self):             # <<<<<<<<<<<<<<
+ *         return unicode(str(self), 'utf8')
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -14232,6 +15574,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_14__unicode__(struct __pyx_obj_4
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_18generator14(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":56
+ *         return unicode(str(self), 'utf8')
+ * 
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         cdef unsigned i
+ *         for i in range(len(self)):
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_17__iter__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_17__iter__(PyObject *__pyx_v_self) {
@@ -14239,18 +15589,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_17__iter__(PyObject *__pyx_v_sel
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__iter__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Lattice_16__iter__(((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":56
- *         return unicode(str(self), 'utf8')
- * 
- *     def __iter__(self):             # <<<<<<<<<<<<<<
- *         cdef unsigned i
- *         for i in range(len(self)):
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_16__iter__(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_18___iter__ *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -14275,6 +15619,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_16__iter__(struct __pyx_obj_4cde
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -14309,7 +15654,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_18generator14(__pyx_GeneratorObj
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":58
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":58
  *     def __iter__(self):
  *         cdef unsigned i
  *         for i in range(len(self)):             # <<<<<<<<<<<<<<
@@ -14320,14 +15665,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_18generator14(__pyx_GeneratorObj
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_2;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":59
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":59
  *         cdef unsigned i
  *         for i in range(len(self)):
  *             yield self[i]             # <<<<<<<<<<<<<<
  * 
  *     def todot(self):
  */
-    __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_cur_scope->__pyx_v_self), __pyx_cur_scope->__pyx_v_i, sizeof(unsigned int)+1, PyLong_FromUnsignedLong, 0, 0, 1); if (!__pyx_t_3) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_cur_scope->__pyx_v_self), __pyx_cur_scope->__pyx_v_i, unsigned int, 0, __Pyx_PyInt_From_unsigned_int, 0, 0, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
     __Pyx_GOTREF(__pyx_t_3);
     __pyx_r = __pyx_t_3;
     __pyx_t_3 = 0;
@@ -14343,6 +15688,16 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_18generator14(__pyx_GeneratorObj
     __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
     if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":56
+ *         return unicode(str(self), 'utf8')
+ * 
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         cdef unsigned i
+ *         for i in range(len(self)):
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -14356,6 +15711,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_18generator14(__pyx_GeneratorObj
   return NULL;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":61
+ *             yield self[i]
+ * 
+ *     def todot(self):             # <<<<<<<<<<<<<<
+ *         """lattice.todot() -> Representation of the lattice in GraphViz dot format."""
+ *         def lines():
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_20todot(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_7Lattice_19todot[] = "lattice.todot() -> Representation of the lattice in GraphViz dot format.";
@@ -14364,11 +15727,21 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_20todot(PyObject *__pyx_v_self,
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("todot (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Lattice_19todot(((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":63
+ *     def todot(self):
+ *         """lattice.todot() -> Representation of the lattice in GraphViz dot format."""
+ *         def lines():             # <<<<<<<<<<<<<<
+ *             yield 'digraph lattice {'
+ *             yield 'rankdir = LR;'
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_5todot_1lines(PyObject *__pyx_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static PyMethodDef __pyx_mdef_4cdec_5_cdec_7Lattice_5todot_1lines = {__Pyx_NAMESTR("lines"), (PyCFunction)__pyx_pw_4cdec_5_cdec_7Lattice_5todot_1lines, METH_NOARGS, __Pyx_DOCSTR(0)};
@@ -14377,18 +15750,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_5todot_1lines(PyObject *__pyx_se
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("lines (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Lattice_5todot_lines(__pyx_self);
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":63
- *     def todot(self):
- *         """lattice.todot() -> Representation of the lattice in GraphViz dot format."""
- *         def lines():             # <<<<<<<<<<<<<<
- *             yield 'digraph lattice {'
- *             yield 'rankdir = LR;'
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_5todot_lines(PyObject *__pyx_self) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -14413,6 +15780,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_5todot_lines(PyObject *__pyx_sel
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -14461,15 +15829,15 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":64
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":64
  *         """lattice.todot() -> Representation of the lattice in GraphViz dot format."""
  *         def lines():
  *             yield 'digraph lattice {'             # <<<<<<<<<<<<<<
  *             yield 'rankdir = LR;'
  *             yield 'node [shape=circle];'
  */
-  __Pyx_INCREF(((PyObject *)__pyx_kp_s_26));
-  __pyx_r = ((PyObject *)__pyx_kp_s_26);
+  __Pyx_INCREF(__pyx_kp_s_digraph_lattice);
+  __pyx_r = __pyx_kp_s_digraph_lattice;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
   /* return from generator, yielding value */
@@ -14478,15 +15846,15 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
   __pyx_L4_resume_from_yield:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":65
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":65
  *         def lines():
  *             yield 'digraph lattice {'
  *             yield 'rankdir = LR;'             # <<<<<<<<<<<<<<
  *             yield 'node [shape=circle];'
  *             for i in range(len(self)):
  */
-  __Pyx_INCREF(((PyObject *)__pyx_kp_s_27));
-  __pyx_r = ((PyObject *)__pyx_kp_s_27);
+  __Pyx_INCREF(__pyx_kp_s_rankdir_LR);
+  __pyx_r = __pyx_kp_s_rankdir_LR;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
   /* return from generator, yielding value */
@@ -14495,15 +15863,15 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
   __pyx_L5_resume_from_yield:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":66
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":66
  *             yield 'digraph lattice {'
  *             yield 'rankdir = LR;'
  *             yield 'node [shape=circle];'             # <<<<<<<<<<<<<<
  *             for i in range(len(self)):
  *                 for label, weight, delta in self[i]:
  */
-  __Pyx_INCREF(((PyObject *)__pyx_kp_s_28));
-  __pyx_r = ((PyObject *)__pyx_kp_s_28);
+  __Pyx_INCREF(__pyx_kp_s_node_shape_circle);
+  __pyx_r = __pyx_kp_s_node_shape_circle;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
   /* return from generator, yielding value */
@@ -14512,7 +15880,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
   __pyx_L6_resume_from_yield:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":67
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":67
  *             yield 'rankdir = LR;'
  *             yield 'node [shape=circle];'
  *             for i in range(len(self)):             # <<<<<<<<<<<<<<
@@ -14531,9 +15899,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
   PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1);
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
-  __pyx_t_1 = PyObject_Call(__pyx_builtin_range, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (PyList_CheckExact(__pyx_t_1) || PyTuple_CheckExact(__pyx_t_1)) {
     __pyx_t_3 = __pyx_t_1; __Pyx_INCREF(__pyx_t_3); __pyx_t_2 = 0;
     __pyx_t_4 = NULL;
@@ -14561,8 +15929,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
     } else {
       __pyx_t_1 = __pyx_t_4(__pyx_t_3);
       if (unlikely(!__pyx_t_1)) {
-        if (PyErr_Occurred()) {
-          if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
+        PyObject* exc_type = PyErr_Occurred();
+        if (exc_type) {
+          if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
           else {__pyx_filename = __pyx_f[4]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         }
         break;
@@ -14570,19 +15939,19 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
       __Pyx_GOTREF(__pyx_t_1);
     }
     __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_i);
-    __Pyx_XDECREF(__pyx_cur_scope->__pyx_v_i);
+    __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_i, __pyx_t_1);
     __Pyx_GIVEREF(__pyx_t_1);
-    __pyx_cur_scope->__pyx_v_i = __pyx_t_1;
     __pyx_t_1 = 0;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":68
+    /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":68
  *             yield 'node [shape=circle];'
  *             for i in range(len(self)):
  *                 for label, weight, delta in self[i]:             # <<<<<<<<<<<<<<
  *                     yield '%d -> %d [label="%s"];' % (i, i+delta, label.replace('"', '\\"'))
  *             yield '%d [shape=doublecircle]' % len(self)
  */
-    __pyx_t_1 = PyObject_GetItem(((PyObject *)__pyx_cur_scope->__pyx_outer_scope->__pyx_v_self), __pyx_cur_scope->__pyx_v_i); if (!__pyx_t_1) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (unlikely(!__pyx_cur_scope->__pyx_outer_scope->__pyx_v_self)) { __Pyx_RaiseClosureNameError("self"); {__pyx_filename = __pyx_f[4]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;} }
+    __pyx_t_1 = PyObject_GetItem(((PyObject *)__pyx_cur_scope->__pyx_outer_scope->__pyx_v_self), __pyx_cur_scope->__pyx_v_i); if (unlikely(__pyx_t_1 == NULL)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
     __Pyx_GOTREF(__pyx_t_1);
     if (PyList_CheckExact(__pyx_t_1) || PyTuple_CheckExact(__pyx_t_1)) {
       __pyx_t_5 = __pyx_t_1; __Pyx_INCREF(__pyx_t_5); __pyx_t_6 = 0;
@@ -14611,8 +15980,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
       } else {
         __pyx_t_1 = __pyx_t_7(__pyx_t_5);
         if (unlikely(!__pyx_t_1)) {
-          if (PyErr_Occurred()) {
-            if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
+          PyObject* exc_type = PyErr_Occurred();
+          if (exc_type) {
+            if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
             else {__pyx_filename = __pyx_f[4]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           }
           break;
@@ -14653,8 +16023,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
         __Pyx_GOTREF(__pyx_t_10);
         #endif
         __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-      } else
-      {
+      } else {
         Py_ssize_t index = -1;
         __pyx_t_11 = PyObject_GetIter(__pyx_t_1); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __Pyx_GOTREF(__pyx_t_11);
@@ -14678,22 +16047,19 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
         __pyx_L12_unpacking_done:;
       }
       __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_label);
-      __Pyx_XDECREF(__pyx_cur_scope->__pyx_v_label);
+      __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_label, __pyx_t_8);
       __Pyx_GIVEREF(__pyx_t_8);
-      __pyx_cur_scope->__pyx_v_label = __pyx_t_8;
       __pyx_t_8 = 0;
       __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_weight);
-      __Pyx_XDECREF(__pyx_cur_scope->__pyx_v_weight);
+      __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_weight, __pyx_t_9);
       __Pyx_GIVEREF(__pyx_t_9);
-      __pyx_cur_scope->__pyx_v_weight = __pyx_t_9;
       __pyx_t_9 = 0;
       __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_delta);
-      __Pyx_XDECREF(__pyx_cur_scope->__pyx_v_delta);
+      __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_delta, __pyx_t_10);
       __Pyx_GIVEREF(__pyx_t_10);
-      __pyx_cur_scope->__pyx_v_delta = __pyx_t_10;
       __pyx_t_10 = 0;
 
-      /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":69
+      /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":69
  *             for i in range(len(self)):
  *                 for label, weight, delta in self[i]:
  *                     yield '%d -> %d [label="%s"];' % (i, i+delta, label.replace('"', '\\"'))             # <<<<<<<<<<<<<<
@@ -14702,9 +16068,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
  */
       __pyx_t_1 = PyNumber_Add(__pyx_cur_scope->__pyx_v_i, __pyx_cur_scope->__pyx_v_delta); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_1);
-      __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_label, __pyx_n_s__replace); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_10 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_label, __pyx_n_s_replace); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_10);
-      __pyx_t_9 = PyObject_Call(__pyx_t_10, ((PyObject *)__pyx_k_tuple_32), NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_9 = __Pyx_PyObject_Call(__pyx_t_10, __pyx_tuple__12, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_9);
       __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
       __pyx_t_10 = PyTuple_New(3); if (unlikely(!__pyx_t_10)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -14718,10 +16084,10 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
       __Pyx_GIVEREF(__pyx_t_9);
       __pyx_t_1 = 0;
       __pyx_t_9 = 0;
-      __pyx_t_9 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_29), ((PyObject *)__pyx_t_10)); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_9));
-      __Pyx_DECREF(((PyObject *)__pyx_t_10)); __pyx_t_10 = 0;
-      __pyx_r = ((PyObject *)__pyx_t_9);
+      __pyx_t_9 = __Pyx_PyString_Format(__pyx_kp_s_d_d_label_s, __pyx_t_10); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_9);
+      __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
+      __pyx_r = __pyx_t_9;
       __pyx_t_9 = 0;
       __pyx_cur_scope->__pyx_t_0 = __pyx_t_2;
       __Pyx_XGIVEREF(__pyx_t_3);
@@ -14753,23 +16119,24 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
   }
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":70
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":70
  *                 for label, weight, delta in self[i]:
  *                     yield '%d -> %d [label="%s"];' % (i, i+delta, label.replace('"', '\\"'))
  *             yield '%d [shape=doublecircle]' % len(self)             # <<<<<<<<<<<<<<
  *             yield '}'
  *         return '\n'.join(lines()).encode('utf8')
  */
+  if (unlikely(!__pyx_cur_scope->__pyx_outer_scope->__pyx_v_self)) { __Pyx_RaiseClosureNameError("self"); {__pyx_filename = __pyx_f[4]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;} }
   __pyx_t_3 = ((PyObject *)__pyx_cur_scope->__pyx_outer_scope->__pyx_v_self);
   __Pyx_INCREF(__pyx_t_3);
   __pyx_t_2 = PyObject_Length(__pyx_t_3); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_t_3 = PyInt_FromSsize_t(__pyx_t_2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_5 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_33), __pyx_t_3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_5));
+  __pyx_t_5 = __Pyx_PyString_Format(__pyx_kp_s_d_shape_doublecircle, __pyx_t_3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_r = ((PyObject *)__pyx_t_5);
+  __pyx_r = __pyx_t_5;
   __pyx_t_5 = 0;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
@@ -14779,15 +16146,15 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
   __pyx_L14_resume_from_yield:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":71
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":71
  *                     yield '%d -> %d [label="%s"];' % (i, i+delta, label.replace('"', '\\"'))
  *             yield '%d [shape=doublecircle]' % len(self)
  *             yield '}'             # <<<<<<<<<<<<<<
  *         return '\n'.join(lines()).encode('utf8')
  * 
  */
-  __Pyx_INCREF(((PyObject *)__pyx_kp_s_34));
-  __pyx_r = ((PyObject *)__pyx_kp_s_34);
+  __Pyx_INCREF(__pyx_kp_s__13);
+  __pyx_r = __pyx_kp_s__13;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
   /* return from generator, yielding value */
@@ -14795,6 +16162,16 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
   return __pyx_r;
   __pyx_L15_resume_from_yield:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":63
+ *     def todot(self):
+ *         """lattice.todot() -> Representation of the lattice in GraphViz dot format."""
+ *         def lines():             # <<<<<<<<<<<<<<
+ *             yield 'digraph lattice {'
+ *             yield 'rankdir = LR;'
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -14814,7 +16191,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Lattice_5todot_2generator20(__pyx_Genera
   return NULL;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":61
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":61
  *             yield self[i]
  * 
  *     def todot(self):             # <<<<<<<<<<<<<<
@@ -14829,7 +16206,6 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_19todot(struct __pyx_obj_4cdec_5
   __Pyx_RefNannyDeclarations
   PyObject *__pyx_t_1 = NULL;
   PyObject *__pyx_t_2 = NULL;
-  PyObject *__pyx_t_3 = NULL;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -14844,19 +16220,19 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_19todot(struct __pyx_obj_4cdec_5
   __Pyx_INCREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
   __Pyx_GIVEREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":63
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":63
  *     def todot(self):
  *         """lattice.todot() -> Representation of the lattice in GraphViz dot format."""
  *         def lines():             # <<<<<<<<<<<<<<
  *             yield 'digraph lattice {'
  *             yield 'rankdir = LR;'
  */
-  __pyx_t_1 = __Pyx_CyFunction_NewEx(&__pyx_mdef_4cdec_5_cdec_7Lattice_5todot_1lines, 0, __pyx_n_s_38, ((PyObject*)__pyx_cur_scope), __pyx_n_s_39, ((PyObject *)__pyx_k_codeobj_36)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_CyFunction_NewEx(&__pyx_mdef_4cdec_5_cdec_7Lattice_5todot_1lines, 0, __pyx_n_s_todot_locals_lines, ((PyObject*)__pyx_cur_scope), __pyx_n_s_cdec__cdec, PyModule_GetDict(__pyx_m), ((PyObject *)__pyx_codeobj__15)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_v_lines = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":72
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":72
  *             yield '%d [shape=doublecircle]' % len(self)
  *             yield '}'
  *         return '\n'.join(lines()).encode('utf8')             # <<<<<<<<<<<<<<
@@ -14864,35 +16240,33 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_19todot(struct __pyx_obj_4cdec_5
  *     def as_hypergraph(self):
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_kp_s_40), __pyx_n_s__join); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_pf_4cdec_5_cdec_7Lattice_5todot_lines(__pyx_v_lines); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __pyx_pf_4cdec_5_cdec_7Lattice_5todot_lines(__pyx_v_lines); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_3);
-  PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
-  __Pyx_GIVEREF(__pyx_t_2);
-  __pyx_t_2 = 0;
-  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyString_Join(__pyx_kp_s__16, __pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s__encode); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_3);
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_encode); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_k_tuple_41), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_tuple__17, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_r = __pyx_t_2;
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":61
+ *             yield self[i]
+ * 
+ *     def todot(self):             # <<<<<<<<<<<<<<
+ *         """lattice.todot() -> Representation of the lattice in GraphViz dot format."""
+ *         def lines():
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
-  __Pyx_XDECREF(__pyx_t_3);
   __Pyx_AddTraceback("cdec._cdec.Lattice.todot", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = NULL;
   __pyx_L0:;
@@ -14903,6 +16277,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_19todot(struct __pyx_obj_4cdec_5
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":74
+ *         return '\n'.join(lines()).encode('utf8')
+ * 
+ *     def as_hypergraph(self):             # <<<<<<<<<<<<<<
+ *         """lattice.as_hypergraph() -> Hypergraph representation of the lattice."""
+ *         cdef Hypergraph result = Hypergraph.__new__(Hypergraph)
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_22as_hypergraph(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_7Lattice_21as_hypergraph[] = "lattice.as_hypergraph() -> Hypergraph representation of the lattice.";
@@ -14911,18 +16293,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Lattice_22as_hypergraph(PyObject *__pyx_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("as_hypergraph (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Lattice_21as_hypergraph(((struct __pyx_obj_4cdec_5_cdec_Lattice *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":74
- *         return '\n'.join(lines()).encode('utf8')
- * 
- *     def as_hypergraph(self):             # <<<<<<<<<<<<<<
- *         """lattice.as_hypergraph() -> Hypergraph representation of the lattice."""
- *         cdef Hypergraph result = Hypergraph.__new__(Hypergraph)
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_21as_hypergraph(struct __pyx_obj_4cdec_5_cdec_Lattice *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_result = 0;
   PyObject *__pyx_v_plf = 0;
@@ -14936,20 +16312,20 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_21as_hypergraph(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("as_hypergraph", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":76
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":76
  *     def as_hypergraph(self):
  *         """lattice.as_hypergraph() -> Hypergraph representation of the lattice."""
  *         cdef Hypergraph result = Hypergraph.__new__(Hypergraph)             # <<<<<<<<<<<<<<
  *         result.hg = new hypergraph.Hypergraph()
  *         cdef bytes plf = str(self)
  */
-  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_Hypergraph(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Hypergraph)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_Hypergraph(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Hypergraph)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   if (!(likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_4cdec_5_cdec_Hypergraph)))) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_result = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":77
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":77
  *         """lattice.as_hypergraph() -> Hypergraph representation of the lattice."""
  *         cdef Hypergraph result = Hypergraph.__new__(Hypergraph)
  *         result.hg = new hypergraph.Hypergraph()             # <<<<<<<<<<<<<<
@@ -14958,7 +16334,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_21as_hypergraph(struct __pyx_obj
  */
   __pyx_v_result->hg = new Hypergraph();
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":78
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":78
  *         cdef Hypergraph result = Hypergraph.__new__(Hypergraph)
  *         result.hg = new hypergraph.Hypergraph()
  *         cdef bytes plf = str(self)             # <<<<<<<<<<<<<<
@@ -14970,23 +16346,23 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_21as_hypergraph(struct __pyx_obj
   __Pyx_INCREF(((PyObject *)__pyx_v_self));
   PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_v_self));
   __Pyx_GIVEREF(((PyObject *)__pyx_v_self));
-  __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
-  if (!(likely(PyBytes_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected bytes, got %.200s", Py_TYPE(__pyx_t_2)->tp_name), 0))) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  if (!(likely(PyBytes_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "bytes", Py_TYPE(__pyx_t_2)->tp_name), 0))) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_plf = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":79
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":79
  *         result.hg = new hypergraph.Hypergraph()
  *         cdef bytes plf = str(self)
  *         hypergraph.ReadFromPLF(plf, result.hg)             # <<<<<<<<<<<<<<
  *         return result
  */
-  __pyx_t_3 = __pyx_convert_string_from_py_(((PyObject *)__pyx_v_plf)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __pyx_convert_string_from_py_(__pyx_v_plf); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   HypergraphIO::ReadFromPLF(__pyx_t_3, __pyx_v_result->hg);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":80
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":80
  *         cdef bytes plf = str(self)
  *         hypergraph.ReadFromPLF(plf, result.hg)
  *         return result             # <<<<<<<<<<<<<<
@@ -14996,8 +16372,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_21as_hypergraph(struct __pyx_obj
   __pyx_r = ((PyObject *)__pyx_v_result);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":74
+ *         return '\n'.join(lines()).encode('utf8')
+ * 
+ *     def as_hypergraph(self):             # <<<<<<<<<<<<<<
+ *         """lattice.as_hypergraph() -> Hypergraph representation of the lattice."""
+ *         cdef Hypergraph result = Hypergraph.__new__(Hypergraph)
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -15011,7 +16394,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Lattice_21as_hypergraph(struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":3
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":3
  * cimport mteval
  * 
  * cdef SufficientStats as_stats(x, y):             # <<<<<<<<<<<<<<
@@ -15033,7 +16416,7 @@ static struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_f_4cdec_5_cdec_as_st
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("as_stats", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":4
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":4
  * 
  * cdef SufficientStats as_stats(x, y):
  *     if isinstance(x, SufficientStats):             # <<<<<<<<<<<<<<
@@ -15044,7 +16427,7 @@ static struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_f_4cdec_5_cdec_as_st
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":5
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":5
  * cdef SufficientStats as_stats(x, y):
  *     if isinstance(x, SufficientStats):
  *         return x             # <<<<<<<<<<<<<<
@@ -15056,10 +16439,9 @@ static struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_f_4cdec_5_cdec_as_st
     __Pyx_INCREF(__pyx_v_x);
     __pyx_r = ((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_v_x);
     goto __pyx_L0;
-    goto __pyx_L3;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":6
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":6
  *     if isinstance(x, SufficientStats):
  *         return x
  *     elif x == 0 and isinstance(y, SufficientStats):             # <<<<<<<<<<<<<<
@@ -15077,19 +16459,19 @@ static struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_f_4cdec_5_cdec_as_st
   }
   if (__pyx_t_4) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":7
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":7
  *         return x
  *     elif x == 0 and isinstance(y, SufficientStats):
  *         stats = SufficientStats()             # <<<<<<<<<<<<<<
  *         stats.stats = new mteval.SufficientStats()
  *         stats.metric = (<SufficientStats> y).metric
  */
-    __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SufficientStats)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SufficientStats)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 7; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
     __pyx_v_stats = ((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_t_3);
     __pyx_t_3 = 0;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":8
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":8
  *     elif x == 0 and isinstance(y, SufficientStats):
  *         stats = SufficientStats()
  *         stats.stats = new mteval.SufficientStats()             # <<<<<<<<<<<<<<
@@ -15098,7 +16480,7 @@ static struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_f_4cdec_5_cdec_as_st
  */
     __pyx_v_stats->stats = new SufficientStats();
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":9
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":9
  *         stats = SufficientStats()
  *         stats.stats = new mteval.SufficientStats()
  *         stats.metric = (<SufficientStats> y).metric             # <<<<<<<<<<<<<<
@@ -15108,7 +16490,7 @@ static struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_f_4cdec_5_cdec_as_st
     __pyx_t_5 = ((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_v_y)->metric;
     __pyx_v_stats->metric = __pyx_t_5;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":10
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":10
  *         stats.stats = new mteval.SufficientStats()
  *         stats.metric = (<SufficientStats> y).metric
  *         return stats             # <<<<<<<<<<<<<<
@@ -15119,10 +16501,17 @@ static struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_f_4cdec_5_cdec_as_st
     __Pyx_INCREF(((PyObject *)__pyx_v_stats));
     __pyx_r = __pyx_v_stats;
     goto __pyx_L0;
-    goto __pyx_L3;
   }
-  __pyx_L3:;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":3
+ * cimport mteval
+ * 
+ * cdef SufficientStats as_stats(x, y):             # <<<<<<<<<<<<<<
+ *     if isinstance(x, SufficientStats):
+ *         return x
+ */
+
+  /* function exit code */
   __pyx_r = ((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)Py_None); __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -15136,6 +16525,14 @@ static struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_f_4cdec_5_cdec_as_st
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":17
+ * 
+ *     property words:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return unicode(GetString(self.candidate.ewords).c_str(), encoding='utf8')
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_9Candidate_5words_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_9Candidate_5words_1__get__(PyObject *__pyx_v_self) {
@@ -15143,18 +16540,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_9Candidate_5words_1__get__(PyObject *__py
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_9Candidate_5words___get__(((struct __pyx_obj_4cdec_5_cdec_Candidate *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":17
- * 
- *     property words:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             return unicode(GetString(self.candidate.ewords).c_str(), encoding='utf8')
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_9Candidate_5words___get__(struct __pyx_obj_4cdec_5_cdec_Candidate *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -15166,7 +16557,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_9Candidate_5words___get__(struct __pyx_ob
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":18
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":18
  *     property words:
  *         def __get__(self):
  *             return unicode(GetString(self.candidate.ewords).c_str(), encoding='utf8')             # <<<<<<<<<<<<<<
@@ -15175,25 +16566,32 @@ static PyObject *__pyx_pf_4cdec_5_cdec_9Candidate_5words___get__(struct __pyx_ob
  */
   __Pyx_XDECREF(__pyx_r);
   __pyx_t_1 = __Pyx_PyBytes_FromString(TD::GetString(__pyx_v_self->candidate->ewords).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_1));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
   __pyx_t_1 = PyDict_New(); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
-  if (PyDict_SetItem(__pyx_t_1, ((PyObject *)__pyx_n_s__encoding), ((PyObject *)__pyx_n_s__utf8)) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), ((PyObject *)__pyx_t_2), ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_encoding, __pyx_n_s_utf8) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyUnicode_Type))), __pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
-  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_r = __pyx_t_3;
   __pyx_t_3 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":17
+ * 
+ *     property words:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return unicode(GetString(self.candidate.ewords).c_str(), encoding='utf8')
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -15206,6 +16604,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_9Candidate_5words___get__(struct __pyx_ob
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":21
+ * 
+ *     property fmap:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef SparseVector fmap = SparseVector.__new__(SparseVector)
+ *             fmap.vector = new FastSparseVector[weight_t](self.candidate.fmap)
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_9Candidate_4fmap_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_9Candidate_4fmap_1__get__(PyObject *__pyx_v_self) {
@@ -15213,18 +16619,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_9Candidate_4fmap_1__get__(PyObject *__pyx
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_9Candidate_4fmap___get__(((struct __pyx_obj_4cdec_5_cdec_Candidate *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":21
- * 
- *     property fmap:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef SparseVector fmap = SparseVector.__new__(SparseVector)
- *             fmap.vector = new FastSparseVector[weight_t](self.candidate.fmap)
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_9Candidate_4fmap___get__(struct __pyx_obj_4cdec_5_cdec_Candidate *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec_SparseVector *__pyx_v_fmap = 0;
   PyObject *__pyx_r = NULL;
@@ -15235,20 +16635,20 @@ static PyObject *__pyx_pf_4cdec_5_cdec_9Candidate_4fmap___get__(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":22
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":22
  *     property fmap:
  *         def __get__(self):
  *             cdef SparseVector fmap = SparseVector.__new__(SparseVector)             # <<<<<<<<<<<<<<
  *             fmap.vector = new FastSparseVector[weight_t](self.candidate.fmap)
  *             return fmap
  */
-  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_tp_new_4cdec_5_cdec_SparseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SparseVector)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   if (!(likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_4cdec_5_cdec_SparseVector)))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_fmap = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":23
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":23
  *         def __get__(self):
  *             cdef SparseVector fmap = SparseVector.__new__(SparseVector)
  *             fmap.vector = new FastSparseVector[weight_t](self.candidate.fmap)             # <<<<<<<<<<<<<<
@@ -15257,7 +16657,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_9Candidate_4fmap___get__(struct __pyx_obj
  */
   __pyx_v_fmap->vector = new FastSparseVector<weight_t>(__pyx_v_self->candidate->fmap);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":24
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":24
  *             cdef SparseVector fmap = SparseVector.__new__(SparseVector)
  *             fmap.vector = new FastSparseVector[weight_t](self.candidate.fmap)
  *             return fmap             # <<<<<<<<<<<<<<
@@ -15269,8 +16669,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_9Candidate_4fmap___get__(struct __pyx_obj
   __pyx_r = ((PyObject *)__pyx_v_fmap);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":21
+ * 
+ *     property fmap:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef SparseVector fmap = SparseVector.__new__(SparseVector)
+ *             fmap.vector = new FastSparseVector[weight_t](self.candidate.fmap)
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.Candidate.fmap.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -15282,6 +16689,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_9Candidate_4fmap___get__(struct __pyx_obj
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":14
+ * cdef class Candidate:
+ *     cdef mteval.const_Candidate* candidate
+ *     cdef public float score             # <<<<<<<<<<<<<<
+ * 
+ *     property words:
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_9Candidate_5score_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_9Candidate_5score_1__get__(PyObject *__pyx_v_self) {
@@ -15289,18 +16704,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_9Candidate_5score_1__get__(PyObject *__py
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_9Candidate_5score___get__(((struct __pyx_obj_4cdec_5_cdec_Candidate *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":14
- * cdef class Candidate:
- *     cdef mteval.const_Candidate* candidate
- *     cdef public float score             # <<<<<<<<<<<<<<
- * 
- *     property words:
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_9Candidate_5score___get__(struct __pyx_obj_4cdec_5_cdec_Candidate *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -15316,8 +16725,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_9Candidate_5score___get__(struct __pyx_ob
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.Candidate.score.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -15335,6 +16743,8 @@ static int __pyx_pw_4cdec_5_cdec_9Candidate_5score_3__set__(PyObject *__pyx_v_se
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__set__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_9Candidate_5score_2__set__(((struct __pyx_obj_4cdec_5_cdec_Candidate *)__pyx_v_self), ((PyObject *)__pyx_v_value));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
@@ -15350,6 +16760,7 @@ static int __pyx_pf_4cdec_5_cdec_9Candidate_5score_2__set__(struct __pyx_obj_4cd
   __pyx_t_1 = __pyx_PyFloat_AsFloat(__pyx_v_value); if (unlikely((__pyx_t_1 == (float)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_self->score = __pyx_t_1;
 
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -15360,28 +16771,30 @@ static int __pyx_pf_4cdec_5_cdec_9Candidate_5score_2__set__(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":30
+ *     cdef mteval.EvaluationMetric* metric
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.stats
+ * 
+ */
+
 /* Python wrapper */
 static void __pyx_pw_4cdec_5_cdec_15SufficientStats_1__dealloc__(PyObject *__pyx_v_self); /*proto*/
 static void __pyx_pw_4cdec_5_cdec_15SufficientStats_1__dealloc__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__ (wrapper)", 0);
   __pyx_pf_4cdec_5_cdec_15SufficientStats___dealloc__(((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":30
- *     cdef mteval.EvaluationMetric* metric
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         del self.stats
- * 
- */
-
-static void __pyx_pf_4cdec_5_cdec_15SufficientStats___dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self) {
+static void __pyx_pf_4cdec_5_cdec_15SufficientStats___dealloc__(struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":31
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":31
  * 
  *     def __dealloc__(self):
  *         del self.stats             # <<<<<<<<<<<<<<
@@ -15390,9 +16803,26 @@ static void __pyx_pf_4cdec_5_cdec_15SufficientStats___dealloc__(CYTHON_UNUSED st
  */
   delete __pyx_v_self->stats;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":30
+ *     cdef mteval.EvaluationMetric* metric
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.stats
+ * 
+ */
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":34
+ * 
+ *     property score:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return self.metric.ComputeScore(self.stats[0])
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_5score_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_5score_1__get__(PyObject *__pyx_v_self) {
@@ -15400,18 +16830,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_5score_1__get__(PyObjec
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_15SufficientStats_5score___get__(((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":34
- * 
- *     property score:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             return self.metric.ComputeScore(self.stats[0])
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_5score___get__(struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -15421,7 +16845,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_5score___get__(struct _
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":35
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":35
  *     property score:
  *         def __get__(self):
  *             return self.metric.ComputeScore(self.stats[0])             # <<<<<<<<<<<<<<
@@ -15435,8 +16859,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_5score___get__(struct _
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":34
+ * 
+ *     property score:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return self.metric.ComputeScore(self.stats[0])
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.SufficientStats.score.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -15447,6 +16878,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_5score___get__(struct _
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":38
+ * 
+ *     property detail:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return str(self.metric.DetailedScore(self.stats[0]).c_str())
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_6detail_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_6detail_1__get__(PyObject *__pyx_v_self) {
@@ -15454,18 +16893,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_6detail_1__get__(PyObje
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_15SufficientStats_6detail___get__(((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":38
- * 
- *     property detail:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             return str(self.metric.DetailedScore(self.stats[0]).c_str())
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_6detail___get__(struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -15476,7 +16909,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_6detail___get__(struct
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":39
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":39
  *     property detail:
  *         def __get__(self):
  *             return str(self.metric.DetailedScore(self.stats[0]).c_str())             # <<<<<<<<<<<<<<
@@ -15485,21 +16918,28 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_6detail___get__(struct
  */
   __Pyx_XDECREF(__pyx_r);
   __pyx_t_1 = __Pyx_PyBytes_FromString(__pyx_v_self->metric->DetailedScore((__pyx_v_self->stats[0])).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_1));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":38
+ * 
+ *     property detail:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return str(self.metric.DetailedScore(self.stats[0]).c_str())
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -15511,6 +16951,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_6detail___get__(struct
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":41
+ *             return str(self.metric.DetailedScore(self.stats[0]).c_str())
+ * 
+ *     def __len__(self):             # <<<<<<<<<<<<<<
+ *         return self.stats.size()
+ * 
+ */
+
 /* Python wrapper */
 static Py_ssize_t __pyx_pw_4cdec_5_cdec_15SufficientStats_3__len__(PyObject *__pyx_v_self); /*proto*/
 static Py_ssize_t __pyx_pw_4cdec_5_cdec_15SufficientStats_3__len__(PyObject *__pyx_v_self) {
@@ -15518,24 +16966,18 @@ static Py_ssize_t __pyx_pw_4cdec_5_cdec_15SufficientStats_3__len__(PyObject *__p
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_15SufficientStats_2__len__(((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":41
- *             return str(self.metric.DetailedScore(self.stats[0]).c_str())
- * 
- *     def __len__(self):             # <<<<<<<<<<<<<<
- *         return self.stats.size()
- * 
- */
-
 static Py_ssize_t __pyx_pf_4cdec_5_cdec_15SufficientStats_2__len__(struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self) {
   Py_ssize_t __pyx_r;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":42
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":42
  * 
  *     def __len__(self):
  *         return self.stats.size()             # <<<<<<<<<<<<<<
@@ -15545,13 +16987,29 @@ static Py_ssize_t __pyx_pf_4cdec_5_cdec_15SufficientStats_2__len__(struct __pyx_
   __pyx_r = __pyx_v_self->stats->size();
   goto __pyx_L0;
 
-  __pyx_r = 0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":41
+ *             return str(self.metric.DetailedScore(self.stats[0]).c_str())
+ * 
+ *     def __len__(self):             # <<<<<<<<<<<<<<
+ *         return self.stats.size()
+ * 
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_15SufficientStats_6generator15(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":44
+ *         return self.stats.size()
+ * 
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         for i in range(len(self)):
+ *             yield self[i]
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_5__iter__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_5__iter__(PyObject *__pyx_v_self) {
@@ -15559,18 +17017,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_5__iter__(PyObject *__p
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__iter__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_15SufficientStats_4__iter__(((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":44
- *         return self.stats.size()
- * 
- *     def __iter__(self):             # <<<<<<<<<<<<<<
- *         for i in range(len(self)):
- *             yield self[i]
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_4__iter__(struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -15595,6 +17047,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_4__iter__(struct __pyx_
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -15612,9 +17065,8 @@ static PyObject *__pyx_gb_4cdec_5_cdec_15SufficientStats_6generator15(__pyx_Gene
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *__pyx_cur_scope = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *)__pyx_generator->closure);
   PyObject *__pyx_r = NULL;
   Py_ssize_t __pyx_t_1;
-  PyObject *__pyx_t_2 = NULL;
+  Py_ssize_t __pyx_t_2;
   PyObject *__pyx_t_3 = NULL;
-  PyObject *(*__pyx_t_4)(PyObject *);
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -15630,7 +17082,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_15SufficientStats_6generator15(__pyx_Gene
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":45
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":45
  * 
  *     def __iter__(self):
  *         for i in range(len(self)):             # <<<<<<<<<<<<<<
@@ -15638,72 +17090,22 @@ static PyObject *__pyx_gb_4cdec_5_cdec_15SufficientStats_6generator15(__pyx_Gene
  * 
  */
   __pyx_t_1 = PyObject_Length(((PyObject *)__pyx_cur_scope->__pyx_v_self)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_t_2 = PyInt_FromSsize_t(__pyx_t_1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_2);
-  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_3);
-  PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
-  __Pyx_GIVEREF(__pyx_t_2);
-  __pyx_t_2 = 0;
-  __pyx_t_2 = PyObject_Call(__pyx_builtin_range, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
-  if (PyList_CheckExact(__pyx_t_2) || PyTuple_CheckExact(__pyx_t_2)) {
-    __pyx_t_3 = __pyx_t_2; __Pyx_INCREF(__pyx_t_3); __pyx_t_1 = 0;
-    __pyx_t_4 = NULL;
-  } else {
-    __pyx_t_1 = -1; __pyx_t_3 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_4 = Py_TYPE(__pyx_t_3)->tp_iternext;
-  }
-  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  for (;;) {
-    if (!__pyx_t_4 && PyList_CheckExact(__pyx_t_3)) {
-      if (__pyx_t_1 >= PyList_GET_SIZE(__pyx_t_3)) break;
-      #if CYTHON_COMPILING_IN_CPYTHON
-      __pyx_t_2 = PyList_GET_ITEM(__pyx_t_3, __pyx_t_1); __Pyx_INCREF(__pyx_t_2); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      #else
-      __pyx_t_2 = PySequence_ITEM(__pyx_t_3, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      #endif
-    } else if (!__pyx_t_4 && PyTuple_CheckExact(__pyx_t_3)) {
-      if (__pyx_t_1 >= PyTuple_GET_SIZE(__pyx_t_3)) break;
-      #if CYTHON_COMPILING_IN_CPYTHON
-      __pyx_t_2 = PyTuple_GET_ITEM(__pyx_t_3, __pyx_t_1); __Pyx_INCREF(__pyx_t_2); __pyx_t_1++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      #else
-      __pyx_t_2 = PySequence_ITEM(__pyx_t_3, __pyx_t_1); __pyx_t_1++; if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      #endif
-    } else {
-      __pyx_t_2 = __pyx_t_4(__pyx_t_3);
-      if (unlikely(!__pyx_t_2)) {
-        if (PyErr_Occurred()) {
-          if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
-          else {__pyx_filename = __pyx_f[5]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-        }
-        break;
-      }
-      __Pyx_GOTREF(__pyx_t_2);
-    }
-    __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_i);
-    __Pyx_XDECREF(__pyx_cur_scope->__pyx_v_i);
-    __Pyx_GIVEREF(__pyx_t_2);
+  for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_2;
-    __pyx_t_2 = 0;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":46
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":46
  *     def __iter__(self):
  *         for i in range(len(self)):
  *             yield self[i]             # <<<<<<<<<<<<<<
  * 
  *     def __getitem__(self, int index):
  */
-    __pyx_t_2 = PyObject_GetItem(((PyObject *)__pyx_cur_scope->__pyx_v_self), __pyx_cur_scope->__pyx_v_i); if (!__pyx_t_2) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(__pyx_t_2);
-    __pyx_r = __pyx_t_2;
-    __pyx_t_2 = 0;
+    __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_cur_scope->__pyx_v_self), __pyx_cur_scope->__pyx_v_i, Py_ssize_t, 1, PyInt_FromSsize_t, 0, 1, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+    __Pyx_GOTREF(__pyx_t_3);
+    __pyx_r = __pyx_t_3;
+    __pyx_t_3 = 0;
     __pyx_cur_scope->__pyx_t_0 = __pyx_t_1;
-    __Pyx_XGIVEREF(__pyx_t_3);
-    __pyx_cur_scope->__pyx_t_1 = __pyx_t_3;
-    __pyx_cur_scope->__pyx_t_2 = __pyx_t_4;
+    __pyx_cur_scope->__pyx_t_1 = __pyx_t_2;
     __Pyx_XGIVEREF(__pyx_r);
     __Pyx_RefNannyFinishContext();
     /* return from generator, yielding value */
@@ -15711,17 +17113,22 @@ static PyObject *__pyx_gb_4cdec_5_cdec_15SufficientStats_6generator15(__pyx_Gene
     return __pyx_r;
     __pyx_L6_resume_from_yield:;
     __pyx_t_1 = __pyx_cur_scope->__pyx_t_0;
-    __pyx_t_3 = __pyx_cur_scope->__pyx_t_1;
-    __pyx_cur_scope->__pyx_t_1 = 0;
-    __Pyx_XGOTREF(__pyx_t_3);
-    __pyx_t_4 = __pyx_cur_scope->__pyx_t_2;
+    __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
     if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
-  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":44
+ *         return self.stats.size()
+ * 
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         for i in range(len(self)):
+ *             yield self[i]
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
-  __Pyx_XDECREF(__pyx_t_2);
   __Pyx_XDECREF(__pyx_t_3);
   __Pyx_AddTraceback("__iter__", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_L0:;
@@ -15732,6 +17139,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_15SufficientStats_6generator15(__pyx_Gene
   return NULL;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":48
+ *             yield self[i]
+ * 
+ *     def __getitem__(self, int index):             # <<<<<<<<<<<<<<
+ *         if not 0 <= index < len(self):
+ *             raise IndexError('sufficient stats vector index out of range')
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_8__getitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_index); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_8__getitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_index) {
@@ -15743,7 +17158,7 @@ static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_8__getitem__(PyObject *
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__getitem__ (wrapper)", 0);
   assert(__pyx_arg_index); {
-    __pyx_v_index = __Pyx_PyInt_AsInt(__pyx_arg_index); if (unlikely((__pyx_v_index == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    __pyx_v_index = __Pyx_PyInt_As_int(__pyx_arg_index); if (unlikely((__pyx_v_index == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -15752,18 +17167,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_8__getitem__(PyObject *
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_15SufficientStats_7__getitem__(((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_v_self), ((int)__pyx_v_index));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":48
- *             yield self[i]
- * 
- *     def __getitem__(self, int index):             # <<<<<<<<<<<<<<
- *         if not 0 <= index < len(self):
- *             raise IndexError('sufficient stats vector index out of range')
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_7__getitem__(struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self, int __pyx_v_index) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -15776,7 +17185,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_7__getitem__(struct __p
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__getitem__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":49
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":49
  * 
  *     def __getitem__(self, int index):
  *         if not 0 <= index < len(self):             # <<<<<<<<<<<<<<
@@ -15791,23 +17200,21 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_7__getitem__(struct __p
   __pyx_t_3 = ((!(__pyx_t_1 != 0)) != 0);
   if (__pyx_t_3) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":50
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":50
  *     def __getitem__(self, int index):
  *         if not 0 <= index < len(self):
  *             raise IndexError('sufficient stats vector index out of range')             # <<<<<<<<<<<<<<
  *         return self.stats[0][index]
  * 
  */
-    __pyx_t_4 = PyObject_Call(__pyx_builtin_IndexError, ((PyObject *)__pyx_k_tuple_43), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_IndexError, __pyx_tuple__18, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_Raise(__pyx_t_4, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     {__pyx_filename = __pyx_f[5]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    goto __pyx_L3;
   }
-  __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":51
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":51
  *         if not 0 <= index < len(self):
  *             raise IndexError('sufficient stats vector index out of range')
  *         return self.stats[0][index]             # <<<<<<<<<<<<<<
@@ -15821,8 +17228,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_7__getitem__(struct __p
   __pyx_t_4 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":48
+ *             yield self[i]
+ * 
+ *     def __getitem__(self, int index):             # <<<<<<<<<<<<<<
+ *         if not 0 <= index < len(self):
+ *             raise IndexError('sufficient stats vector index out of range')
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_4);
   __Pyx_AddTraceback("cdec._cdec.SufficientStats.__getitem__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -15833,6 +17247,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_7__getitem__(struct __p
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":53
+ *         return self.stats[0][index]
+ * 
+ *     def __iadd__(SufficientStats self, SufficientStats other):             # <<<<<<<<<<<<<<
+ *         self.stats[0] += other.stats[0]
+ *         return self
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_10__iadd__(PyObject *__pyx_v_self, PyObject *__pyx_v_other); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_10__iadd__(PyObject *__pyx_v_self, PyObject *__pyx_v_other) {
@@ -15844,6 +17266,8 @@ static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_10__iadd__(PyObject *__
   __Pyx_RefNannySetupContext("__iadd__ (wrapper)", 0);
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_other), __pyx_ptype_4cdec_5_cdec_SufficientStats, 1, "other", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_5_cdec_15SufficientStats_9__iadd__(((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_v_self), ((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_v_other));
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __pyx_r = NULL;
@@ -15852,20 +17276,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_10__iadd__(PyObject *__
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":53
- *         return self.stats[0][index]
- * 
- *     def __iadd__(SufficientStats self, SufficientStats other):             # <<<<<<<<<<<<<<
- *         self.stats[0] += other.stats[0]
- *         return self
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_9__iadd__(struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_self, struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_other) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__iadd__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":54
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":54
  * 
  *     def __iadd__(SufficientStats self, SufficientStats other):
  *         self.stats[0] += other.stats[0]             # <<<<<<<<<<<<<<
@@ -15874,7 +17290,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_9__iadd__(struct __pyx_
  */
   (__pyx_v_self->stats[0]) += (__pyx_v_other->stats[0]);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":55
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":55
  *     def __iadd__(SufficientStats self, SufficientStats other):
  *         self.stats[0] += other.stats[0]
  *         return self             # <<<<<<<<<<<<<<
@@ -15886,13 +17302,29 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_9__iadd__(struct __pyx_
   __pyx_r = ((PyObject *)__pyx_v_self);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":53
+ *         return self.stats[0][index]
+ * 
+ *     def __iadd__(SufficientStats self, SufficientStats other):             # <<<<<<<<<<<<<<
+ *         self.stats[0] += other.stats[0]
+ *         return self
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":57
+ *         return self
+ * 
+ *     def __add__(x, y):             # <<<<<<<<<<<<<<
+ *         cdef SufficientStats sx = as_stats(x, y)
+ *         cdef SufficientStats sy = as_stats(y, x)
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_12__add__(PyObject *__pyx_v_x, PyObject *__pyx_v_y); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_12__add__(PyObject *__pyx_v_x, PyObject *__pyx_v_y) {
@@ -15900,18 +17332,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_15SufficientStats_12__add__(PyObject *__p
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__add__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_15SufficientStats_11__add__(((PyObject *)__pyx_v_x), ((PyObject *)__pyx_v_y));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":57
- *         return self
- * 
- *     def __add__(x, y):             # <<<<<<<<<<<<<<
- *         cdef SufficientStats sx = as_stats(x, y)
- *         cdef SufficientStats sy = as_stats(y, x)
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_11__add__(PyObject *__pyx_v_x, PyObject *__pyx_v_y) {
   struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_sx = 0;
   struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_sy = 0;
@@ -15925,7 +17351,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_11__add__(PyObject *__p
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__add__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":58
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":58
  * 
  *     def __add__(x, y):
  *         cdef SufficientStats sx = as_stats(x, y)             # <<<<<<<<<<<<<<
@@ -15937,7 +17363,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_11__add__(PyObject *__p
   __pyx_v_sx = ((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":59
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":59
  *     def __add__(x, y):
  *         cdef SufficientStats sx = as_stats(x, y)
  *         cdef SufficientStats sy = as_stats(y, x)             # <<<<<<<<<<<<<<
@@ -15949,19 +17375,19 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_11__add__(PyObject *__p
   __pyx_v_sy = ((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":60
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":60
  *         cdef SufficientStats sx = as_stats(x, y)
  *         cdef SufficientStats sy = as_stats(y, x)
  *         cdef SufficientStats result = SufficientStats()             # <<<<<<<<<<<<<<
  *         result.stats = new mteval.SufficientStats(mteval.add(sx.stats[0], sy.stats[0]))
  *         result.metric = sx.metric
  */
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SufficientStats)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SufficientStats)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_v_result = ((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":61
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":61
  *         cdef SufficientStats sy = as_stats(y, x)
  *         cdef SufficientStats result = SufficientStats()
  *         result.stats = new mteval.SufficientStats(mteval.add(sx.stats[0], sy.stats[0]))             # <<<<<<<<<<<<<<
@@ -15970,7 +17396,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_11__add__(PyObject *__p
  */
   __pyx_v_result->stats = new SufficientStats(operator+((__pyx_v_sx->stats[0]), (__pyx_v_sy->stats[0])));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":62
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":62
  *         cdef SufficientStats result = SufficientStats()
  *         result.stats = new mteval.SufficientStats(mteval.add(sx.stats[0], sy.stats[0]))
  *         result.metric = sx.metric             # <<<<<<<<<<<<<<
@@ -15980,7 +17406,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_11__add__(PyObject *__p
   __pyx_t_2 = __pyx_v_sx->metric;
   __pyx_v_result->metric = __pyx_t_2;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":63
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":63
  *         result.stats = new mteval.SufficientStats(mteval.add(sx.stats[0], sy.stats[0]))
  *         result.metric = sx.metric
  *         return result             # <<<<<<<<<<<<<<
@@ -15992,8 +17418,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_11__add__(PyObject *__p
   __pyx_r = ((PyObject *)__pyx_v_result);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":57
+ *         return self
+ * 
+ *     def __add__(x, y):             # <<<<<<<<<<<<<<
+ *         cdef SufficientStats sx = as_stats(x, y)
+ *         cdef SufficientStats sy = as_stats(y, x)
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.SufficientStats.__add__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -16007,6 +17440,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_15SufficientStats_11__add__(PyObject *__p
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":70
+ *     cdef mteval.CandidateSet* cs
+ * 
+ *     def __cinit__(self, SegmentEvaluator evaluator):             # <<<<<<<<<<<<<<
+ *         self.scorer = new shared_ptr[mteval.SegmentEvaluator](evaluator.scorer[0])
+ *         self.metric = evaluator.metric
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_12CandidateSet_1__cinit__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_12CandidateSet_1__cinit__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -16018,7 +17459,7 @@ static int __pyx_pw_4cdec_5_cdec_12CandidateSet_1__cinit__(PyObject *__pyx_v_sel
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__cinit__ (wrapper)", 0);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__evaluator,0};
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_evaluator,0};
     PyObject* values[1] = {0};
     if (unlikely(__pyx_kwds)) {
       Py_ssize_t kw_args;
@@ -16031,7 +17472,7 @@ static int __pyx_pw_4cdec_5_cdec_12CandidateSet_1__cinit__(PyObject *__pyx_v_sel
       kw_args = PyDict_Size(__pyx_kwds);
       switch (pos_args) {
         case  0:
-        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__evaluator)) != 0)) kw_args--;
+        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_evaluator)) != 0)) kw_args--;
         else goto __pyx_L5_argtuple_error;
       }
       if (unlikely(kw_args > 0)) {
@@ -16054,6 +17495,8 @@ static int __pyx_pw_4cdec_5_cdec_12CandidateSet_1__cinit__(PyObject *__pyx_v_sel
   __pyx_L4_argument_unpacking_done:;
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_evaluator), __pyx_ptype_4cdec_5_cdec_SegmentEvaluator, 1, "evaluator", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_5_cdec_12CandidateSet___cinit__(((struct __pyx_obj_4cdec_5_cdec_CandidateSet *)__pyx_v_self), __pyx_v_evaluator);
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __pyx_r = -1;
@@ -16062,21 +17505,13 @@ static int __pyx_pw_4cdec_5_cdec_12CandidateSet_1__cinit__(PyObject *__pyx_v_sel
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":70
- *     cdef mteval.CandidateSet* cs
- * 
- *     def __cinit__(self, SegmentEvaluator evaluator):             # <<<<<<<<<<<<<<
- *         self.scorer = new shared_ptr[mteval.SegmentEvaluator](evaluator.scorer[0])
- *         self.metric = evaluator.metric
- */
-
 static int __pyx_pf_4cdec_5_cdec_12CandidateSet___cinit__(struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self, struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator *__pyx_v_evaluator) {
   int __pyx_r;
   __Pyx_RefNannyDeclarations
   EvaluationMetric *__pyx_t_1;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":71
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":71
  * 
  *     def __cinit__(self, SegmentEvaluator evaluator):
  *         self.scorer = new shared_ptr[mteval.SegmentEvaluator](evaluator.scorer[0])             # <<<<<<<<<<<<<<
@@ -16085,7 +17520,7 @@ static int __pyx_pf_4cdec_5_cdec_12CandidateSet___cinit__(struct __pyx_obj_4cdec
  */
   __pyx_v_self->scorer = new boost::shared_ptr<SegmentEvaluator>((__pyx_v_evaluator->scorer[0]));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":72
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":72
  *     def __cinit__(self, SegmentEvaluator evaluator):
  *         self.scorer = new shared_ptr[mteval.SegmentEvaluator](evaluator.scorer[0])
  *         self.metric = evaluator.metric             # <<<<<<<<<<<<<<
@@ -16095,7 +17530,7 @@ static int __pyx_pf_4cdec_5_cdec_12CandidateSet___cinit__(struct __pyx_obj_4cdec
   __pyx_t_1 = __pyx_v_evaluator->metric;
   __pyx_v_self->metric = __pyx_t_1;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":73
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":73
  *         self.scorer = new shared_ptr[mteval.SegmentEvaluator](evaluator.scorer[0])
  *         self.metric = evaluator.metric
  *         self.cs = new mteval.CandidateSet()             # <<<<<<<<<<<<<<
@@ -16104,33 +17539,44 @@ static int __pyx_pf_4cdec_5_cdec_12CandidateSet___cinit__(struct __pyx_obj_4cdec
  */
   __pyx_v_self->cs = new training::CandidateSet();
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":70
+ *     cdef mteval.CandidateSet* cs
+ * 
+ *     def __cinit__(self, SegmentEvaluator evaluator):             # <<<<<<<<<<<<<<
+ *         self.scorer = new shared_ptr[mteval.SegmentEvaluator](evaluator.scorer[0])
+ *         self.metric = evaluator.metric
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":75
+ *         self.cs = new mteval.CandidateSet()
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.scorer
+ *         del self.cs
+ */
+
 /* Python wrapper */
 static void __pyx_pw_4cdec_5_cdec_12CandidateSet_3__dealloc__(PyObject *__pyx_v_self); /*proto*/
 static void __pyx_pw_4cdec_5_cdec_12CandidateSet_3__dealloc__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__ (wrapper)", 0);
   __pyx_pf_4cdec_5_cdec_12CandidateSet_2__dealloc__(((struct __pyx_obj_4cdec_5_cdec_CandidateSet *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":75
- *         self.cs = new mteval.CandidateSet()
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         del self.scorer
- *         del self.cs
- */
-
-static void __pyx_pf_4cdec_5_cdec_12CandidateSet_2__dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self) {
+static void __pyx_pf_4cdec_5_cdec_12CandidateSet_2__dealloc__(struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":76
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":76
  * 
  *     def __dealloc__(self):
  *         del self.scorer             # <<<<<<<<<<<<<<
@@ -16139,7 +17585,7 @@ static void __pyx_pf_4cdec_5_cdec_12CandidateSet_2__dealloc__(CYTHON_UNUSED stru
  */
   delete __pyx_v_self->scorer;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":77
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":77
  *     def __dealloc__(self):
  *         del self.scorer
  *         del self.cs             # <<<<<<<<<<<<<<
@@ -16148,9 +17594,26 @@ static void __pyx_pf_4cdec_5_cdec_12CandidateSet_2__dealloc__(CYTHON_UNUSED stru
  */
   delete __pyx_v_self->cs;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":75
+ *         self.cs = new mteval.CandidateSet()
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.scorer
+ *         del self.cs
+ */
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":79
+ *         del self.cs
+ * 
+ *     def __len__(self):             # <<<<<<<<<<<<<<
+ *         return self.cs.size()
+ * 
+ */
+
 /* Python wrapper */
 static Py_ssize_t __pyx_pw_4cdec_5_cdec_12CandidateSet_5__len__(PyObject *__pyx_v_self); /*proto*/
 static Py_ssize_t __pyx_pw_4cdec_5_cdec_12CandidateSet_5__len__(PyObject *__pyx_v_self) {
@@ -16158,24 +17621,18 @@ static Py_ssize_t __pyx_pw_4cdec_5_cdec_12CandidateSet_5__len__(PyObject *__pyx_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_12CandidateSet_4__len__(((struct __pyx_obj_4cdec_5_cdec_CandidateSet *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":79
- *         del self.cs
- * 
- *     def __len__(self):             # <<<<<<<<<<<<<<
- *         return self.cs.size()
- * 
- */
-
 static Py_ssize_t __pyx_pf_4cdec_5_cdec_12CandidateSet_4__len__(struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self) {
   Py_ssize_t __pyx_r;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":80
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":80
  * 
  *     def __len__(self):
  *         return self.cs.size()             # <<<<<<<<<<<<<<
@@ -16185,12 +17642,28 @@ static Py_ssize_t __pyx_pf_4cdec_5_cdec_12CandidateSet_4__len__(struct __pyx_obj
   __pyx_r = __pyx_v_self->cs->size();
   goto __pyx_L0;
 
-  __pyx_r = 0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":79
+ *         del self.cs
+ * 
+ *     def __len__(self):             # <<<<<<<<<<<<<<
+ *         return self.cs.size()
+ * 
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":82
+ *         return self.cs.size()
+ * 
+ *     def __getitem__(self,int k):             # <<<<<<<<<<<<<<
+ *         if not 0 <= k < self.cs.size():
+ *             raise IndexError('candidate set index out of range')
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12CandidateSet_7__getitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_k); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_12CandidateSet_7__getitem__(PyObject *__pyx_v_self, PyObject *__pyx_arg_k) {
@@ -16202,7 +17675,7 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12CandidateSet_7__getitem__(PyObject *__p
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__getitem__ (wrapper)", 0);
   assert(__pyx_arg_k); {
-    __pyx_v_k = __Pyx_PyInt_AsInt(__pyx_arg_k); if (unlikely((__pyx_v_k == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    __pyx_v_k = __Pyx_PyInt_As_int(__pyx_arg_k); if (unlikely((__pyx_v_k == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -16211,18 +17684,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12CandidateSet_7__getitem__(PyObject *__p
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_12CandidateSet_6__getitem__(((struct __pyx_obj_4cdec_5_cdec_CandidateSet *)__pyx_v_self), ((int)__pyx_v_k));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":82
- *         return self.cs.size()
- * 
- *     def __getitem__(self,int k):             # <<<<<<<<<<<<<<
- *         if not 0 <= k < self.cs.size():
- *             raise IndexError('candidate set index out of range')
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12CandidateSet_6__getitem__(struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self, int __pyx_v_k) {
   struct __pyx_obj_4cdec_5_cdec_Candidate *__pyx_v_candidate = 0;
   PyObject *__pyx_r = NULL;
@@ -16235,7 +17702,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12CandidateSet_6__getitem__(struct __pyx_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__getitem__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":83
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":83
  * 
  *     def __getitem__(self,int k):
  *         if not 0 <= k < self.cs.size():             # <<<<<<<<<<<<<<
@@ -16249,35 +17716,33 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12CandidateSet_6__getitem__(struct __pyx_
   __pyx_t_2 = ((!(__pyx_t_1 != 0)) != 0);
   if (__pyx_t_2) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":84
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":84
  *     def __getitem__(self,int k):
  *         if not 0 <= k < self.cs.size():
  *             raise IndexError('candidate set index out of range')             # <<<<<<<<<<<<<<
  *         cdef Candidate candidate = Candidate()
  *         candidate.candidate = &self.cs[0][k]
  */
-    __pyx_t_3 = PyObject_Call(__pyx_builtin_IndexError, ((PyObject *)__pyx_k_tuple_45), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_IndexError, __pyx_tuple__19, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_Raise(__pyx_t_3, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     {__pyx_filename = __pyx_f[5]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    goto __pyx_L3;
   }
-  __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":85
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":85
  *         if not 0 <= k < self.cs.size():
  *             raise IndexError('candidate set index out of range')
  *         cdef Candidate candidate = Candidate()             # <<<<<<<<<<<<<<
  *         candidate.candidate = &self.cs[0][k]
  *         candidate.score = self.metric.ComputeScore(self.cs[0][k].eval_feats)
  */
-  __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Candidate)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Candidate)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __pyx_v_candidate = ((struct __pyx_obj_4cdec_5_cdec_Candidate *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":86
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":86
  *             raise IndexError('candidate set index out of range')
  *         cdef Candidate candidate = Candidate()
  *         candidate.candidate = &self.cs[0][k]             # <<<<<<<<<<<<<<
@@ -16286,7 +17751,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12CandidateSet_6__getitem__(struct __pyx_
  */
   __pyx_v_candidate->candidate = (&((__pyx_v_self->cs[0])[__pyx_v_k]));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":87
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":87
  *         cdef Candidate candidate = Candidate()
  *         candidate.candidate = &self.cs[0][k]
  *         candidate.score = self.metric.ComputeScore(self.cs[0][k].eval_feats)             # <<<<<<<<<<<<<<
@@ -16295,7 +17760,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12CandidateSet_6__getitem__(struct __pyx_
  */
   __pyx_v_candidate->score = __pyx_v_self->metric->ComputeScore(((__pyx_v_self->cs[0])[__pyx_v_k]).eval_feats);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":88
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":88
  *         candidate.candidate = &self.cs[0][k]
  *         candidate.score = self.metric.ComputeScore(self.cs[0][k].eval_feats)
  *         return candidate             # <<<<<<<<<<<<<<
@@ -16307,8 +17772,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12CandidateSet_6__getitem__(struct __pyx_
   __pyx_r = ((PyObject *)__pyx_v_candidate);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":82
+ *         return self.cs.size()
+ * 
+ *     def __getitem__(self,int k):             # <<<<<<<<<<<<<<
+ *         if not 0 <= k < self.cs.size():
+ *             raise IndexError('candidate set index out of range')
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_3);
   __Pyx_AddTraceback("cdec._cdec.CandidateSet.__getitem__", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -16321,6 +17793,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12CandidateSet_6__getitem__(struct __pyx_
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_12CandidateSet_10generator16(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":90
+ *         return candidate
+ * 
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         cdef unsigned i
+ *         for i in range(len(self)):
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12CandidateSet_9__iter__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_12CandidateSet_9__iter__(PyObject *__pyx_v_self) {
@@ -16328,18 +17808,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12CandidateSet_9__iter__(PyObject *__pyx_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__iter__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_12CandidateSet_8__iter__(((struct __pyx_obj_4cdec_5_cdec_CandidateSet *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":90
- *         return candidate
- * 
- *     def __iter__(self):             # <<<<<<<<<<<<<<
- *         cdef unsigned i
- *         for i in range(len(self)):
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12CandidateSet_8__iter__(struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -16364,6 +17838,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12CandidateSet_8__iter__(struct __pyx_obj
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -16398,7 +17873,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_12CandidateSet_10generator16(__pyx_Genera
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":92
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":92
  *     def __iter__(self):
  *         cdef unsigned i
  *         for i in range(len(self)):             # <<<<<<<<<<<<<<
@@ -16409,14 +17884,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_12CandidateSet_10generator16(__pyx_Genera
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_2;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":93
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":93
  *         cdef unsigned i
  *         for i in range(len(self)):
  *             yield self[i]             # <<<<<<<<<<<<<<
  * 
  *     def add_kbest(self, Hypergraph hypergraph, unsigned k):
  */
-    __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_cur_scope->__pyx_v_self), __pyx_cur_scope->__pyx_v_i, sizeof(unsigned int)+1, PyLong_FromUnsignedLong, 0, 0, 1); if (!__pyx_t_3) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_GetItemInt(((PyObject *)__pyx_cur_scope->__pyx_v_self), __pyx_cur_scope->__pyx_v_i, unsigned int, 0, __Pyx_PyInt_From_unsigned_int, 0, 0, 1); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
     __Pyx_GOTREF(__pyx_t_3);
     __pyx_r = __pyx_t_3;
     __pyx_t_3 = 0;
@@ -16432,6 +17907,16 @@ static PyObject *__pyx_gb_4cdec_5_cdec_12CandidateSet_10generator16(__pyx_Genera
     __pyx_t_2 = __pyx_cur_scope->__pyx_t_1;
     if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
+
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":90
+ *         return candidate
+ * 
+ *     def __iter__(self):             # <<<<<<<<<<<<<<
+ *         cdef unsigned i
+ *         for i in range(len(self)):
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -16445,6 +17930,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_12CandidateSet_10generator16(__pyx_Genera
   return NULL;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":95
+ *             yield self[i]
+ * 
+ *     def add_kbest(self, Hypergraph hypergraph, unsigned k):             # <<<<<<<<<<<<<<
+ *         """cs.add_kbest(Hypergraph hypergraph, int k) -> Extract K-best hypotheses
+ *         from the hypergraph and add them to the candidate set."""
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_12CandidateSet_12add_kbest(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_12CandidateSet_11add_kbest[] = "cs.add_kbest(Hypergraph hypergraph, int k) -> Extract K-best hypotheses \n        from the hypergraph and add them to the candidate set.";
@@ -16458,7 +17951,7 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12CandidateSet_12add_kbest(PyObject *__py
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("add_kbest (wrapper)", 0);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__hypergraph,&__pyx_n_s__k,0};
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_hypergraph,&__pyx_n_s_k,0};
     PyObject* values[2] = {0,0};
     if (unlikely(__pyx_kwds)) {
       Py_ssize_t kw_args;
@@ -16472,10 +17965,10 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12CandidateSet_12add_kbest(PyObject *__py
       kw_args = PyDict_Size(__pyx_kwds);
       switch (pos_args) {
         case  0:
-        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__hypergraph)) != 0)) kw_args--;
+        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_hypergraph)) != 0)) kw_args--;
         else goto __pyx_L5_argtuple_error;
         case  1:
-        if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__k)) != 0)) kw_args--;
+        if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_k)) != 0)) kw_args--;
         else {
           __Pyx_RaiseArgtupleInvalid("add_kbest", 1, 2, 2, 1); {__pyx_filename = __pyx_f[5]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
         }
@@ -16490,7 +17983,7 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12CandidateSet_12add_kbest(PyObject *__py
       values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
     }
     __pyx_v_hypergraph = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)values[0]);
-    __pyx_v_k = __Pyx_PyInt_AsUnsignedInt(values[1]); if (unlikely((__pyx_v_k == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    __pyx_v_k = __Pyx_PyInt_As_unsigned_int(values[1]); if (unlikely((__pyx_v_k == (unsigned int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
@@ -16502,6 +17995,8 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12CandidateSet_12add_kbest(PyObject *__py
   __pyx_L4_argument_unpacking_done:;
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_hypergraph), __pyx_ptype_4cdec_5_cdec_Hypergraph, 1, "hypergraph", 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_5_cdec_12CandidateSet_11add_kbest(((struct __pyx_obj_4cdec_5_cdec_CandidateSet *)__pyx_v_self), __pyx_v_hypergraph, __pyx_v_k);
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __pyx_r = NULL;
@@ -16510,20 +18005,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_12CandidateSet_12add_kbest(PyObject *__py
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":95
- *             yield self[i]
- * 
- *     def add_kbest(self, Hypergraph hypergraph, unsigned k):             # <<<<<<<<<<<<<<
- *         """cs.add_kbest(Hypergraph hypergraph, int k) -> Extract K-best hypotheses
- *         from the hypergraph and add them to the candidate set."""
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_12CandidateSet_11add_kbest(struct __pyx_obj_4cdec_5_cdec_CandidateSet *__pyx_v_self, struct __pyx_obj_4cdec_5_cdec_Hypergraph *__pyx_v_hypergraph, unsigned int __pyx_v_k) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("add_kbest", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":98
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":98
  *         """cs.add_kbest(Hypergraph hypergraph, int k) -> Extract K-best hypotheses
  *         from the hypergraph and add them to the candidate set."""
  *         self.cs.AddKBestCandidates(hypergraph.hg[0], k, self.scorer.get())             # <<<<<<<<<<<<<<
@@ -16532,34 +18019,45 @@ static PyObject *__pyx_pf_4cdec_5_cdec_12CandidateSet_11add_kbest(struct __pyx_o
  */
   __pyx_v_self->cs->AddKBestCandidates((__pyx_v_hypergraph->hg[0]), __pyx_v_k, __pyx_v_self->scorer->get());
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":95
+ *             yield self[i]
+ * 
+ *     def add_kbest(self, Hypergraph hypergraph, unsigned k):             # <<<<<<<<<<<<<<
+ *         """cs.add_kbest(Hypergraph hypergraph, int k) -> Extract K-best hypotheses
+ *         from the hypergraph and add them to the candidate set."""
+ */
+
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":104
+ *     cdef mteval.EvaluationMetric* metric
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.scorer
+ * 
+ */
+
 /* Python wrapper */
 static void __pyx_pw_4cdec_5_cdec_16SegmentEvaluator_1__dealloc__(PyObject *__pyx_v_self); /*proto*/
 static void __pyx_pw_4cdec_5_cdec_16SegmentEvaluator_1__dealloc__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__ (wrapper)", 0);
   __pyx_pf_4cdec_5_cdec_16SegmentEvaluator___dealloc__(((struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":104
- *     cdef mteval.EvaluationMetric* metric
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         del self.scorer
- * 
- */
-
-static void __pyx_pf_4cdec_5_cdec_16SegmentEvaluator___dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator *__pyx_v_self) {
+static void __pyx_pf_4cdec_5_cdec_16SegmentEvaluator___dealloc__(struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":105
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":105
  * 
  *     def __dealloc__(self):
  *         del self.scorer             # <<<<<<<<<<<<<<
@@ -16568,9 +18066,26 @@ static void __pyx_pf_4cdec_5_cdec_16SegmentEvaluator___dealloc__(CYTHON_UNUSED s
  */
   delete __pyx_v_self->scorer;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":104
+ *     cdef mteval.EvaluationMetric* metric
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.scorer
+ * 
+ */
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":107
+ *         del self.scorer
+ * 
+ *     def evaluate(self, sentence):             # <<<<<<<<<<<<<<
+ *         """se.evaluate(sentence) -> SufficientStats for the given hypothesis."""
+ *         cdef vector[WordID] hyp
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_16SegmentEvaluator_3evaluate(PyObject *__pyx_v_self, PyObject *__pyx_v_sentence); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_16SegmentEvaluator_2evaluate[] = "se.evaluate(sentence) -> SufficientStats for the given hypothesis.";
@@ -16579,18 +18094,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_16SegmentEvaluator_3evaluate(PyObject *__
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("evaluate (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_16SegmentEvaluator_2evaluate(((struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator *)__pyx_v_self), ((PyObject *)__pyx_v_sentence));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":107
- *         del self.scorer
- * 
- *     def evaluate(self, sentence):             # <<<<<<<<<<<<<<
- *         """se.evaluate(sentence) -> SufficientStats for the given hypothesis."""
- *         cdef vector[WordID] hyp
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_16SegmentEvaluator_2evaluate(struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator *__pyx_v_self, PyObject *__pyx_v_sentence) {
   std::vector<WordID> __pyx_v_hyp;
   struct __pyx_obj_4cdec_5_cdec_SufficientStats *__pyx_v_sf = 0;
@@ -16605,19 +18114,19 @@ static PyObject *__pyx_pf_4cdec_5_cdec_16SegmentEvaluator_2evaluate(struct __pyx
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("evaluate", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":110
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":110
  *         """se.evaluate(sentence) -> SufficientStats for the given hypothesis."""
  *         cdef vector[WordID] hyp
  *         cdef SufficientStats sf = SufficientStats()             # <<<<<<<<<<<<<<
  *         sf.metric = self.metric
  *         sf.stats = new mteval.SufficientStats()
  */
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SufficientStats)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SufficientStats)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_v_sf = ((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":111
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":111
  *         cdef vector[WordID] hyp
  *         cdef SufficientStats sf = SufficientStats()
  *         sf.metric = self.metric             # <<<<<<<<<<<<<<
@@ -16627,7 +18136,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_16SegmentEvaluator_2evaluate(struct __pyx
   __pyx_t_2 = __pyx_v_self->metric;
   __pyx_v_sf->metric = __pyx_t_2;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":112
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":112
  *         cdef SufficientStats sf = SufficientStats()
  *         sf.metric = self.metric
  *         sf.stats = new mteval.SufficientStats()             # <<<<<<<<<<<<<<
@@ -16636,26 +18145,26 @@ static PyObject *__pyx_pf_4cdec_5_cdec_16SegmentEvaluator_2evaluate(struct __pyx
  */
   __pyx_v_sf->stats = new SufficientStats();
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":113
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":113
  *         sf.metric = self.metric
  *         sf.stats = new mteval.SufficientStats()
  *         ConvertSentence(as_str(sentence.strip()), &hyp)             # <<<<<<<<<<<<<<
  *         self.scorer.get().Evaluate(hyp, sf.stats)
  *         return sf
  */
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_sentence, __pyx_n_s__strip); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_sentence, __pyx_n_s_strip); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __pyx_t_1 = ((PyObject *)__pyx_f_4cdec_5_cdec_as_str(__pyx_t_3, NULL)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_f_4cdec_5_cdec_as_str(__pyx_t_3, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_t_4 = __pyx_convert_string_from_py_(__pyx_t_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   TD::ConvertSentence(__pyx_t_4, (&__pyx_v_hyp));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":114
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":114
  *         sf.stats = new mteval.SufficientStats()
  *         ConvertSentence(as_str(sentence.strip()), &hyp)
  *         self.scorer.get().Evaluate(hyp, sf.stats)             # <<<<<<<<<<<<<<
@@ -16664,7 +18173,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_16SegmentEvaluator_2evaluate(struct __pyx
  */
   __pyx_v_self->scorer->get()->Evaluate(__pyx_v_hyp, __pyx_v_sf->stats);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":115
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":115
  *         ConvertSentence(as_str(sentence.strip()), &hyp)
  *         self.scorer.get().Evaluate(hyp, sf.stats)
  *         return sf             # <<<<<<<<<<<<<<
@@ -16676,8 +18185,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_16SegmentEvaluator_2evaluate(struct __pyx
   __pyx_r = ((PyObject *)__pyx_v_sf);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":107
+ *         del self.scorer
+ * 
+ *     def evaluate(self, sentence):             # <<<<<<<<<<<<<<
+ *         """se.evaluate(sentence) -> SufficientStats for the given hypothesis."""
+ *         cdef vector[WordID] hyp
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_3);
@@ -16690,6 +18206,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_16SegmentEvaluator_2evaluate(struct __pyx
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":117
+ *         return sf
+ * 
+ *     def candidate_set(self):             # <<<<<<<<<<<<<<
+ *         """se.candidate_set() -> Candidate set using this segment evaluator for scoring."""
+ *         return CandidateSet(self)
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_16SegmentEvaluator_5candidate_set(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_16SegmentEvaluator_4candidate_set[] = "se.candidate_set() -> Candidate set using this segment evaluator for scoring.";
@@ -16698,18 +18222,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_16SegmentEvaluator_5candidate_set(PyObjec
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("candidate_set (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_16SegmentEvaluator_4candidate_set(((struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":117
- *         return sf
- * 
- *     def candidate_set(self):             # <<<<<<<<<<<<<<
- *         """se.candidate_set() -> Candidate set using this segment evaluator for scoring."""
- *         return CandidateSet(self)
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_16SegmentEvaluator_4candidate_set(struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -16720,7 +18238,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_16SegmentEvaluator_4candidate_set(struct
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("candidate_set", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":119
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":119
  *     def candidate_set(self):
  *         """se.candidate_set() -> Candidate set using this segment evaluator for scoring."""
  *         return CandidateSet(self)             # <<<<<<<<<<<<<<
@@ -16733,15 +18251,22 @@ static PyObject *__pyx_pf_4cdec_5_cdec_16SegmentEvaluator_4candidate_set(struct
   __Pyx_INCREF(((PyObject *)__pyx_v_self));
   PyTuple_SET_ITEM(__pyx_t_1, 0, ((PyObject *)__pyx_v_self));
   __Pyx_GIVEREF(((PyObject *)__pyx_v_self));
-  __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_CandidateSet)), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_CandidateSet)), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_r = __pyx_t_2;
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":117
+ *         return sf
+ * 
+ *     def candidate_set(self):             # <<<<<<<<<<<<<<
+ *         """se.candidate_set() -> Candidate set using this segment evaluator for scoring."""
+ *         return CandidateSet(self)
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -16753,6 +18278,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_16SegmentEvaluator_4candidate_set(struct
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":125
+ *     cdef mteval.EvaluationMetric* metric
+ * 
+ *     def __cinit__(self, bytes name=None):             # <<<<<<<<<<<<<<
+ *         if name:
+ *             self.name = new string(name)
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_6Scorer_1__cinit__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_6Scorer_1__cinit__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -16764,16 +18297,8 @@ static int __pyx_pw_4cdec_5_cdec_6Scorer_1__cinit__(PyObject *__pyx_v_self, PyOb
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__cinit__ (wrapper)", 0);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__name,0};
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_name,0};
     PyObject* values[1] = {0};
-
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":125
- *     cdef mteval.EvaluationMetric* metric
- * 
- *     def __cinit__(self, bytes name=None):             # <<<<<<<<<<<<<<
- *         if name:
- *             self.name = new string(name)
- */
     values[0] = ((PyObject*)Py_None);
     if (unlikely(__pyx_kwds)) {
       Py_ssize_t kw_args;
@@ -16787,7 +18312,7 @@ static int __pyx_pw_4cdec_5_cdec_6Scorer_1__cinit__(PyObject *__pyx_v_self, PyOb
       switch (pos_args) {
         case  0:
         if (kw_args > 0) {
-          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__name);
+          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_name);
           if (value) { values[0] = value; kw_args--; }
         }
       }
@@ -16813,6 +18338,8 @@ static int __pyx_pw_4cdec_5_cdec_6Scorer_1__cinit__(PyObject *__pyx_v_self, PyOb
   __pyx_L4_argument_unpacking_done:;
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_name), (&PyBytes_Type), 1, "name", 1))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_5_cdec_6Scorer___cinit__(((struct __pyx_obj_4cdec_5_cdec_Scorer *)__pyx_v_self), __pyx_v_name);
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __pyx_r = -1;
@@ -16832,24 +18359,24 @@ static int __pyx_pf_4cdec_5_cdec_6Scorer___cinit__(struct __pyx_obj_4cdec_5_cdec
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":126
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":126
  * 
  *     def __cinit__(self, bytes name=None):
  *         if name:             # <<<<<<<<<<<<<<
  *             self.name = new string(name)
  *             self.metric = mteval.MetricInstance(self.name[0])
  */
-  __pyx_t_1 = (((PyObject *)__pyx_v_name) != Py_None) && (PyBytes_GET_SIZE(((PyObject *)__pyx_v_name)) != 0);
+  __pyx_t_1 = (__pyx_v_name != Py_None) && (PyBytes_GET_SIZE(__pyx_v_name) != 0);
   if (__pyx_t_1) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":127
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":127
  *     def __cinit__(self, bytes name=None):
  *         if name:
  *             self.name = new string(name)             # <<<<<<<<<<<<<<
  *             self.metric = mteval.MetricInstance(self.name[0])
  * 
  */
-    __pyx_t_2 = __Pyx_PyObject_AsString(((PyObject *)__pyx_v_name)); if (unlikely((!__pyx_t_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_2 = __Pyx_PyObject_AsString(__pyx_v_name); if (unlikely((!__pyx_t_2) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     try {
       __pyx_t_3 = new std::string(__pyx_t_2);
     } catch(...) {
@@ -16858,7 +18385,7 @@ static int __pyx_pf_4cdec_5_cdec_6Scorer___cinit__(struct __pyx_obj_4cdec_5_cdec
     }
     __pyx_v_self->name = __pyx_t_3;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":128
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":128
  *         if name:
  *             self.name = new string(name)
  *             self.metric = mteval.MetricInstance(self.name[0])             # <<<<<<<<<<<<<<
@@ -16870,6 +18397,15 @@ static int __pyx_pf_4cdec_5_cdec_6Scorer___cinit__(struct __pyx_obj_4cdec_5_cdec
   }
   __pyx_L3:;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":125
+ *     cdef mteval.EvaluationMetric* metric
+ * 
+ *     def __cinit__(self, bytes name=None):             # <<<<<<<<<<<<<<
+ *         if name:
+ *             self.name = new string(name)
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -16880,28 +18416,30 @@ static int __pyx_pf_4cdec_5_cdec_6Scorer___cinit__(struct __pyx_obj_4cdec_5_cdec
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":130
+ *             self.metric = mteval.MetricInstance(self.name[0])
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.name
+ * 
+ */
+
 /* Python wrapper */
 static void __pyx_pw_4cdec_5_cdec_6Scorer_3__dealloc__(PyObject *__pyx_v_self); /*proto*/
 static void __pyx_pw_4cdec_5_cdec_6Scorer_3__dealloc__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__ (wrapper)", 0);
   __pyx_pf_4cdec_5_cdec_6Scorer_2__dealloc__(((struct __pyx_obj_4cdec_5_cdec_Scorer *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":130
- *             self.metric = mteval.MetricInstance(self.name[0])
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         del self.name
- * 
- */
-
-static void __pyx_pf_4cdec_5_cdec_6Scorer_2__dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_Scorer *__pyx_v_self) {
+static void __pyx_pf_4cdec_5_cdec_6Scorer_2__dealloc__(struct __pyx_obj_4cdec_5_cdec_Scorer *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":131
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":131
  * 
  *     def __dealloc__(self):
  *         del self.name             # <<<<<<<<<<<<<<
@@ -16910,9 +18448,26 @@ static void __pyx_pf_4cdec_5_cdec_6Scorer_2__dealloc__(CYTHON_UNUSED struct __py
  */
   delete __pyx_v_self->name;
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":130
+ *             self.metric = mteval.MetricInstance(self.name[0])
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.name
+ * 
+ */
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":133
+ *         del self.name
+ * 
+ *     def __call__(self, refs):             # <<<<<<<<<<<<<<
+ *         if isinstance(refs, basestring):
+ *             refs = [refs]
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_6Scorer_5__call__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_6Scorer_5__call__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -16924,7 +18479,7 @@ static PyObject *__pyx_pw_4cdec_5_cdec_6Scorer_5__call__(PyObject *__pyx_v_self,
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__call__ (wrapper)", 0);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__refs,0};
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_refs,0};
     PyObject* values[1] = {0};
     if (unlikely(__pyx_kwds)) {
       Py_ssize_t kw_args;
@@ -16937,7 +18492,7 @@ static PyObject *__pyx_pw_4cdec_5_cdec_6Scorer_5__call__(PyObject *__pyx_v_self,
       kw_args = PyDict_Size(__pyx_kwds);
       switch (pos_args) {
         case  0:
-        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__refs)) != 0)) kw_args--;
+        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_refs)) != 0)) kw_args--;
         else goto __pyx_L5_argtuple_error;
       }
       if (unlikely(kw_args > 0)) {
@@ -16959,18 +18514,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_6Scorer_5__call__(PyObject *__pyx_v_self,
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_6Scorer_4__call__(((struct __pyx_obj_4cdec_5_cdec_Scorer *)__pyx_v_self), __pyx_v_refs);
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":133
- *         del self.name
- * 
- *     def __call__(self, refs):             # <<<<<<<<<<<<<<
- *         if isinstance(refs, basestring):
- *             refs = [refs]
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_5_cdec_Scorer *__pyx_v_self, PyObject *__pyx_v_refs) {
   std::vector<std::vector<WordID> > *__pyx_v_refsv;
   std::vector<WordID> *__pyx_v_refv;
@@ -16995,7 +18544,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_
   __Pyx_RefNannySetupContext("__call__", 0);
   __Pyx_INCREF(__pyx_v_refs);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":134
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":134
  * 
  *     def __call__(self, refs):
  *         if isinstance(refs, basestring):             # <<<<<<<<<<<<<<
@@ -17006,7 +18555,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":135
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":135
  *     def __call__(self, refs):
  *         if isinstance(refs, basestring):
  *             refs = [refs]             # <<<<<<<<<<<<<<
@@ -17018,14 +18567,13 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_
     __Pyx_INCREF(__pyx_v_refs);
     PyList_SET_ITEM(__pyx_t_3, 0, __pyx_v_refs);
     __Pyx_GIVEREF(__pyx_v_refs);
-    __Pyx_DECREF(__pyx_v_refs);
-    __pyx_v_refs = ((PyObject *)__pyx_t_3);
+    __Pyx_DECREF_SET(__pyx_v_refs, __pyx_t_3);
     __pyx_t_3 = 0;
     goto __pyx_L3;
   }
   __pyx_L3:;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":136
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":136
  *         if isinstance(refs, basestring):
  *             refs = [refs]
  *         cdef vector[vector[WordID]]* refsv = new vector[vector[WordID]]()             # <<<<<<<<<<<<<<
@@ -17040,7 +18588,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_
   }
   __pyx_v_refsv = __pyx_t_4;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":138
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":138
  *         cdef vector[vector[WordID]]* refsv = new vector[vector[WordID]]()
  *         cdef vector[WordID]* refv
  *         for ref in refs:             # <<<<<<<<<<<<<<
@@ -17073,19 +18621,19 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_
     } else {
       __pyx_t_7 = __pyx_t_6(__pyx_t_3);
       if (unlikely(!__pyx_t_7)) {
-        if (PyErr_Occurred()) {
-          if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
+        PyObject* exc_type = PyErr_Occurred();
+        if (exc_type) {
+          if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
           else {__pyx_filename = __pyx_f[5]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         }
         break;
       }
       __Pyx_GOTREF(__pyx_t_7);
     }
-    __Pyx_XDECREF(__pyx_v_ref);
-    __pyx_v_ref = __pyx_t_7;
+    __Pyx_XDECREF_SET(__pyx_v_ref, __pyx_t_7);
     __pyx_t_7 = 0;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":139
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":139
  *         cdef vector[WordID]* refv
  *         for ref in refs:
  *             refv = new vector[WordID]()             # <<<<<<<<<<<<<<
@@ -17100,26 +18648,26 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_
     }
     __pyx_v_refv = __pyx_t_8;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":140
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":140
  *         for ref in refs:
  *             refv = new vector[WordID]()
  *             ConvertSentence(as_str(ref.strip()), refv)             # <<<<<<<<<<<<<<
  *             refsv.push_back(refv[0])
  *             del refv
  */
-    __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_ref, __pyx_n_s__strip); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_v_ref, __pyx_n_s_strip); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_7);
-    __pyx_t_9 = PyObject_Call(__pyx_t_7, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_9 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_9);
     __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-    __pyx_t_7 = ((PyObject *)__pyx_f_4cdec_5_cdec_as_str(__pyx_t_9, NULL)); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_7 = __pyx_f_4cdec_5_cdec_as_str(__pyx_t_9, NULL); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_7);
     __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
     __pyx_t_10 = __pyx_convert_string_from_py_(__pyx_t_7); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
     TD::ConvertSentence(__pyx_t_10, __pyx_v_refv);
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":141
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":141
  *             refv = new vector[WordID]()
  *             ConvertSentence(as_str(ref.strip()), refv)
  *             refsv.push_back(refv[0])             # <<<<<<<<<<<<<<
@@ -17128,7 +18676,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_
  */
     __pyx_v_refsv->push_back((__pyx_v_refv[0]));
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":142
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":142
  *             ConvertSentence(as_str(ref.strip()), refv)
  *             refsv.push_back(refv[0])
  *             del refv             # <<<<<<<<<<<<<<
@@ -17139,19 +18687,19 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_
   }
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":144
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":144
  *             del refv
  *         cdef unsigned i
  *         cdef SegmentEvaluator evaluator = SegmentEvaluator()             # <<<<<<<<<<<<<<
  *         evaluator.metric = self.metric
  *         evaluator.scorer = new shared_ptr[mteval.SegmentEvaluator](
  */
-  __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SegmentEvaluator)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_SegmentEvaluator)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __pyx_v_evaluator = ((struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":145
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":145
  *         cdef unsigned i
  *         cdef SegmentEvaluator evaluator = SegmentEvaluator()
  *         evaluator.metric = self.metric             # <<<<<<<<<<<<<<
@@ -17161,7 +18709,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_
   __pyx_t_11 = __pyx_v_self->metric;
   __pyx_v_evaluator->metric = __pyx_t_11;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":146
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":146
  *         cdef SegmentEvaluator evaluator = SegmentEvaluator()
  *         evaluator.metric = self.metric
  *         evaluator.scorer = new shared_ptr[mteval.SegmentEvaluator](             # <<<<<<<<<<<<<<
@@ -17170,7 +18718,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_
  */
   __pyx_v_evaluator->scorer = new boost::shared_ptr<SegmentEvaluator>(__pyx_v_self->metric->CreateSegmentEvaluator((__pyx_v_refsv[0])));
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":148
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":148
  *         evaluator.scorer = new shared_ptr[mteval.SegmentEvaluator](
  *                 self.metric.CreateSegmentEvaluator(refsv[0]))
  *         del refsv # in theory should not delete but store in SegmentEvaluator             # <<<<<<<<<<<<<<
@@ -17179,7 +18727,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_
  */
   delete __pyx_v_refsv;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":149
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":149
  *                 self.metric.CreateSegmentEvaluator(refsv[0]))
  *         del refsv # in theory should not delete but store in SegmentEvaluator
  *         return evaluator             # <<<<<<<<<<<<<<
@@ -17191,8 +18739,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_
   __pyx_r = ((PyObject *)__pyx_v_evaluator);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":133
+ *         del self.name
+ * 
+ *     def __call__(self, refs):             # <<<<<<<<<<<<<<
+ *         if isinstance(refs, basestring):
+ *             refs = [refs]
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_3);
   __Pyx_XDECREF(__pyx_t_7);
@@ -17208,6 +18763,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_4__call__(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":151
+ *         return evaluator
+ * 
+ *     def __str__(self):             # <<<<<<<<<<<<<<
+ *         return str(self.name.c_str())
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_6Scorer_7__str__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_6Scorer_7__str__(PyObject *__pyx_v_self) {
@@ -17215,18 +18778,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_6Scorer_7__str__(PyObject *__pyx_v_self)
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__str__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_6Scorer_6__str__(((struct __pyx_obj_4cdec_5_cdec_Scorer *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":151
- *         return evaluator
- * 
- *     def __str__(self):             # <<<<<<<<<<<<<<
- *         return str(self.name.c_str())
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_6__str__(struct __pyx_obj_4cdec_5_cdec_Scorer *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -17237,7 +18794,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_6__str__(struct __pyx_obj_4cdec_5
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__str__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":152
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":152
  * 
  *     def __str__(self):
  *         return str(self.name.c_str())             # <<<<<<<<<<<<<<
@@ -17246,21 +18803,28 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_6__str__(struct __pyx_obj_4cdec_5
  */
   __Pyx_XDECREF(__pyx_r);
   __pyx_t_1 = __Pyx_PyBytes_FromString(__pyx_v_self->name->c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_1));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":151
+ *         return evaluator
+ * 
+ *     def __str__(self):             # <<<<<<<<<<<<<<
+ *         return str(self.name.c_str())
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -17272,7 +18836,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Scorer_6__str__(struct __pyx_obj_4cdec_5
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":154
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":154
  *         return str(self.name.c_str())
  * 
  * cdef float _compute_score(void* metric_, mteval.SufficientStats* stats):             # <<<<<<<<<<<<<<
@@ -17298,17 +18862,19 @@ static float __pyx_f_4cdec_5_cdec__compute_score(void *__pyx_v_metric_, Sufficie
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_compute_score", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":155
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":155
  * 
  * cdef float _compute_score(void* metric_, mteval.SufficientStats* stats):
  *     cdef Metric metric = <Metric> metric_             # <<<<<<<<<<<<<<
  *     cdef list ss = []
  *     cdef unsigned i
  */
-  __Pyx_INCREF(((PyObject *)((struct __pyx_obj_4cdec_5_cdec_Metric *)__pyx_v_metric_)));
-  __pyx_v_metric = ((struct __pyx_obj_4cdec_5_cdec_Metric *)__pyx_v_metric_);
+  __pyx_t_1 = ((PyObject *)__pyx_v_metric_);
+  __Pyx_INCREF(__pyx_t_1);
+  __pyx_v_metric = ((struct __pyx_obj_4cdec_5_cdec_Metric *)__pyx_t_1);
+  __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":156
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":156
  * cdef float _compute_score(void* metric_, mteval.SufficientStats* stats):
  *     cdef Metric metric = <Metric> metric_
  *     cdef list ss = []             # <<<<<<<<<<<<<<
@@ -17320,7 +18886,7 @@ static float __pyx_f_4cdec_5_cdec__compute_score(void *__pyx_v_metric_, Sufficie
   __pyx_v_ss = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":158
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":158
  *     cdef list ss = []
  *     cdef unsigned i
  *     for i in range(stats.size()):             # <<<<<<<<<<<<<<
@@ -17331,7 +18897,7 @@ static float __pyx_f_4cdec_5_cdec__compute_score(void *__pyx_v_metric_, Sufficie
   for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {
     __pyx_v_i = __pyx_t_3;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":159
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":159
  *     cdef unsigned i
  *     for i in range(stats.size()):
  *         ss.append(stats[0][i])             # <<<<<<<<<<<<<<
@@ -17344,36 +18910,43 @@ static float __pyx_f_4cdec_5_cdec__compute_score(void *__pyx_v_metric_, Sufficie
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":160
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":160
  *     for i in range(stats.size()):
  *         ss.append(stats[0][i])
  *     return metric.score(ss)             # <<<<<<<<<<<<<<
  * 
  * cdef void _compute_sufficient_stats(void* metric_,
  */
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_metric), __pyx_n_s__score); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_metric), __pyx_n_s_score); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_5);
-  __Pyx_INCREF(((PyObject *)__pyx_v_ss));
-  PyTuple_SET_ITEM(__pyx_t_5, 0, ((PyObject *)__pyx_v_ss));
-  __Pyx_GIVEREF(((PyObject *)__pyx_v_ss));
-  __pyx_t_6 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_INCREF(__pyx_v_ss);
+  PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_ss);
+  __Pyx_GIVEREF(__pyx_v_ss);
+  __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_5, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_6);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
+  __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __pyx_t_7 = __pyx_PyFloat_AsFloat(__pyx_t_6); if (unlikely((__pyx_t_7 == (float)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   __pyx_r = __pyx_t_7;
   goto __pyx_L0;
 
-  __pyx_r = 0;
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":154
+ *         return str(self.name.c_str())
+ * 
+ * cdef float _compute_score(void* metric_, mteval.SufficientStats* stats):             # <<<<<<<<<<<<<<
+ *     cdef Metric metric = <Metric> metric_
+ *     cdef list ss = []
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_5);
   __Pyx_XDECREF(__pyx_t_6);
-  __Pyx_WriteUnraisable("cdec._cdec._compute_score", __pyx_clineno, __pyx_lineno, __pyx_filename);
+  __Pyx_WriteUnraisable("cdec._cdec._compute_score", __pyx_clineno, __pyx_lineno, __pyx_filename, 0);
   __pyx_r = 0;
   __pyx_L0:;
   __Pyx_XDECREF((PyObject *)__pyx_v_metric);
@@ -17382,7 +18955,7 @@ static float __pyx_f_4cdec_5_cdec__compute_score(void *__pyx_v_metric_, Sufficie
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":162
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":162
  *     return metric.score(ss)
  * 
  * cdef void _compute_sufficient_stats(void* metric_,             # <<<<<<<<<<<<<<
@@ -17409,17 +18982,19 @@ static void __pyx_f_4cdec_5_cdec__compute_sufficient_stats(void *__pyx_v_metric_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_compute_sufficient_stats", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":166
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":166
  *         vector[string]* refs,
  *         mteval.SufficientStats* out):
  *     cdef Metric metric = <Metric> metric_             # <<<<<<<<<<<<<<
  *     cdef list refs_ = []
  *     cdef unsigned i
  */
-  __Pyx_INCREF(((PyObject *)((struct __pyx_obj_4cdec_5_cdec_Metric *)__pyx_v_metric_)));
-  __pyx_v_metric = ((struct __pyx_obj_4cdec_5_cdec_Metric *)__pyx_v_metric_);
+  __pyx_t_1 = ((PyObject *)__pyx_v_metric_);
+  __Pyx_INCREF(__pyx_t_1);
+  __pyx_v_metric = ((struct __pyx_obj_4cdec_5_cdec_Metric *)__pyx_t_1);
+  __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":167
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":167
  *         mteval.SufficientStats* out):
  *     cdef Metric metric = <Metric> metric_
  *     cdef list refs_ = []             # <<<<<<<<<<<<<<
@@ -17431,7 +19006,7 @@ static void __pyx_f_4cdec_5_cdec__compute_sufficient_stats(void *__pyx_v_metric_
   __pyx_v_refs_ = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":169
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":169
  *     cdef list refs_ = []
  *     cdef unsigned i
  *     for i in range(refs.size()):             # <<<<<<<<<<<<<<
@@ -17442,7 +19017,7 @@ static void __pyx_f_4cdec_5_cdec__compute_sufficient_stats(void *__pyx_v_metric_
   for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {
     __pyx_v_i = __pyx_t_3;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":170
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":170
  *     cdef unsigned i
  *     for i in range(refs.size()):
  *         refs_.append(str(refs[0][i].c_str()))             # <<<<<<<<<<<<<<
@@ -17450,107 +19025,116 @@ static void __pyx_f_4cdec_5_cdec__compute_sufficient_stats(void *__pyx_v_metric_
  *     out.fields.resize(len(ss))
  */
     __pyx_t_1 = __Pyx_PyBytes_FromString(((__pyx_v_refs[0])[__pyx_v_i]).c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+    __Pyx_GOTREF(__pyx_t_1);
     __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
-    PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_t_1));
-    __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+    PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_1);
+    __Pyx_GIVEREF(__pyx_t_1);
     __pyx_t_1 = 0;
-    __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_4, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_1);
-    __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_t_5 = __Pyx_PyList_Append(__pyx_v_refs_, __pyx_t_1); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   }
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":171
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":171
  *     for i in range(refs.size()):
  *         refs_.append(str(refs[0][i].c_str()))
  *     cdef list ss = metric.evaluate(str(hyp.c_str()), refs_)             # <<<<<<<<<<<<<<
  *     out.fields.resize(len(ss))
  *     for i in range(len(ss)):
  */
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_metric), __pyx_n_s__evaluate); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_metric), __pyx_n_s_evaluate); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_4 = __Pyx_PyBytes_FromString(__pyx_v_hyp->c_str()); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_4));
+  __Pyx_GOTREF(__pyx_t_4);
   __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_6);
-  PyTuple_SET_ITEM(__pyx_t_6, 0, ((PyObject *)__pyx_t_4));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_4));
+  PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4);
+  __Pyx_GIVEREF(__pyx_t_4);
   __pyx_t_4 = 0;
-  __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_6, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
-  __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0;
+  __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_6);
   PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_4);
   __Pyx_GIVEREF(__pyx_t_4);
-  __Pyx_INCREF(((PyObject *)__pyx_v_refs_));
-  PyTuple_SET_ITEM(__pyx_t_6, 1, ((PyObject *)__pyx_v_refs_));
-  __Pyx_GIVEREF(((PyObject *)__pyx_v_refs_));
+  __Pyx_INCREF(__pyx_v_refs_);
+  PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_v_refs_);
+  __Pyx_GIVEREF(__pyx_v_refs_);
   __pyx_t_4 = 0;
-  __pyx_t_4 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_6, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0;
-  if (!(likely(PyList_CheckExact(__pyx_t_4))||((__pyx_t_4) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected list, got %.200s", Py_TYPE(__pyx_t_4)->tp_name), 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+  if (!(likely(PyList_CheckExact(__pyx_t_4))||((__pyx_t_4) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "list", Py_TYPE(__pyx_t_4)->tp_name), 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_ss = ((PyObject*)__pyx_t_4);
   __pyx_t_4 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":172
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":172
  *         refs_.append(str(refs[0][i].c_str()))
  *     cdef list ss = metric.evaluate(str(hyp.c_str()), refs_)
  *     out.fields.resize(len(ss))             # <<<<<<<<<<<<<<
  *     for i in range(len(ss)):
  *         out.fields[i] = ss[i]
  */
-  if (unlikely(((PyObject *)__pyx_v_ss) == Py_None)) {
+  if (unlikely(__pyx_v_ss == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()");
     {__pyx_filename = __pyx_f[5]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
-  __pyx_t_7 = PyList_GET_SIZE(((PyObject *)__pyx_v_ss)); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_7 = PyList_GET_SIZE(__pyx_v_ss); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_out->fields.resize(__pyx_t_7);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":173
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":173
  *     cdef list ss = metric.evaluate(str(hyp.c_str()), refs_)
  *     out.fields.resize(len(ss))
  *     for i in range(len(ss)):             # <<<<<<<<<<<<<<
  *         out.fields[i] = ss[i]
  * 
  */
-  if (unlikely(((PyObject *)__pyx_v_ss) == Py_None)) {
+  if (unlikely(__pyx_v_ss == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()");
     {__pyx_filename = __pyx_f[5]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
-  __pyx_t_7 = PyList_GET_SIZE(((PyObject *)__pyx_v_ss)); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_7 = PyList_GET_SIZE(__pyx_v_ss); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_7; __pyx_t_3+=1) {
     __pyx_v_i = __pyx_t_3;
 
-    /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":174
+    /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":174
  *     out.fields.resize(len(ss))
  *     for i in range(len(ss)):
  *         out.fields[i] = ss[i]             # <<<<<<<<<<<<<<
  * 
  * cdef class Metric:
  */
-    if (unlikely(((PyObject *)__pyx_v_ss) == Py_None)) {
+    if (unlikely(__pyx_v_ss == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
       {__pyx_filename = __pyx_f[5]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
-    __pyx_t_4 = __Pyx_GetItemInt_List(((PyObject *)__pyx_v_ss), __pyx_v_i, sizeof(unsigned int)+1, PyLong_FromUnsignedLong, 1, 0, 1); if (!__pyx_t_4) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_GetItemInt_List(__pyx_v_ss, __pyx_v_i, unsigned int, 0, __Pyx_PyInt_From_unsigned_int, 1, 0, 1); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
     __Pyx_GOTREF(__pyx_t_4);
     __pyx_t_8 = __pyx_PyFloat_AsFloat(__pyx_t_4); if (unlikely((__pyx_t_8 == (float)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 174; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     (__pyx_v_out->fields[__pyx_v_i]) = __pyx_t_8;
   }
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":162
+ *     return metric.score(ss)
+ * 
+ * cdef void _compute_sufficient_stats(void* metric_,             # <<<<<<<<<<<<<<
+ *         string* hyp,
+ *         vector[string]* refs,
+ */
+
+  /* function exit code */
   goto __pyx_L0;
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_4);
   __Pyx_XDECREF(__pyx_t_6);
-  __Pyx_WriteUnraisable("cdec._cdec._compute_sufficient_stats", __pyx_clineno, __pyx_lineno, __pyx_filename);
+  __Pyx_WriteUnraisable("cdec._cdec._compute_sufficient_stats", __pyx_clineno, __pyx_lineno, __pyx_filename, 0);
   __pyx_L0:;
   __Pyx_XDECREF((PyObject *)__pyx_v_metric);
   __Pyx_XDECREF(__pyx_v_refs_);
@@ -17558,6 +19142,14 @@ static void __pyx_f_4cdec_5_cdec__compute_sufficient_stats(void *__pyx_v_metric_
   __Pyx_RefNannyFinishContext();
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":178
+ * cdef class Metric:
+ *     cdef Scorer scorer
+ *     def __cinit__(self):             # <<<<<<<<<<<<<<
+ *         self.scorer = Scorer()
+ *         cdef bytes class_name = self.__class__.__name__
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_6Metric_1__cinit__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_6Metric_1__cinit__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -17568,18 +19160,12 @@ static int __pyx_pw_4cdec_5_cdec_6Metric_1__cinit__(PyObject *__pyx_v_self, PyOb
     __Pyx_RaiseArgtupleInvalid("__cinit__", 1, 0, 0, PyTuple_GET_SIZE(__pyx_args)); return -1;}
   if (unlikely(__pyx_kwds) && unlikely(PyDict_Size(__pyx_kwds) > 0) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "__cinit__", 0))) return -1;
   __pyx_r = __pyx_pf_4cdec_5_cdec_6Metric___cinit__(((struct __pyx_obj_4cdec_5_cdec_Metric *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":178
- * cdef class Metric:
- *     cdef Scorer scorer
- *     def __cinit__(self):             # <<<<<<<<<<<<<<
- *         self.scorer = Scorer()
- *         cdef bytes class_name = self.__class__.__name__
- */
-
 static int __pyx_pf_4cdec_5_cdec_6Metric___cinit__(struct __pyx_obj_4cdec_5_cdec_Metric *__pyx_v_self) {
   PyObject *__pyx_v_class_name = 0;
   int __pyx_r;
@@ -17593,14 +19179,14 @@ static int __pyx_pf_4cdec_5_cdec_6Metric___cinit__(struct __pyx_obj_4cdec_5_cdec
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":179
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":179
  *     cdef Scorer scorer
  *     def __cinit__(self):
  *         self.scorer = Scorer()             # <<<<<<<<<<<<<<
  *         cdef bytes class_name = self.__class__.__name__
  *         self.scorer.name = new string(class_name)
  */
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Scorer)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Scorer)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_GIVEREF(__pyx_t_1);
   __Pyx_GOTREF(__pyx_v_self->scorer);
@@ -17608,30 +19194,30 @@ static int __pyx_pf_4cdec_5_cdec_6Metric___cinit__(struct __pyx_obj_4cdec_5_cdec
   __pyx_v_self->scorer = ((struct __pyx_obj_4cdec_5_cdec_Scorer *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":180
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":180
  *     def __cinit__(self):
  *         self.scorer = Scorer()
  *         cdef bytes class_name = self.__class__.__name__             # <<<<<<<<<<<<<<
  *         self.scorer.name = new string(class_name)
  *         self.scorer.metric = mteval.PyMetricInstance(self.scorer.name[0],
  */
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s____class__); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_class); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s____name__); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_name_2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  if (!(likely(PyBytes_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected bytes, got %.200s", Py_TYPE(__pyx_t_2)->tp_name), 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (!(likely(PyBytes_CheckExact(__pyx_t_2))||((__pyx_t_2) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "bytes", Py_TYPE(__pyx_t_2)->tp_name), 0))) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_class_name = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":181
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":181
  *         self.scorer = Scorer()
  *         cdef bytes class_name = self.__class__.__name__
  *         self.scorer.name = new string(class_name)             # <<<<<<<<<<<<<<
  *         self.scorer.metric = mteval.PyMetricInstance(self.scorer.name[0],
  *                 <void*> self, _compute_sufficient_stats, _compute_score)
  */
-  __pyx_t_3 = __Pyx_PyObject_AsString(((PyObject *)__pyx_v_class_name)); if (unlikely((!__pyx_t_3) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_AsString(__pyx_v_class_name); if (unlikely((!__pyx_t_3) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   try {
     __pyx_t_4 = new std::string(__pyx_t_3);
   } catch(...) {
@@ -17640,7 +19226,7 @@ static int __pyx_pf_4cdec_5_cdec_6Metric___cinit__(struct __pyx_obj_4cdec_5_cdec
   }
   __pyx_v_self->scorer->name = __pyx_t_4;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":182
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":182
  *         cdef bytes class_name = self.__class__.__name__
  *         self.scorer.name = new string(class_name)
  *         self.scorer.metric = mteval.PyMetricInstance(self.scorer.name[0],             # <<<<<<<<<<<<<<
@@ -17649,6 +19235,15 @@ static int __pyx_pf_4cdec_5_cdec_6Metric___cinit__(struct __pyx_obj_4cdec_5_cdec
  */
   __pyx_v_self->scorer->metric = PythonEvaluationMetric::Instance((__pyx_v_self->scorer->name[0]), ((void *)__pyx_v_self), __pyx_f_4cdec_5_cdec__compute_sufficient_stats, __pyx_f_4cdec_5_cdec__compute_score);
 
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":178
+ * cdef class Metric:
+ *     cdef Scorer scorer
+ *     def __cinit__(self):             # <<<<<<<<<<<<<<
+ *         self.scorer = Scorer()
+ *         cdef bytes class_name = self.__class__.__name__
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -17662,6 +19257,14 @@ static int __pyx_pf_4cdec_5_cdec_6Metric___cinit__(struct __pyx_obj_4cdec_5_cdec
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":185
+ *                 <void*> self, _compute_sufficient_stats, _compute_score)
+ * 
+ *     def __call__(self, refs):             # <<<<<<<<<<<<<<
+ *         return self.scorer(refs)
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_6Metric_3__call__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_6Metric_3__call__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -17673,7 +19276,7 @@ static PyObject *__pyx_pw_4cdec_5_cdec_6Metric_3__call__(PyObject *__pyx_v_self,
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__call__ (wrapper)", 0);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__refs,0};
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_refs,0};
     PyObject* values[1] = {0};
     if (unlikely(__pyx_kwds)) {
       Py_ssize_t kw_args;
@@ -17686,7 +19289,7 @@ static PyObject *__pyx_pw_4cdec_5_cdec_6Metric_3__call__(PyObject *__pyx_v_self,
       kw_args = PyDict_Size(__pyx_kwds);
       switch (pos_args) {
         case  0:
-        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__refs)) != 0)) kw_args--;
+        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_refs)) != 0)) kw_args--;
         else goto __pyx_L5_argtuple_error;
       }
       if (unlikely(kw_args > 0)) {
@@ -17708,18 +19311,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_6Metric_3__call__(PyObject *__pyx_v_self,
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_6Metric_2__call__(((struct __pyx_obj_4cdec_5_cdec_Metric *)__pyx_v_self), __pyx_v_refs);
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":185
- *                 <void*> self, _compute_sufficient_stats, _compute_score)
- * 
- *     def __call__(self, refs):             # <<<<<<<<<<<<<<
- *         return self.scorer(refs)
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_6Metric_2__call__(struct __pyx_obj_4cdec_5_cdec_Metric *__pyx_v_self, PyObject *__pyx_v_refs) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -17730,7 +19327,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Metric_2__call__(struct __pyx_obj_4cdec_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__call__", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":186
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":186
  * 
  *     def __call__(self, refs):
  *         return self.scorer(refs)             # <<<<<<<<<<<<<<
@@ -17743,15 +19340,22 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Metric_2__call__(struct __pyx_obj_4cdec_
   __Pyx_INCREF(__pyx_v_refs);
   PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_refs);
   __Pyx_GIVEREF(__pyx_v_refs);
-  __pyx_t_2 = PyObject_Call(((PyObject *)__pyx_v_self->scorer), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)__pyx_v_self->scorer), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 186; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_r = __pyx_t_2;
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":185
+ *                 <void*> self, _compute_sufficient_stats, _compute_score)
+ * 
+ *     def __call__(self, refs):             # <<<<<<<<<<<<<<
+ *         return self.scorer(refs)
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -17763,6 +19367,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Metric_2__call__(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":188
+ *         return self.scorer(refs)
+ * 
+ *     def score(SufficientStats stats):             # <<<<<<<<<<<<<<
+ *         return 0
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_6Metric_5score(PyObject *__pyx_v_stats, CYTHON_UNUSED PyObject *unused); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_6Metric_5score(PyObject *__pyx_v_stats, CYTHON_UNUSED PyObject *unused) {
@@ -17770,24 +19382,18 @@ static PyObject *__pyx_pw_4cdec_5_cdec_6Metric_5score(PyObject *__pyx_v_stats, C
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("score (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_6Metric_4score(((struct __pyx_obj_4cdec_5_cdec_Metric *)__pyx_v_stats));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":188
- *         return self.scorer(refs)
- * 
- *     def score(SufficientStats stats):             # <<<<<<<<<<<<<<
- *         return 0
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_6Metric_4score(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_Metric *__pyx_v_stats) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("score", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":189
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":189
  * 
  *     def score(SufficientStats stats):
  *         return 0             # <<<<<<<<<<<<<<
@@ -17799,13 +19405,29 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Metric_4score(CYTHON_UNUSED struct __pyx
   __pyx_r = __pyx_int_0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":188
+ *         return self.scorer(refs)
+ * 
+ *     def score(SufficientStats stats):             # <<<<<<<<<<<<<<
+ *         return 0
+ * 
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":191
+ *         return 0
+ * 
+ *     def evaluate(self, hyp, refs):             # <<<<<<<<<<<<<<
+ *         return []
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_6Metric_7evaluate(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_6Metric_7evaluate(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
@@ -17818,7 +19440,7 @@ static PyObject *__pyx_pw_4cdec_5_cdec_6Metric_7evaluate(PyObject *__pyx_v_self,
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("evaluate (wrapper)", 0);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__hyp,&__pyx_n_s__refs,0};
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_hyp,&__pyx_n_s_refs,0};
     PyObject* values[2] = {0,0};
     if (unlikely(__pyx_kwds)) {
       Py_ssize_t kw_args;
@@ -17832,10 +19454,10 @@ static PyObject *__pyx_pw_4cdec_5_cdec_6Metric_7evaluate(PyObject *__pyx_v_self,
       kw_args = PyDict_Size(__pyx_kwds);
       switch (pos_args) {
         case  0:
-        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__hyp)) != 0)) kw_args--;
+        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_hyp)) != 0)) kw_args--;
         else goto __pyx_L5_argtuple_error;
         case  1:
-        if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__refs)) != 0)) kw_args--;
+        if (likely((values[1] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_refs)) != 0)) kw_args--;
         else {
           __Pyx_RaiseArgtupleInvalid("evaluate", 1, 2, 2, 1); {__pyx_filename = __pyx_f[5]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
         }
@@ -17861,18 +19483,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_6Metric_7evaluate(PyObject *__pyx_v_self,
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_6Metric_6evaluate(((struct __pyx_obj_4cdec_5_cdec_Metric *)__pyx_v_self), __pyx_v_hyp, __pyx_v_refs);
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":191
- *         return 0
- * 
- *     def evaluate(self, hyp, refs):             # <<<<<<<<<<<<<<
- *         return []
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_6Metric_6evaluate(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_Metric *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v_hyp, CYTHON_UNUSED PyObject *__pyx_v_refs) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -17882,7 +19498,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Metric_6evaluate(CYTHON_UNUSED struct __
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("evaluate", 0);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":192
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":192
  * 
  *     def evaluate(self, hyp, refs):
  *         return []             # <<<<<<<<<<<<<<
@@ -17892,12 +19508,19 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Metric_6evaluate(CYTHON_UNUSED struct __
   __Pyx_XDECREF(__pyx_r);
   __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 192; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_r = ((PyObject *)__pyx_t_1);
+  __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":191
+ *         return 0
+ * 
+ *     def evaluate(self, hyp, refs):             # <<<<<<<<<<<<<<
+ *         return []
+ * 
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_AddTraceback("cdec._cdec.Metric.evaluate", __pyx_clineno, __pyx_lineno, __pyx_filename);
@@ -17908,6 +19531,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_6Metric_6evaluate(CYTHON_UNUSED struct __
   return __pyx_r;
 }
 
+/* "cdec/_cdec.pyx":28
+ * class ParseFailed(Exception): pass
+ * 
+ * def set_silent(yn):             # <<<<<<<<<<<<<<
+ *     """set_silent(bool): Configure the verbosity of cdec."""
+ *     SetSilent(yn)
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_3set_silent(PyObject *__pyx_self, PyObject *__pyx_v_yn); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_2set_silent[] = "set_silent(bool): Configure the verbosity of cdec.";
@@ -17917,18 +19548,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_3set_silent(PyObject *__pyx_self, PyObjec
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("set_silent (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_2set_silent(__pyx_self, ((PyObject *)__pyx_v_yn));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "cdec/_cdec.pyx":28
- * class ParseFailed(Exception): pass
- * 
- * def set_silent(yn):             # <<<<<<<<<<<<<<
- *     """set_silent(bool): Configure the verbosity of cdec."""
- *     SetSilent(yn)
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_2set_silent(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_yn) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -17948,6 +19573,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_2set_silent(CYTHON_UNUSED PyObject *__pyx
   __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_yn); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   SetSilent(__pyx_t_1);
 
+  /* "cdec/_cdec.pyx":28
+ * class ParseFailed(Exception): pass
+ * 
+ * def set_silent(yn):             # <<<<<<<<<<<<<<
+ *     """set_silent(bool): Configure the verbosity of cdec."""
+ *     SetSilent(yn)
+ */
+
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -17960,6 +19594,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_2set_silent(CYTHON_UNUSED PyObject *__pyx
 }
 static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
+/* "cdec/_cdec.pyx":32
+ *     SetSilent(yn)
+ * 
+ * def _make_config(config):             # <<<<<<<<<<<<<<
+ *     for key, value in config.items():
+ *         if isinstance(value, dict):
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_5_make_config(PyObject *__pyx_self, PyObject *__pyx_v_config); /*proto*/
 static PyMethodDef __pyx_mdef_4cdec_5_cdec_5_make_config = {__Pyx_NAMESTR("_make_config"), (PyCFunction)__pyx_pw_4cdec_5_cdec_5_make_config, METH_O, __Pyx_DOCSTR(0)};
@@ -17968,18 +19610,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_5_make_config(PyObject *__pyx_self, PyObj
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("_make_config (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_4_make_config(__pyx_self, ((PyObject *)__pyx_v_config));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "cdec/_cdec.pyx":32
- *     SetSilent(yn)
- * 
- * def _make_config(config):             # <<<<<<<<<<<<<<
- *     for key, value in config.items():
- *         if isinstance(value, dict):
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_4_make_config(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v_config) {
   struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *__pyx_cur_scope;
   PyObject *__pyx_r = NULL;
@@ -18004,6 +19640,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_4_make_config(CYTHON_UNUSED PyObject *__p
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -18057,9 +19694,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
  *         if isinstance(value, dict):
  *             for name, info in value.items():
  */
-  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_config, __pyx_n_s__items); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_config, __pyx_n_s_items); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (PyList_CheckExact(__pyx_t_2) || PyTuple_CheckExact(__pyx_t_2)) {
@@ -18089,8 +19726,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
     } else {
       __pyx_t_2 = __pyx_t_4(__pyx_t_1);
       if (unlikely(!__pyx_t_2)) {
-        if (PyErr_Occurred()) {
-          if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
+        PyObject* exc_type = PyErr_Occurred();
+        if (exc_type) {
+          if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
           else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         }
         break;
@@ -18126,8 +19764,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
       __Pyx_GOTREF(__pyx_t_6);
       #endif
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    } else
-    {
+    } else {
       Py_ssize_t index = -1;
       __pyx_t_7 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_7);
@@ -18149,14 +19786,12 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
       __pyx_L7_unpacking_done:;
     }
     __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_key);
-    __Pyx_XDECREF(__pyx_cur_scope->__pyx_v_key);
+    __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_key, __pyx_t_5);
     __Pyx_GIVEREF(__pyx_t_5);
-    __pyx_cur_scope->__pyx_v_key = __pyx_t_5;
     __pyx_t_5 = 0;
     __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_value);
-    __Pyx_XDECREF(__pyx_cur_scope->__pyx_v_value);
+    __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_value, __pyx_t_6);
     __Pyx_GIVEREF(__pyx_t_6);
-    __pyx_cur_scope->__pyx_v_value = __pyx_t_6;
     __pyx_t_6 = 0;
 
     /* "cdec/_cdec.pyx":34
@@ -18177,9 +19812,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
  *                 yield key, '%s %s' % (name, info)
  *         elif isinstance(value, list):
  */
-      __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_value, __pyx_n_s__items); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_cur_scope->__pyx_v_value, __pyx_n_s_items); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_2);
-      __pyx_t_6 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_6);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       if (PyList_CheckExact(__pyx_t_6) || PyTuple_CheckExact(__pyx_t_6)) {
@@ -18209,8 +19844,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
         } else {
           __pyx_t_6 = __pyx_t_12(__pyx_t_2);
           if (unlikely(!__pyx_t_6)) {
-            if (PyErr_Occurred()) {
-              if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
+            PyObject* exc_type = PyErr_Occurred();
+            if (exc_type) {
+              if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
               else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
             }
             break;
@@ -18246,8 +19882,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
           __Pyx_GOTREF(__pyx_t_7);
           #endif
           __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-        } else
-        {
+        } else {
           Py_ssize_t index = -1;
           __pyx_t_13 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_13)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           __Pyx_GOTREF(__pyx_t_13);
@@ -18269,14 +19904,12 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
           __pyx_L12_unpacking_done:;
         }
         __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_name);
-        __Pyx_XDECREF(__pyx_cur_scope->__pyx_v_name);
+        __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_name, __pyx_t_5);
         __Pyx_GIVEREF(__pyx_t_5);
-        __pyx_cur_scope->__pyx_v_name = __pyx_t_5;
         __pyx_t_5 = 0;
         __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_info);
-        __Pyx_XDECREF(__pyx_cur_scope->__pyx_v_info);
+        __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_info, __pyx_t_7);
         __Pyx_GIVEREF(__pyx_t_7);
-        __pyx_cur_scope->__pyx_v_info = __pyx_t_7;
         __pyx_t_7 = 0;
 
         /* "cdec/_cdec.pyx":36
@@ -18294,18 +19927,18 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
         __Pyx_INCREF(__pyx_cur_scope->__pyx_v_info);
         PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_cur_scope->__pyx_v_info);
         __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_info);
-        __pyx_t_7 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_46), ((PyObject *)__pyx_t_6)); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-        __Pyx_GOTREF(((PyObject *)__pyx_t_7));
-        __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0;
+        __pyx_t_7 = __Pyx_PyString_Format(__pyx_kp_s_s_s_2, __pyx_t_6); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        __Pyx_GOTREF(__pyx_t_7);
+        __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
         __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __Pyx_GOTREF(__pyx_t_6);
         __Pyx_INCREF(__pyx_cur_scope->__pyx_v_key);
         PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_cur_scope->__pyx_v_key);
         __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_key);
-        PyTuple_SET_ITEM(__pyx_t_6, 1, ((PyObject *)__pyx_t_7));
-        __Pyx_GIVEREF(((PyObject *)__pyx_t_7));
+        PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_7);
+        __Pyx_GIVEREF(__pyx_t_7);
         __pyx_t_7 = 0;
-        __pyx_r = ((PyObject *)__pyx_t_6);
+        __pyx_r = __pyx_t_6;
         __pyx_t_6 = 0;
         __Pyx_XGIVEREF(__pyx_t_1);
         __pyx_cur_scope->__pyx_t_0 = __pyx_t_1;
@@ -18381,8 +20014,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
         } else {
           __pyx_t_6 = __pyx_t_12(__pyx_t_2);
           if (unlikely(!__pyx_t_6)) {
-            if (PyErr_Occurred()) {
-              if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
+            PyObject* exc_type = PyErr_Occurred();
+            if (exc_type) {
+              if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
               else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
             }
             break;
@@ -18390,9 +20024,8 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
           __Pyx_GOTREF(__pyx_t_6);
         }
         __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_name);
-        __Pyx_XDECREF(__pyx_cur_scope->__pyx_v_name);
+        __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_name, __pyx_t_6);
         __Pyx_GIVEREF(__pyx_t_6);
-        __pyx_cur_scope->__pyx_v_name = __pyx_t_6;
         __pyx_t_6 = 0;
 
         /* "cdec/_cdec.pyx":39
@@ -18410,7 +20043,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
         __Pyx_INCREF(__pyx_cur_scope->__pyx_v_name);
         PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_cur_scope->__pyx_v_name);
         __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_name);
-        __pyx_r = ((PyObject *)__pyx_t_6);
+        __pyx_r = __pyx_t_6;
         __pyx_t_6 = 0;
         __Pyx_XGIVEREF(__pyx_t_1);
         __pyx_cur_scope->__pyx_t_0 = __pyx_t_1;
@@ -18455,9 +20088,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
       __Pyx_INCREF(__pyx_cur_scope->__pyx_v_value);
       PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_cur_scope->__pyx_v_value);
       __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_value);
-      __pyx_t_6 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_2, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_6);
-      __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+      __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_INCREF(__pyx_cur_scope->__pyx_v_key);
@@ -18466,7 +20099,7 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
       PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_6);
       __Pyx_GIVEREF(__pyx_t_6);
       __pyx_t_6 = 0;
-      __pyx_r = ((PyObject *)__pyx_t_2);
+      __pyx_r = __pyx_t_2;
       __pyx_t_2 = 0;
       __Pyx_XGIVEREF(__pyx_t_1);
       __pyx_cur_scope->__pyx_t_0 = __pyx_t_1;
@@ -18488,6 +20121,16 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
     __pyx_L8:;
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+
+  /* "cdec/_cdec.pyx":32
+ *     SetSilent(yn)
+ * 
+ * def _make_config(config):             # <<<<<<<<<<<<<<
+ *     for key, value in config.items():
+ *         if isinstance(value, dict):
+ */
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -18506,6 +20149,14 @@ static PyObject *__pyx_gb_4cdec_5_cdec_6generator17(__pyx_GeneratorObject *__pyx
   return NULL;
 }
 
+/* "cdec/_cdec.pyx":47
+ *     cdef DenseVector weights
+ * 
+ *     def __init__(self, config_str=None, **config):             # <<<<<<<<<<<<<<
+ *         """Decoder('formalism = scfg') -> initialize from configuration string
+ *         Decoder(formalism='scfg') -> initialize from named parameters
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_7Decoder_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_7Decoder___init__[] = "Decoder('formalism = scfg') -> initialize from configuration string\n        Decoder(formalism='scfg') -> initialize from named parameters\n        Create a decoder using a given configuration. Formalism is required.";
@@ -18524,16 +20175,8 @@ static int __pyx_pw_4cdec_5_cdec_7Decoder_1__init__(PyObject *__pyx_v_self, PyOb
   __pyx_v_config = PyDict_New(); if (unlikely(!__pyx_v_config)) return -1;
   __Pyx_GOTREF(__pyx_v_config);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__config_str,0};
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_config_str,0};
     PyObject* values[1] = {0};
-
-    /* "cdec/_cdec.pyx":47
- *     cdef DenseVector weights
- * 
- *     def __init__(self, config_str=None, **config):             # <<<<<<<<<<<<<<
- *         """Decoder('formalism = scfg') -> initialize from configuration string
- *         Decoder(formalism='scfg') -> initialize from named parameters
- */
     values[0] = ((PyObject *)Py_None);
     if (unlikely(__pyx_kwds)) {
       Py_ssize_t kw_args;
@@ -18547,7 +20190,7 @@ static int __pyx_pw_4cdec_5_cdec_7Decoder_1__init__(PyObject *__pyx_v_self, PyOb
       switch (pos_args) {
         case  0:
         if (kw_args > 0) {
-          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__config_str);
+          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_config_str);
           if (value) { values[0] = value; kw_args--; }
         }
       }
@@ -18573,6 +20216,8 @@ static int __pyx_pw_4cdec_5_cdec_7Decoder_1__init__(PyObject *__pyx_v_self, PyOb
   return -1;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Decoder___init__(((struct __pyx_obj_4cdec_5_cdec_Decoder *)__pyx_v_self), __pyx_v_config_str, __pyx_v_config);
+
+  /* function exit code */
   __Pyx_XDECREF(__pyx_v_config);
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
@@ -18611,6 +20256,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_8__init___genexpr(PyObject *__py
     return (PyObject *) gen;
   }
 
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -18646,18 +20292,18 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Decoder_8__init___2generator21(__pyx_Gen
   }
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s___make_config); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_make_config); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   if (unlikely(!__pyx_cur_scope->__pyx_outer_scope->__pyx_v_config)) { __Pyx_RaiseClosureNameError("config"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;} }
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_INCREF(((PyObject *)__pyx_cur_scope->__pyx_outer_scope->__pyx_v_config));
-  PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_cur_scope->__pyx_outer_scope->__pyx_v_config));
-  __Pyx_GIVEREF(((PyObject *)__pyx_cur_scope->__pyx_outer_scope->__pyx_v_config));
-  __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_INCREF(__pyx_cur_scope->__pyx_outer_scope->__pyx_v_config);
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_cur_scope->__pyx_outer_scope->__pyx_v_config);
+  __Pyx_GIVEREF(__pyx_cur_scope->__pyx_outer_scope->__pyx_v_config);
+  __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_2, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (PyList_CheckExact(__pyx_t_3) || PyTuple_CheckExact(__pyx_t_3)) {
     __pyx_t_2 = __pyx_t_3; __Pyx_INCREF(__pyx_t_2); __pyx_t_4 = 0;
     __pyx_t_5 = NULL;
@@ -18685,8 +20331,9 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Decoder_8__init___2generator21(__pyx_Gen
     } else {
       __pyx_t_3 = __pyx_t_5(__pyx_t_2);
       if (unlikely(!__pyx_t_3)) {
-        if (PyErr_Occurred()) {
-          if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
+        PyObject* exc_type = PyErr_Occurred();
+        if (exc_type) {
+          if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
           else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         }
         break;
@@ -18694,13 +20341,12 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Decoder_8__init___2generator21(__pyx_Gen
       __Pyx_GOTREF(__pyx_t_3);
     }
     __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_kv);
-    __Pyx_XDECREF(__pyx_cur_scope->__pyx_v_kv);
+    __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_kv, __pyx_t_3);
     __Pyx_GIVEREF(__pyx_t_3);
-    __pyx_cur_scope->__pyx_v_kv = __pyx_t_3;
     __pyx_t_3 = 0;
-    __pyx_t_3 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_47), __pyx_cur_scope->__pyx_v_kv); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_3));
-    __pyx_r = ((PyObject *)__pyx_t_3);
+    __pyx_t_3 = __Pyx_PyString_Format(__pyx_kp_s_s_s_3, __pyx_cur_scope->__pyx_v_kv); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_3);
+    __pyx_r = __pyx_t_3;
     __pyx_t_3 = 0;
     __Pyx_XGIVEREF(__pyx_t_2);
     __pyx_cur_scope->__pyx_t_0 = __pyx_t_2;
@@ -18720,6 +20366,8 @@ static PyObject *__pyx_gb_4cdec_5_cdec_7Decoder_8__init___2generator21(__pyx_Gen
     if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+
+  /* function exit code */
   PyErr_SetNone(PyExc_StopIteration);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -18752,8 +20400,8 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder___init__(struct __pyx_obj_4cdec_5_cdec
   int __pyx_t_1;
   int __pyx_t_2;
   PyObject *__pyx_t_3 = NULL;
-  PyObject *__pyx_t_4 = NULL;
-  int __pyx_t_5;
+  int __pyx_t_4;
+  PyObject *__pyx_t_5 = NULL;
   PyObject *__pyx_t_6 = NULL;
   char *__pyx_t_7;
   int __pyx_lineno = 0;
@@ -18789,7 +20437,7 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder___init__(struct __pyx_obj_4cdec_5_cdec
  *             if formalism not in ('scfg', 'fst', 'lextrans', 'pb',
  *                     'csplit', 'tagger', 'lexalign'):
  */
-    __pyx_t_3 = __Pyx_PyDict_GetItemDefault(((PyObject *)__pyx_cur_scope->__pyx_v_config), ((PyObject *)__pyx_n_s__formalism), Py_None); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyDict_GetItemDefault(__pyx_cur_scope->__pyx_v_config, __pyx_n_s_formalism, Py_None); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
     __pyx_v_formalism = __pyx_t_3;
     __pyx_t_3 = 0;
@@ -18803,54 +20451,40 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder___init__(struct __pyx_obj_4cdec_5_cdec
  */
     __Pyx_INCREF(__pyx_v_formalism);
     __pyx_t_3 = __pyx_v_formalism;
-    __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, ((PyObject *)__pyx_n_s__scfg), Py_NE); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely((__pyx_t_2 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    if (((int)__pyx_t_2)) {
-      __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, ((PyObject *)__pyx_n_s__fst), Py_NE); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __pyx_t_5 = ((int)__pyx_t_1);
+    __pyx_t_2 = (__Pyx_PyString_Equals(__pyx_t_3, __pyx_n_s_scfg, Py_NE)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (__pyx_t_2) {
+      __pyx_t_1 = (__Pyx_PyString_Equals(__pyx_t_3, __pyx_n_s_fst, Py_NE)); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = __pyx_t_1;
     } else {
-      __pyx_t_5 = ((int)__pyx_t_2);
+      __pyx_t_4 = __pyx_t_2;
     }
-    if (__pyx_t_5) {
-      __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, ((PyObject *)__pyx_n_s__lextrans), Py_NE); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely((__pyx_t_2 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __pyx_t_1 = ((int)__pyx_t_2);
+    if (__pyx_t_4) {
+      __pyx_t_2 = (__Pyx_PyString_Equals(__pyx_t_3, __pyx_n_s_lextrans, Py_NE)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_1 = __pyx_t_2;
     } else {
-      __pyx_t_1 = __pyx_t_5;
+      __pyx_t_1 = __pyx_t_4;
     }
     if (__pyx_t_1) {
-      __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, ((PyObject *)__pyx_n_s__pb), Py_NE); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __pyx_t_2 = ((int)__pyx_t_5);
+      __pyx_t_4 = (__Pyx_PyString_Equals(__pyx_t_3, __pyx_n_s_pb, Py_NE)); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_2 = __pyx_t_4;
     } else {
       __pyx_t_2 = __pyx_t_1;
     }
     if (__pyx_t_2) {
-      __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, ((PyObject *)__pyx_n_s__csplit), Py_NE); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __pyx_t_5 = ((int)__pyx_t_1);
+      __pyx_t_1 = (__Pyx_PyString_Equals(__pyx_t_3, __pyx_n_s_csplit, Py_NE)); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = __pyx_t_1;
     } else {
-      __pyx_t_5 = __pyx_t_2;
+      __pyx_t_4 = __pyx_t_2;
     }
-    if (__pyx_t_5) {
-      __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, ((PyObject *)__pyx_n_s__tagger), Py_NE); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely((__pyx_t_2 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __pyx_t_1 = ((int)__pyx_t_2);
+    if (__pyx_t_4) {
+      __pyx_t_2 = (__Pyx_PyString_Equals(__pyx_t_3, __pyx_n_s_tagger, Py_NE)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_1 = __pyx_t_2;
     } else {
-      __pyx_t_1 = __pyx_t_5;
+      __pyx_t_1 = __pyx_t_4;
     }
     if (__pyx_t_1) {
-      __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, ((PyObject *)__pyx_n_s__lexalign), Py_NE); __Pyx_XGOTREF(__pyx_t_4); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      __pyx_t_2 = ((int)__pyx_t_5);
+      __pyx_t_4 = (__Pyx_PyString_Equals(__pyx_t_3, __pyx_n_s_lexalign, Py_NE)); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_2 = __pyx_t_4;
     } else {
       __pyx_t_2 = __pyx_t_1;
     }
@@ -18865,25 +20499,23 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder___init__(struct __pyx_obj_4cdec_5_cdec
  *             config_str = '\n'.join('%s = %s' % kv for kv in _make_config(config))
  *         cdef istringstream* config_stream = new istringstream(config_str)
  */
-      __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s__InvalidConfig); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_InvalidConfig); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_3);
-      __pyx_t_4 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_48), __pyx_v_formalism); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(((PyObject *)__pyx_t_4));
+      __pyx_t_5 = __Pyx_PyString_Format(__pyx_kp_s_formalism_s_unknown, __pyx_v_formalism); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_5);
       __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_6);
-      PyTuple_SET_ITEM(__pyx_t_6, 0, ((PyObject *)__pyx_t_4));
-      __Pyx_GIVEREF(((PyObject *)__pyx_t_4));
-      __pyx_t_4 = 0;
-      __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_6), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(__pyx_t_4);
+      PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_5);
+      __Pyx_GIVEREF(__pyx_t_5);
+      __pyx_t_5 = 0;
+      __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_6, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_5);
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-      __Pyx_DECREF(((PyObject *)__pyx_t_6)); __pyx_t_6 = 0;
-      __Pyx_Raise(__pyx_t_4, 0, 0, 0);
-      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+      __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+      __Pyx_Raise(__pyx_t_5, 0, 0, 0);
+      __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      goto __pyx_L4;
     }
-    __pyx_L4:;
 
     /* "cdec/_cdec.pyx":56
  *                     'csplit', 'tagger', 'lexalign'):
@@ -18892,21 +20524,12 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder___init__(struct __pyx_obj_4cdec_5_cdec
  *         cdef istringstream* config_stream = new istringstream(config_str)
  *         self.dec = new decoder.Decoder(config_stream)
  */
-    __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_kp_s_40), __pyx_n_s__join); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(__pyx_t_4);
-    __pyx_t_6 = __pyx_pf_4cdec_5_cdec_7Decoder_8__init___genexpr(((PyObject*)__pyx_cur_scope)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(__pyx_t_6);
-    __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(__pyx_t_3);
-    PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_6);
-    __Pyx_GIVEREF(__pyx_t_6);
-    __pyx_t_6 = 0;
-    __pyx_t_6 = PyObject_Call(__pyx_t_4, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_5 = __pyx_pf_4cdec_5_cdec_7Decoder_8__init___genexpr(((PyObject*)__pyx_cur_scope)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_5);
+    __pyx_t_6 = __Pyx_PyString_Join(__pyx_kp_s__16, __pyx_t_5); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_6);
-    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
-    __Pyx_DECREF(__pyx_v_config_str);
-    __pyx_v_config_str = __pyx_t_6;
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __Pyx_DECREF_SET(__pyx_v_config_str, __pyx_t_6);
     __pyx_t_6 = 0;
     goto __pyx_L3;
   }
@@ -18947,7 +20570,7 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder___init__(struct __pyx_obj_4cdec_5_cdec
  *         self.weights.vector = &self.dec.CurrentWeightVector()
  *         self.weights.owned = True
  */
-  __pyx_t_6 = __pyx_tp_new_4cdec_5_cdec_DenseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_DenseVector)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_6 = __pyx_tp_new_4cdec_5_cdec_DenseVector(((PyTypeObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_DenseVector)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_6);
   if (!(likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_4cdec_5_cdec_DenseVector)))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GIVEREF(__pyx_t_6);
@@ -18974,11 +20597,20 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder___init__(struct __pyx_obj_4cdec_5_cdec
  */
   __pyx_v_self->weights->owned = 1;
 
+  /* "cdec/_cdec.pyx":47
+ *     cdef DenseVector weights
+ * 
+ *     def __init__(self, config_str=None, **config):             # <<<<<<<<<<<<<<
+ *         """Decoder('formalism = scfg') -> initialize from configuration string
+ *         Decoder(formalism='scfg') -> initialize from named parameters
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_3);
-  __Pyx_XDECREF(__pyx_t_4);
+  __Pyx_XDECREF(__pyx_t_5);
   __Pyx_XDECREF(__pyx_t_6);
   __Pyx_AddTraceback("cdec._cdec.Decoder.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_r = -1;
@@ -18990,24 +20622,26 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder___init__(struct __pyx_obj_4cdec_5_cdec
   return __pyx_r;
 }
 
+/* "cdec/_cdec.pyx":64
+ *         self.weights.owned = True
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.dec
+ * 
+ */
+
 /* Python wrapper */
 static void __pyx_pw_4cdec_5_cdec_7Decoder_3__dealloc__(PyObject *__pyx_v_self); /*proto*/
 static void __pyx_pw_4cdec_5_cdec_7Decoder_3__dealloc__(PyObject *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__ (wrapper)", 0);
   __pyx_pf_4cdec_5_cdec_7Decoder_2__dealloc__(((struct __pyx_obj_4cdec_5_cdec_Decoder *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
-/* "cdec/_cdec.pyx":64
- *         self.weights.owned = True
- * 
- *     def __dealloc__(self):             # <<<<<<<<<<<<<<
- *         del self.dec
- * 
- */
-
-static void __pyx_pf_4cdec_5_cdec_7Decoder_2__dealloc__(CYTHON_UNUSED struct __pyx_obj_4cdec_5_cdec_Decoder *__pyx_v_self) {
+static void __pyx_pf_4cdec_5_cdec_7Decoder_2__dealloc__(struct __pyx_obj_4cdec_5_cdec_Decoder *__pyx_v_self) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
@@ -19020,9 +20654,26 @@ static void __pyx_pf_4cdec_5_cdec_7Decoder_2__dealloc__(CYTHON_UNUSED struct __p
  */
   delete __pyx_v_self->dec;
 
+  /* "cdec/_cdec.pyx":64
+ *         self.weights.owned = True
+ * 
+ *     def __dealloc__(self):             # <<<<<<<<<<<<<<
+ *         del self.dec
+ * 
+ */
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
 }
 
+/* "cdec/_cdec.pyx":68
+ * 
+ *     property weights:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return self.weights
+ * 
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_7Decoder_7weights_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_7Decoder_7weights_1__get__(PyObject *__pyx_v_self) {
@@ -19030,18 +20681,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Decoder_7weights_1__get__(PyObject *__py
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Decoder_7weights___get__(((struct __pyx_obj_4cdec_5_cdec_Decoder *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "cdec/_cdec.pyx":68
- * 
- *     property weights:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             return self.weights
- * 
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_7weights___get__(struct __pyx_obj_4cdec_5_cdec_Decoder *__pyx_v_self) {
   PyObject *__pyx_r = NULL;
   __Pyx_RefNannyDeclarations
@@ -19059,13 +20704,29 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_7weights___get__(struct __pyx_ob
   __pyx_r = ((PyObject *)__pyx_v_self->weights);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
+  /* "cdec/_cdec.pyx":68
+ * 
+ *     property weights:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             return self.weights
+ * 
+ */
+
+  /* function exit code */
   __pyx_L0:;
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
+/* "cdec/_cdec.pyx":71
+ *             return self.weights
+ * 
+ *         def __set__(self, weights):             # <<<<<<<<<<<<<<
+ *             if isinstance(weights, DenseVector):
+ *                 self.weights.vector[0] = (<DenseVector> weights).vector[0]
+ */
+
 /* Python wrapper */
 static int __pyx_pw_4cdec_5_cdec_7Decoder_7weights_3__set__(PyObject *__pyx_v_self, PyObject *__pyx_v_weights); /*proto*/
 static int __pyx_pw_4cdec_5_cdec_7Decoder_7weights_3__set__(PyObject *__pyx_v_self, PyObject *__pyx_v_weights) {
@@ -19073,18 +20734,12 @@ static int __pyx_pw_4cdec_5_cdec_7Decoder_7weights_3__set__(PyObject *__pyx_v_se
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__set__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Decoder_7weights_2__set__(((struct __pyx_obj_4cdec_5_cdec_Decoder *)__pyx_v_self), ((PyObject *)__pyx_v_weights));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "cdec/_cdec.pyx":71
- *             return self.weights
- * 
- *         def __set__(self, weights):             # <<<<<<<<<<<<<<
- *             if isinstance(weights, DenseVector):
- *                 self.weights.vector[0] = (<DenseVector> weights).vector[0]
- */
-
 static int __pyx_pf_4cdec_5_cdec_7Decoder_7weights_2__set__(struct __pyx_obj_4cdec_5_cdec_Decoder *__pyx_v_self, PyObject *__pyx_v_weights) {
   PyObject *__pyx_v_fname = NULL;
   PyObject *__pyx_v_fval = NULL;
@@ -19176,9 +20831,9 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder_7weights_2__set__(struct __pyx_obj_4cd
  *                     self.weights[fname] = fval
  *             else:
  */
-    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_weights, __pyx_n_s__items); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_weights, __pyx_n_s_items); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     if (PyList_CheckExact(__pyx_t_4) || PyTuple_CheckExact(__pyx_t_4)) {
@@ -19208,8 +20863,9 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder_7weights_2__set__(struct __pyx_obj_4cd
       } else {
         __pyx_t_4 = __pyx_t_6(__pyx_t_3);
         if (unlikely(!__pyx_t_4)) {
-          if (PyErr_Occurred()) {
-            if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
+          PyObject* exc_type = PyErr_Occurred();
+          if (exc_type) {
+            if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
             else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           }
           break;
@@ -19245,8 +20901,7 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder_7weights_2__set__(struct __pyx_obj_4cd
         __Pyx_GOTREF(__pyx_t_8);
         #endif
         __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-      } else
-      {
+      } else {
         Py_ssize_t index = -1;
         __pyx_t_9 = PyObject_GetIter(__pyx_t_4); if (unlikely(!__pyx_t_9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __Pyx_GOTREF(__pyx_t_9);
@@ -19267,11 +20922,9 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder_7weights_2__set__(struct __pyx_obj_4cd
         {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __pyx_L7_unpacking_done:;
       }
-      __Pyx_XDECREF(__pyx_v_fname);
-      __pyx_v_fname = __pyx_t_7;
+      __Pyx_XDECREF_SET(__pyx_v_fname, __pyx_t_7);
       __pyx_t_7 = 0;
-      __Pyx_XDECREF(__pyx_v_fval);
-      __pyx_v_fval = __pyx_t_8;
+      __Pyx_XDECREF_SET(__pyx_v_fval, __pyx_t_8);
       __pyx_t_8 = 0;
 
       /* "cdec/_cdec.pyx":79
@@ -19281,7 +20934,7 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder_7weights_2__set__(struct __pyx_obj_4cd
  *             else:
  *                 raise TypeError('cannot initialize weights with %s' % type(weights))
  */
-      if (PyObject_SetItem(((PyObject *)__pyx_v_self->weights), __pyx_v_fname, __pyx_v_fval) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      if (unlikely(PyObject_SetItem(((PyObject *)__pyx_v_self->weights), __pyx_v_fname, __pyx_v_fval) < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     goto __pyx_L3;
@@ -19295,22 +20948,31 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder_7weights_2__set__(struct __pyx_obj_4cd
  * 
  *     property formalism:
  */
-    __pyx_t_3 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_49), ((PyObject *)Py_TYPE(__pyx_v_weights))); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+    __pyx_t_3 = __Pyx_PyString_Format(__pyx_kp_s_cannot_initialize_weights_with_s, ((PyObject *)Py_TYPE(__pyx_v_weights))); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_3);
     __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
-    PyTuple_SET_ITEM(__pyx_t_4, 0, ((PyObject *)__pyx_t_3));
-    __Pyx_GIVEREF(((PyObject *)__pyx_t_3));
+    PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3);
+    __Pyx_GIVEREF(__pyx_t_3);
     __pyx_t_3 = 0;
-    __pyx_t_3 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_Raise(__pyx_t_3, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
   __pyx_L3:;
 
+  /* "cdec/_cdec.pyx":71
+ *             return self.weights
+ * 
+ *         def __set__(self, weights):             # <<<<<<<<<<<<<<
+ *             if isinstance(weights, DenseVector):
+ *                 self.weights.vector[0] = (<DenseVector> weights).vector[0]
+ */
+
+  /* function exit code */
   __pyx_r = 0;
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -19328,6 +20990,14 @@ static int __pyx_pf_4cdec_5_cdec_7Decoder_7weights_2__set__(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
+/* "cdec/_cdec.pyx":84
+ * 
+ *     property formalism:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef variables_map* conf = &self.dec.GetConf()
+ *             return str(conf[0]['formalism'].as_str().c_str())
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_7Decoder_9formalism_1__get__(PyObject *__pyx_v_self); /*proto*/
 static PyObject *__pyx_pw_4cdec_5_cdec_7Decoder_9formalism_1__get__(PyObject *__pyx_v_self) {
@@ -19335,18 +21005,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Decoder_9formalism_1__get__(PyObject *__
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__get__ (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Decoder_9formalism___get__(((struct __pyx_obj_4cdec_5_cdec_Decoder *)__pyx_v_self));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "cdec/_cdec.pyx":84
- * 
- *     property formalism:
- *         def __get__(self):             # <<<<<<<<<<<<<<
- *             cdef variables_map* conf = &self.dec.GetConf()
- *             return str(conf[0]['formalism'].as_str().c_str())
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_9formalism___get__(struct __pyx_obj_4cdec_5_cdec_Decoder *__pyx_v_self) {
   const boost::program_options::variables_map *__pyx_v_conf;
   PyObject *__pyx_r = NULL;
@@ -19375,22 +21039,29 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_9formalism___get__(struct __pyx_
  *     def read_weights(self, weights):
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_1 = __Pyx_PyBytes_FromString(((__pyx_v_conf[0])[__pyx_k__formalism]).as<std::string>().c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = __Pyx_PyBytes_FromString(((__pyx_v_conf[0])[__pyx_k_formalism]).as<std::string>().c_str()); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_t_1));
-  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
-  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_r = __pyx_t_1;
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "cdec/_cdec.pyx":84
+ * 
+ *     property formalism:
+ *         def __get__(self):             # <<<<<<<<<<<<<<
+ *             cdef variables_map* conf = &self.dec.GetConf()
+ *             return str(conf[0]['formalism'].as_str().c_str())
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
@@ -19402,6 +21073,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_9formalism___get__(struct __pyx_
   return __pyx_r;
 }
 
+/* "cdec/_cdec.pyx":88
+ *             return str(conf[0]['formalism'].as_str().c_str())
+ * 
+ *     def read_weights(self, weights):             # <<<<<<<<<<<<<<
+ *         """decoder.read_weights(filename): Read decoder weights from a file."""
+ *         with open(weights) as fp:
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_7Decoder_5read_weights(PyObject *__pyx_v_self, PyObject *__pyx_v_weights); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_7Decoder_4read_weights[] = "decoder.read_weights(filename): Read decoder weights from a file.";
@@ -19410,18 +21089,12 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Decoder_5read_weights(PyObject *__pyx_v_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("read_weights (wrapper)", 0);
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(((struct __pyx_obj_4cdec_5_cdec_Decoder *)__pyx_v_self), ((PyObject *)__pyx_v_weights));
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-/* "cdec/_cdec.pyx":88
- *             return str(conf[0]['formalism'].as_str().c_str())
- * 
- *     def read_weights(self, weights):             # <<<<<<<<<<<<<<
- *         """decoder.read_weights(filename): Read decoder weights from a file."""
- *         with open(weights) as fp:
- */
-
 static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(struct __pyx_obj_4cdec_5_cdec_Decoder *__pyx_v_self, PyObject *__pyx_v_weights) {
   PyObject *__pyx_v_fp = NULL;
   PyObject *__pyx_v_line = NULL;
@@ -19463,14 +21136,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(struct __pyx_obj_4
     __Pyx_INCREF(__pyx_v_weights);
     PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_weights);
     __Pyx_GIVEREF(__pyx_v_weights);
-    __pyx_t_2 = PyObject_Call(__pyx_builtin_open, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_2 = __Pyx_PyObject_Call(__pyx_builtin_open, __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_2);
-    __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
-    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s____exit__); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+    __pyx_t_3 = __Pyx_PyObject_LookupSpecial(__pyx_t_2, __pyx_n_s_exit); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s____enter__); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    __pyx_t_1 = __Pyx_PyObject_LookupSpecial(__pyx_t_2, __pyx_n_s_enter); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     __Pyx_GOTREF(__pyx_t_1);
-    __pyx_t_4 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -19518,16 +21191,16 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(struct __pyx_obj_4
             } else {
               __pyx_t_2 = __pyx_t_9(__pyx_t_4);
               if (unlikely(!__pyx_t_2)) {
-                if (PyErr_Occurred()) {
-                  if (likely(PyErr_ExceptionMatches(PyExc_StopIteration))) PyErr_Clear();
+                PyObject* exc_type = PyErr_Occurred();
+                if (exc_type) {
+                  if (likely(exc_type == PyExc_StopIteration || PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear();
                   else {__pyx_filename = __pyx_f[0]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
                 }
                 break;
               }
               __Pyx_GOTREF(__pyx_t_2);
             }
-            __Pyx_XDECREF(__pyx_v_line);
-            __pyx_v_line = __pyx_t_2;
+            __Pyx_XDECREF_SET(__pyx_v_line, __pyx_t_2);
             __pyx_t_2 = 0;
 
             /* "cdec/_cdec.pyx":92
@@ -19537,24 +21210,22 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(struct __pyx_obj_4
  *                 fname, value = line.split()
  *                 self.weights[fname.strip()] = float(value)
  */
-            __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_line, __pyx_n_s__strip); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
+            __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_v_line, __pyx_n_s_strip); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             __Pyx_GOTREF(__pyx_t_2);
-            __pyx_t_1 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
+            __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             __Pyx_GOTREF(__pyx_t_1);
             __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-            __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s__startswith); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
+            __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_startswith); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             __Pyx_GOTREF(__pyx_t_2);
             __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
-            __pyx_t_1 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_k_tuple_51), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
+            __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_tuple__21, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             __Pyx_GOTREF(__pyx_t_1);
             __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
             __pyx_t_10 = __Pyx_PyObject_IsTrue(__pyx_t_1); if (unlikely(__pyx_t_10 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
             if (__pyx_t_10) {
               goto __pyx_L16_continue;
-              goto __pyx_L18;
             }
-            __pyx_L18:;
 
             /* "cdec/_cdec.pyx":93
  *             for line in fp:
@@ -19563,9 +21234,9 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(struct __pyx_obj_4
  *                 self.weights[fname.strip()] = float(value)
  * 
  */
-            __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_line, __pyx_n_s__split); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
+            __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_v_line, __pyx_n_s_split); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             __Pyx_GOTREF(__pyx_t_1);
-            __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
+            __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             __Pyx_GOTREF(__pyx_t_2);
             __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
             if ((likely(PyTuple_CheckExact(__pyx_t_2))) || (PyList_CheckExact(__pyx_t_2))) {
@@ -19597,8 +21268,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(struct __pyx_obj_4
               __Pyx_GOTREF(__pyx_t_11);
               #endif
               __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-            } else
-            {
+            } else {
               Py_ssize_t index = -1;
               __pyx_t_12 = PyObject_GetIter(__pyx_t_2); if (unlikely(!__pyx_t_12)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
               __Pyx_GOTREF(__pyx_t_12);
@@ -19619,11 +21289,9 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(struct __pyx_obj_4
               {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
               __pyx_L20_unpacking_done:;
             }
-            __Pyx_XDECREF(__pyx_v_fname);
-            __pyx_v_fname = __pyx_t_1;
+            __Pyx_XDECREF_SET(__pyx_v_fname, __pyx_t_1);
             __pyx_t_1 = 0;
-            __Pyx_XDECREF(__pyx_v_value);
-            __pyx_v_value = __pyx_t_11;
+            __Pyx_XDECREF_SET(__pyx_v_value, __pyx_t_11);
             __pyx_t_11 = 0;
 
             /* "cdec/_cdec.pyx":94
@@ -19636,12 +21304,12 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(struct __pyx_obj_4
             __pyx_t_14 = __Pyx_PyObject_AsDouble(__pyx_v_value); if (unlikely(__pyx_t_14 == ((double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             __pyx_t_2 = PyFloat_FromDouble(__pyx_t_14); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             __Pyx_GOTREF(__pyx_t_2);
-            __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_v_fname, __pyx_n_s__strip); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
+            __pyx_t_11 = __Pyx_PyObject_GetAttrStr(__pyx_v_fname, __pyx_n_s_strip); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             __Pyx_GOTREF(__pyx_t_11);
-            __pyx_t_1 = PyObject_Call(__pyx_t_11, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
+            __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_11, __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             __Pyx_GOTREF(__pyx_t_1);
             __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
-            if (PyObject_SetItem(((PyObject *)__pyx_v_self->weights), __pyx_t_1, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
+            if (unlikely(PyObject_SetItem(((PyObject *)__pyx_v_self->weights), __pyx_t_1, __pyx_t_2) < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
             __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
             __pyx_L16_continue:;
@@ -19672,19 +21340,11 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(struct __pyx_obj_4
           __Pyx_GOTREF(__pyx_t_4);
           __Pyx_GOTREF(__pyx_t_2);
           __Pyx_GOTREF(__pyx_t_1);
-          __pyx_t_11 = PyTuple_New(3); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L9_except_error;}
+          __pyx_t_11 = PyTuple_Pack(3, __pyx_t_4, __pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L9_except_error;}
           __Pyx_GOTREF(__pyx_t_11);
-          __Pyx_INCREF(__pyx_t_4);
-          PyTuple_SET_ITEM(__pyx_t_11, 0, __pyx_t_4);
-          __Pyx_GIVEREF(__pyx_t_4);
-          __Pyx_INCREF(__pyx_t_2);
-          PyTuple_SET_ITEM(__pyx_t_11, 1, __pyx_t_2);
-          __Pyx_GIVEREF(__pyx_t_2);
-          __Pyx_INCREF(__pyx_t_1);
-          PyTuple_SET_ITEM(__pyx_t_11, 2, __pyx_t_1);
-          __Pyx_GIVEREF(__pyx_t_1);
-          __pyx_t_15 = PyObject_Call(__pyx_t_3, __pyx_t_11, NULL);
+          __pyx_t_15 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_11, NULL);
           __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+          __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
           if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L9_except_error;}
           __Pyx_GOTREF(__pyx_t_15);
           __pyx_t_10 = __Pyx_PyObject_IsTrue(__pyx_t_15);
@@ -19694,14 +21354,11 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(struct __pyx_obj_4
           if (__pyx_t_16) {
             __Pyx_GIVEREF(__pyx_t_4);
             __Pyx_GIVEREF(__pyx_t_2);
-            __Pyx_GIVEREF(__pyx_t_1);
+            __Pyx_XGIVEREF(__pyx_t_1);
             __Pyx_ErrRestore(__pyx_t_4, __pyx_t_2, __pyx_t_1);
             __pyx_t_4 = 0; __pyx_t_2 = 0; __pyx_t_1 = 0; 
             {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L9_except_error;}
-            goto __pyx_L23;
           }
-          __pyx_L23:;
-          __Pyx_DECREF(((PyObject *)__pyx_t_11)); __pyx_t_11 = 0;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -19722,15 +21379,17 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(struct __pyx_obj_4
       }
     }
     /*finally:*/ {
-      if (__pyx_t_3) {
-        __pyx_t_7 = PyObject_Call(__pyx_t_3, __pyx_k_tuple_52, NULL);
-        __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-        if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-        __Pyx_GOTREF(__pyx_t_7);
-        __pyx_t_16 = __Pyx_PyObject_IsTrue(__pyx_t_7);
-        __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
-        if (__pyx_t_16 < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      /*normal exit:*/{
+        if (__pyx_t_3) {
+          __pyx_t_7 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple__22, NULL);
+          __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+          if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+          __Pyx_GOTREF(__pyx_t_7);
+          __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
+        }
+        goto __pyx_L6;
       }
+      __pyx_L6:;
     }
     goto __pyx_L24;
     __pyx_L3_error:;
@@ -19739,6 +21398,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(struct __pyx_obj_4
     __pyx_L24:;
   }
 
+  /* "cdec/_cdec.pyx":88
+ *             return str(conf[0]['formalism'].as_str().c_str())
+ * 
+ *     def read_weights(self, weights):             # <<<<<<<<<<<<<<
+ *         """decoder.read_weights(filename): Read decoder weights from a file."""
+ *         with open(weights) as fp:
+ */
+
+  /* function exit code */
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
@@ -19759,6 +21427,14 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_4read_weights(struct __pyx_obj_4
   return __pyx_r;
 }
 
+/* "cdec/_cdec.pyx":96
+ *                 self.weights[fname.strip()] = float(value)
+ * 
+ *     def translate(self, sentence, grammar=None):             # <<<<<<<<<<<<<<
+ *         """decoder.translate(sentence, grammar=None) -> Hypergraph
+ *         Translate a sentence (string/Lattice) with a grammar (string/list of rules)."""
+ */
+
 /* Python wrapper */
 static PyObject *__pyx_pw_4cdec_5_cdec_7Decoder_7translate(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_4cdec_5_cdec_7Decoder_6translate[] = "decoder.translate(sentence, grammar=None) -> Hypergraph\n        Translate a sentence (string/Lattice) with a grammar (string/list of rules).";
@@ -19772,16 +21448,8 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Decoder_7translate(PyObject *__pyx_v_sel
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("translate (wrapper)", 0);
   {
-    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s__sentence,&__pyx_n_s__grammar,0};
+    static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_sentence,&__pyx_n_s_grammar,0};
     PyObject* values[2] = {0,0};
-
-    /* "cdec/_cdec.pyx":96
- *                 self.weights[fname.strip()] = float(value)
- * 
- *     def translate(self, sentence, grammar=None):             # <<<<<<<<<<<<<<
- *         """decoder.translate(sentence, grammar=None) -> Hypergraph
- *         Translate a sentence (string/Lattice) with a grammar (string/list of rules)."""
- */
     values[1] = ((PyObject *)Py_None);
     if (unlikely(__pyx_kwds)) {
       Py_ssize_t kw_args;
@@ -19795,11 +21463,11 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Decoder_7translate(PyObject *__pyx_v_sel
       kw_args = PyDict_Size(__pyx_kwds);
       switch (pos_args) {
         case  0:
-        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s__sentence)) != 0)) kw_args--;
+        if (likely((values[0] = PyDict_GetItem(__pyx_kwds, __pyx_n_s_sentence)) != 0)) kw_args--;
         else goto __pyx_L5_argtuple_error;
         case  1:
         if (kw_args > 0) {
-          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s__grammar);
+          PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_n_s_grammar);
           if (value) { values[1] = value; kw_args--; }
         }
       }
@@ -19826,6 +21494,8 @@ static PyObject *__pyx_pw_4cdec_5_cdec_7Decoder_7translate(PyObject *__pyx_v_sel
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_5_cdec_7Decoder_6translate(((struct __pyx_obj_4cdec_5_cdec_Decoder *)__pyx_v_self), __pyx_v_sentence, __pyx_v_grammar);
+
+  /* function exit code */
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
@@ -19864,12 +21534,12 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_6translate(struct __pyx_obj_4cde
  *         elif isinstance(sentence, Lattice):
  *             input_str = str(sentence) # PLF format
  */
-    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_sentence, __pyx_n_s__strip); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_v_sentence, __pyx_n_s_strip); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_t_3 = ((PyObject *)__pyx_f_4cdec_5_cdec_as_str(__pyx_t_4, NULL)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __pyx_f_4cdec_5_cdec_as_str(__pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_v_input_str = ((PyObject*)__pyx_t_3);
@@ -19900,10 +21570,10 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_6translate(struct __pyx_obj_4cde
     __Pyx_INCREF(__pyx_v_sentence);
     PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_v_sentence);
     __Pyx_GIVEREF(__pyx_v_sentence);
-    __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)(&PyString_Type))), __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
-    if (!(likely(PyBytes_CheckExact(__pyx_t_4))||((__pyx_t_4) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected bytes, got %.200s", Py_TYPE(__pyx_t_4)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    if (!(likely(PyBytes_CheckExact(__pyx_t_4))||((__pyx_t_4) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "bytes", Py_TYPE(__pyx_t_4)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __pyx_v_input_str = ((PyObject*)__pyx_t_4);
     __pyx_t_4 = 0;
     goto __pyx_L3;
@@ -19917,16 +21587,16 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_6translate(struct __pyx_obj_4cde
  *         if grammar:
  *             if isinstance(grammar, basestring):
  */
-    __pyx_t_4 = PyNumber_Remainder(((PyObject *)__pyx_kp_s_53), ((PyObject *)Py_TYPE(__pyx_v_sentence))); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(((PyObject *)__pyx_t_4));
+    __pyx_t_4 = __Pyx_PyString_Format(__pyx_kp_s_Cannot_translate_input_type_s, ((PyObject *)Py_TYPE(__pyx_v_sentence))); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_4);
     __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    PyTuple_SET_ITEM(__pyx_t_3, 0, ((PyObject *)__pyx_t_4));
-    __Pyx_GIVEREF(((PyObject *)__pyx_t_4));
+    PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4);
+    __Pyx_GIVEREF(__pyx_t_4);
     __pyx_t_4 = 0;
-    __pyx_t_4 = PyObject_Call(__pyx_builtin_TypeError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_TypeError, __pyx_t_3, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
-    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __Pyx_Raise(__pyx_t_4, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 105; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -19961,7 +21631,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_6translate(struct __pyx_obj_4cde
  *             else:
  *                 self.dec.AddSupplementalGrammar(TextGrammar(grammar).grammar[0])
  */
-      __pyx_t_4 = ((PyObject *)__pyx_f_4cdec_5_cdec_as_str(__pyx_v_grammar, NULL)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_4 = __pyx_f_4cdec_5_cdec_as_str(__pyx_v_grammar, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_4);
       __pyx_t_5 = __pyx_convert_string_from_py_(__pyx_t_4); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
@@ -19982,9 +21652,9 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_6translate(struct __pyx_obj_4cde
       __Pyx_INCREF(__pyx_v_grammar);
       PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_v_grammar);
       __Pyx_GIVEREF(__pyx_v_grammar);
-      __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_TextGrammar)), ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_TextGrammar)), __pyx_t_4, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_3);
-      __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       __pyx_v_self->dec->AddSupplementalGrammar((((struct __pyx_obj_4cdec_5_cdec_TextGrammar *)__pyx_t_3)->__pyx_base.grammar[0]));
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     }
@@ -20009,7 +21679,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_6translate(struct __pyx_obj_4cde
  *         if observer.hypergraph == NULL:
  *             raise ParseFailed()
  */
-  __pyx_t_5 = __pyx_convert_string_from_py_(((PyObject *)__pyx_v_input_str)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_5 = __pyx_convert_string_from_py_(__pyx_v_input_str); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_self->dec->Decode(__pyx_t_5, (&__pyx_v_observer));
 
   /* "cdec/_cdec.pyx":113
@@ -20029,17 +21699,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_6translate(struct __pyx_obj_4cde
  *         cdef Hypergraph hg = Hypergraph()
  *         hg.hg = new hypergraph.Hypergraph(observer.hypergraph[0])
  */
-    __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s__ParseFailed); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_ParseFailed); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_4 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __Pyx_Raise(__pyx_t_4, 0, 0, 0);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    goto __pyx_L6;
   }
-  __pyx_L6:;
 
   /* "cdec/_cdec.pyx":115
  *         if observer.hypergraph == NULL:
@@ -20048,7 +21716,7 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_6translate(struct __pyx_obj_4cde
  *         hg.hg = new hypergraph.Hypergraph(observer.hypergraph[0])
  *         return hg
  */
-  __pyx_t_4 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Hypergraph)), ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Hypergraph)), __pyx_empty_tuple, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
   __pyx_v_hg = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)__pyx_t_4);
   __pyx_t_4 = 0;
@@ -20071,8 +21739,15 @@ static PyObject *__pyx_pf_4cdec_5_cdec_7Decoder_6translate(struct __pyx_obj_4cde
   __pyx_r = ((PyObject *)__pyx_v_hg);
   goto __pyx_L0;
 
-  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
-  goto __pyx_L0;
+  /* "cdec/_cdec.pyx":96
+ *                 self.weights[fname.strip()] = float(value)
+ * 
+ *     def translate(self, sentence, grammar=None):             # <<<<<<<<<<<<<<
+ *         """decoder.translate(sentence, grammar=None) -> Hypergraph
+ *         Translate a sentence (string/Lattice) with a grammar (string/list of rules)."""
+ */
+
+  /* function exit code */
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_3);
   __Pyx_XDECREF(__pyx_t_4);
@@ -20099,6 +21774,10 @@ static std::string __pyx_convert_string_from_py_(PyObject *__pyx_v_o) {
   char *__pyx_v_data;
   std::string __pyx_r;
   __Pyx_RefNannyDeclarations
+  char *__pyx_t_1;
+  int __pyx_lineno = 0;
+  const char *__pyx_filename = NULL;
+  int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__pyx_convert_string_from_py_", 0);
 
   /* "string.from_py":15
@@ -20108,7 +21787,8 @@ static std::string __pyx_convert_string_from_py_(PyObject *__pyx_v_o) {
  *     return string(data, length)
  * 
  */
-  __pyx_v_data = __Pyx_PyObject_AsStringAndSize(__pyx_v_o, (&__pyx_v_length));
+  __pyx_t_1 = __Pyx_PyObject_AsStringAndSize(__pyx_v_o, (&__pyx_v_length)); if (unlikely(__pyx_t_1 == NULL)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_v_data = __pyx_t_1;
 
   /* "string.from_py":16
  *     cdef Py_ssize_t length
@@ -20120,368 +21800,44 @@ static std::string __pyx_convert_string_from_py_(PyObject *__pyx_v_o) {
   __pyx_r = std::string(__pyx_v_data, __pyx_v_length);
   goto __pyx_L0;
 
+  /* "string.from_py":13
+ * 
+ * @cname("__pyx_convert_string_from_py_")
+ * cdef string __pyx_convert_string_from_py_(object o) except *:             # <<<<<<<<<<<<<<
+ *     cdef Py_ssize_t length
+ *     cdef char* data = __Pyx_PyObject_AsStringAndSize(o, &length)
+ */
+
+  /* function exit code */
+  __pyx_L1_error:;
+  __Pyx_AddTraceback("string.from_py.__pyx_convert_string_from_py_", __pyx_clineno, __pyx_lineno, __pyx_filename);
   __pyx_L0:;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
 }
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_TRule(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
-  if (unlikely(!o)) return 0;
-  return o;
-}
-
-static void __pyx_tp_dealloc_4cdec_5_cdec_TRule(PyObject *o) {
-  {
-    PyObject *etype, *eval, *etb;
-    PyErr_Fetch(&etype, &eval, &etb);
-    ++Py_REFCNT(o);
-    __pyx_pw_4cdec_5_cdec_5TRule_3__dealloc__(o);
-    if (PyErr_Occurred()) PyErr_WriteUnraisable(o);
-    --Py_REFCNT(o);
-    PyErr_Restore(etype, eval, etb);
-  }
-  (*Py_TYPE(o)->tp_free)(o);
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_5TRule_arity(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_5TRule_5arity_1__get__(o);
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_5TRule_f(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_5TRule_1f_1__get__(o);
-}
-
-static int __pyx_setprop_4cdec_5_cdec_5TRule_f(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
-  if (v) {
-    return __pyx_pw_4cdec_5_cdec_5TRule_1f_3__set__(o, v);
-  }
-  else {
-    PyErr_SetString(PyExc_NotImplementedError, "__del__");
-    return -1;
-  }
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_5TRule_e(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_5TRule_1e_1__get__(o);
-}
-
-static int __pyx_setprop_4cdec_5_cdec_5TRule_e(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
-  if (v) {
-    return __pyx_pw_4cdec_5_cdec_5TRule_1e_3__set__(o, v);
-  }
-  else {
-    PyErr_SetString(PyExc_NotImplementedError, "__del__");
-    return -1;
-  }
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_5TRule_a(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_5TRule_1a_1__get__(o);
-}
-
-static int __pyx_setprop_4cdec_5_cdec_5TRule_a(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
-  if (v) {
-    return __pyx_pw_4cdec_5_cdec_5TRule_1a_4__set__(o, v);
-  }
-  else {
-    PyErr_SetString(PyExc_NotImplementedError, "__del__");
-    return -1;
-  }
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_5TRule_scores(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_5TRule_6scores_1__get__(o);
-}
-
-static int __pyx_setprop_4cdec_5_cdec_5TRule_scores(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
-  if (v) {
-    return __pyx_pw_4cdec_5_cdec_5TRule_6scores_3__set__(o, v);
-  }
-  else {
-    PyErr_SetString(PyExc_NotImplementedError, "__del__");
-    return -1;
-  }
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_5TRule_lhs(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_5TRule_3lhs_1__get__(o);
-}
-
-static int __pyx_setprop_4cdec_5_cdec_5TRule_lhs(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
-  if (v) {
-    return __pyx_pw_4cdec_5_cdec_5TRule_3lhs_3__set__(o, v);
-  }
-  else {
-    PyErr_SetString(PyExc_NotImplementedError, "__del__");
-    return -1;
-  }
-}
-
-static PyMethodDef __pyx_methods_4cdec_5_cdec_TRule[] = {
-  {0, 0, 0, 0}
-};
-
-static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_TRule[] = {
-  {(char *)"arity", __pyx_getprop_4cdec_5_cdec_5TRule_arity, 0, 0, 0},
-  {(char *)"f", __pyx_getprop_4cdec_5_cdec_5TRule_f, __pyx_setprop_4cdec_5_cdec_5TRule_f, 0, 0},
-  {(char *)"e", __pyx_getprop_4cdec_5_cdec_5TRule_e, __pyx_setprop_4cdec_5_cdec_5TRule_e, 0, 0},
-  {(char *)"a", __pyx_getprop_4cdec_5_cdec_5TRule_a, __pyx_setprop_4cdec_5_cdec_5TRule_a, 0, 0},
-  {(char *)"scores", __pyx_getprop_4cdec_5_cdec_5TRule_scores, __pyx_setprop_4cdec_5_cdec_5TRule_scores, 0, 0},
-  {(char *)"lhs", __pyx_getprop_4cdec_5_cdec_5TRule_lhs, __pyx_setprop_4cdec_5_cdec_5TRule_lhs, 0, 0},
-  {0, 0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec_TRule = {
-  PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.TRule"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_TRule), /*tp_basicsize*/
-  0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_TRule, /*tp_dealloc*/
-  0, /*tp_print*/
-  0, /*tp_getattr*/
-  0, /*tp_setattr*/
-  #if PY_MAJOR_VERSION < 3
-  0, /*tp_compare*/
-  #else
-  0, /*reserved*/
-  #endif
-  0, /*tp_repr*/
-  0, /*tp_as_number*/
-  0, /*tp_as_sequence*/
-  0, /*tp_as_mapping*/
-  0, /*tp_hash*/
-  0, /*tp_call*/
-  __pyx_pw_4cdec_5_cdec_5TRule_5__str__, /*tp_str*/
-  0, /*tp_getattro*/
-  0, /*tp_setattro*/
-  0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
-  0, /*tp_doc*/
-  0, /*tp_traverse*/
-  0, /*tp_clear*/
-  0, /*tp_richcompare*/
-  0, /*tp_weaklistoffset*/
-  0, /*tp_iter*/
-  0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_TRule, /*tp_methods*/
-  0, /*tp_members*/
-  __pyx_getsets_4cdec_5_cdec_TRule, /*tp_getset*/
-  0, /*tp_base*/
-  0, /*tp_dict*/
-  0, /*tp_descr_get*/
-  0, /*tp_descr_set*/
-  0, /*tp_dictoffset*/
-  __pyx_pw_4cdec_5_cdec_5TRule_1__init__, /*tp_init*/
-  0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_TRule, /*tp_new*/
-  0, /*tp_free*/
-  0, /*tp_is_gc*/
-  0, /*tp_bases*/
-  0, /*tp_mro*/
-  0, /*tp_cache*/
-  0, /*tp_subclasses*/
-  0, /*tp_weaklist*/
-  0, /*tp_del*/
-  #if PY_VERSION_HEX >= 0x02060000
-  0, /*tp_version_tag*/
-  #endif
-};
-
-static PyObject *__pyx_tp_new_4cdec_5_cdec_MRule(PyTypeObject *t, PyObject *a, PyObject *k) {
-  PyObject *o = __pyx_tp_new_4cdec_5_cdec_TRule(t, a, k);
-  if (unlikely(!o)) return 0;
-  return o;
-}
-
-static PyMethodDef __pyx_methods_4cdec_5_cdec_MRule[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec_MRule = {
-  PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.MRule"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_MRule), /*tp_basicsize*/
-  0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_TRule, /*tp_dealloc*/
-  0, /*tp_print*/
-  0, /*tp_getattr*/
-  0, /*tp_setattr*/
-  #if PY_MAJOR_VERSION < 3
-  0, /*tp_compare*/
-  #else
-  0, /*reserved*/
-  #endif
-  0, /*tp_repr*/
-  0, /*tp_as_number*/
-  0, /*tp_as_sequence*/
-  0, /*tp_as_mapping*/
-  0, /*tp_hash*/
-  0, /*tp_call*/
-  #if CYTHON_COMPILING_IN_PYPY
-  __pyx_pw_4cdec_5_cdec_5TRule_5__str__, /*tp_str*/
-  #else
-  0, /*tp_str*/
-  #endif
-  0, /*tp_getattro*/
-  0, /*tp_setattro*/
-  0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
-  0, /*tp_doc*/
-  0, /*tp_traverse*/
-  0, /*tp_clear*/
-  0, /*tp_richcompare*/
-  0, /*tp_weaklistoffset*/
-  0, /*tp_iter*/
-  0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_MRule, /*tp_methods*/
-  0, /*tp_members*/
-  0, /*tp_getset*/
-  0, /*tp_base*/
-  0, /*tp_dict*/
-  0, /*tp_descr_get*/
-  0, /*tp_descr_set*/
-  0, /*tp_dictoffset*/
-  __pyx_pw_4cdec_5_cdec_5MRule_1__init__, /*tp_init*/
-  0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_MRule, /*tp_new*/
-  0, /*tp_free*/
-  0, /*tp_is_gc*/
-  0, /*tp_bases*/
-  0, /*tp_mro*/
-  0, /*tp_cache*/
-  0, /*tp_subclasses*/
-  0, /*tp_weaklist*/
-  0, /*tp_del*/
-  #if PY_VERSION_HEX >= 0x02060000
-  0, /*tp_version_tag*/
-  #endif
-};
-
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_22___iter__[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_22___iter__ = 0;
-
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_22___iter__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec_DenseVector(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_22___iter__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_22___iter__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_22___iter__];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__));
-    PyObject_INIT(o, t);
-    PyObject_GC_Track(o);
-  } else {
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
     o = (*t->tp_alloc)(t, 0);
-    if (unlikely(!o)) return 0;
-  }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *)o);
-  p->__pyx_v_self = 0;
-  return o;
-}
-
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_22___iter__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *)o;
-  PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->__pyx_v_self);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_22___iter__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_22___iter__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_22___iter__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *)o);
   } else {
-    (*Py_TYPE(o)->tp_free)(o);
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
   }
-}
-
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_22___iter__(PyObject *o, visitproc v, void *a) {
-  int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *)o;
-  if (p->__pyx_v_self) {
-    e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
-  }
-  return 0;
-}
-
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_22___iter__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *)o;
-  PyObject* tmp;
-  tmp = ((PyObject*)p->__pyx_v_self);
-  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_CandidateSet *)Py_None); Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  return 0;
-}
-
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_22___iter__[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_22___iter__ = {
-  PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_22___iter__"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__), /*tp_basicsize*/
-  0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_22___iter__, /*tp_dealloc*/
-  0, /*tp_print*/
-  0, /*tp_getattr*/
-  0, /*tp_setattr*/
-  #if PY_MAJOR_VERSION < 3
-  0, /*tp_compare*/
-  #else
-  0, /*reserved*/
-  #endif
-  0, /*tp_repr*/
-  0, /*tp_as_number*/
-  0, /*tp_as_sequence*/
-  0, /*tp_as_mapping*/
-  0, /*tp_hash*/
-  0, /*tp_call*/
-  0, /*tp_str*/
-  0, /*tp_getattro*/
-  0, /*tp_setattro*/
-  0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
-  0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_22___iter__, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_22___iter__, /*tp_clear*/
-  0, /*tp_richcompare*/
-  0, /*tp_weaklistoffset*/
-  0, /*tp_iter*/
-  0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_22___iter__, /*tp_methods*/
-  0, /*tp_members*/
-  0, /*tp_getset*/
-  0, /*tp_base*/
-  0, /*tp_dict*/
-  0, /*tp_descr_get*/
-  0, /*tp_descr_set*/
-  0, /*tp_dictoffset*/
-  0, /*tp_init*/
-  0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_22___iter__, /*tp_new*/
-  0, /*tp_free*/
-  0, /*tp_is_gc*/
-  0, /*tp_bases*/
-  0, /*tp_mro*/
-  0, /*tp_cache*/
-  0, /*tp_subclasses*/
-  0, /*tp_weaklist*/
-  0, /*tp_del*/
-  #if PY_VERSION_HEX >= 0x02060000
-  0, /*tp_version_tag*/
-  #endif
-};
-
-static PyObject *__pyx_tp_new_4cdec_5_cdec_DenseVector(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
   if (unlikely(!o)) return 0;
   return o;
 }
 
 static void __pyx_tp_dealloc_4cdec_5_cdec_DenseVector(PyObject *o) {
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
+  }
+  #endif
   {
     PyObject *etype, *eval, *etb;
     PyErr_Fetch(&etype, &eval, &etb);
     ++Py_REFCNT(o);
     __pyx_pw_4cdec_5_cdec_11DenseVector_3__dealloc__(o);
-    if (PyErr_Occurred()) PyErr_WriteUnraisable(o);
     --Py_REFCNT(o);
     PyErr_Restore(etype, eval, etb);
   }
@@ -20501,7 +21857,7 @@ static int __pyx_mp_ass_subscript_4cdec_5_cdec_DenseVector(PyObject *o, PyObject
   }
   else {
     PyErr_Format(PyExc_NotImplementedError,
-      "Subscript deletion not supported by %s", Py_TYPE(o)->tp_name);
+      "Subscript deletion not supported by %.200s", Py_TYPE(o)->tp_name);
     return -1;
   }
 }
@@ -20585,28 +21941,39 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_DenseVector = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_SufficientStats(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+static PyObject *__pyx_tp_new_4cdec_5_cdec_SparseVector(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
+    o = (*t->tp_alloc)(t, 0);
+  } else {
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
+  }
   if (unlikely(!o)) return 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec_SufficientStats(PyObject *o) {
+static void __pyx_tp_dealloc_4cdec_5_cdec_SparseVector(PyObject *o) {
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
+  }
+  #endif
   {
     PyObject *etype, *eval, *etb;
     PyErr_Fetch(&etype, &eval, &etb);
     ++Py_REFCNT(o);
-    __pyx_pw_4cdec_5_cdec_15SufficientStats_1__dealloc__(o);
-    if (PyErr_Occurred()) PyErr_WriteUnraisable(o);
+    __pyx_pw_4cdec_5_cdec_12SparseVector_3__dealloc__(o);
     --Py_REFCNT(o);
     PyErr_Restore(etype, eval, etb);
   }
   (*Py_TYPE(o)->tp_free)(o);
 }
-static PyObject *__pyx_sq_item_4cdec_5_cdec_SufficientStats(PyObject *o, Py_ssize_t i) {
+static PyObject *__pyx_sq_item_4cdec_5_cdec_SparseVector(PyObject *o, Py_ssize_t i) {
   PyObject *r;
   PyObject *x = PyInt_FromSsize_t(i); if(!x) return 0;
   r = Py_TYPE(o)->tp_as_mapping->mp_subscript(o, x);
@@ -20614,35 +21981,34 @@ static PyObject *__pyx_sq_item_4cdec_5_cdec_SufficientStats(PyObject *o, Py_ssiz
   return r;
 }
 
-static PyObject *__pyx_getprop_4cdec_5_cdec_15SufficientStats_score(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_15SufficientStats_5score_1__get__(o);
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_15SufficientStats_detail(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_15SufficientStats_6detail_1__get__(o);
+static int __pyx_mp_ass_subscript_4cdec_5_cdec_SparseVector(PyObject *o, PyObject *i, PyObject *v) {
+  if (v) {
+    return __pyx_pw_4cdec_5_cdec_12SparseVector_9__setitem__(o, i, v);
+  }
+  else {
+    PyErr_Format(PyExc_NotImplementedError,
+      "Subscript deletion not supported by %.200s", Py_TYPE(o)->tp_name);
+    return -1;
+  }
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec_SufficientStats[] = {
+static PyMethodDef __pyx_methods_4cdec_5_cdec_SparseVector[] = {
+  {__Pyx_NAMESTR("copy"), (PyCFunction)__pyx_pw_4cdec_5_cdec_12SparseVector_5copy, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_12SparseVector_4copy)},
+  {__Pyx_NAMESTR("dot"), (PyCFunction)__pyx_pw_4cdec_5_cdec_12SparseVector_14dot, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_12SparseVector_13dot)},
   {0, 0, 0, 0}
 };
 
-static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_SufficientStats[] = {
-  {(char *)"score", __pyx_getprop_4cdec_5_cdec_15SufficientStats_score, 0, 0, 0},
-  {(char *)"detail", __pyx_getprop_4cdec_5_cdec_15SufficientStats_detail, 0, 0, 0},
-  {0, 0, 0, 0, 0}
-};
-
-static PyNumberMethods __pyx_tp_as_number_SufficientStats = {
-  __pyx_pw_4cdec_5_cdec_15SufficientStats_12__add__, /*nb_add*/
-  0, /*nb_subtract*/
-  0, /*nb_multiply*/
+static PyNumberMethods __pyx_tp_as_number_SparseVector = {
+  __pyx_pw_4cdec_5_cdec_12SparseVector_32__add__, /*nb_add*/
+  __pyx_pw_4cdec_5_cdec_12SparseVector_34__sub__, /*nb_subtract*/
+  __pyx_pw_4cdec_5_cdec_12SparseVector_36__mul__, /*nb_multiply*/
   #if PY_MAJOR_VERSION < 3
-  0, /*nb_divide*/
+  __pyx_pw_4cdec_5_cdec_12SparseVector_38__div__, /*nb_divide*/
   #endif
   0, /*nb_remainder*/
   0, /*nb_divmod*/
   0, /*nb_power*/
-  0, /*nb_negative*/
+  __pyx_pw_4cdec_5_cdec_12SparseVector_22__neg__, /*nb_negative*/
   0, /*nb_positive*/
   0, /*nb_absolute*/
   0, /*nb_nonzero*/
@@ -20668,11 +22034,11 @@ static PyNumberMethods __pyx_tp_as_number_SufficientStats = {
   #if PY_MAJOR_VERSION < 3
   0, /*nb_hex*/
   #endif
-  __pyx_pw_4cdec_5_cdec_15SufficientStats_10__iadd__, /*nb_inplace_add*/
-  0, /*nb_inplace_subtract*/
-  0, /*nb_inplace_multiply*/
+  __pyx_pw_4cdec_5_cdec_12SparseVector_24__iadd__, /*nb_inplace_add*/
+  __pyx_pw_4cdec_5_cdec_12SparseVector_26__isub__, /*nb_inplace_subtract*/
+  __pyx_pw_4cdec_5_cdec_12SparseVector_28__imul__, /*nb_inplace_multiply*/
   #if PY_MAJOR_VERSION < 3
-  0, /*nb_inplace_divide*/
+  __pyx_pw_4cdec_5_cdec_12SparseVector_30__idiv__, /*nb_inplace_divide*/
   #endif
   0, /*nb_inplace_remainder*/
   0, /*nb_inplace_power*/
@@ -20690,31 +22056,31 @@ static PyNumberMethods __pyx_tp_as_number_SufficientStats = {
   #endif
 };
 
-static PySequenceMethods __pyx_tp_as_sequence_SufficientStats = {
-  __pyx_pw_4cdec_5_cdec_15SufficientStats_3__len__, /*sq_length*/
+static PySequenceMethods __pyx_tp_as_sequence_SparseVector = {
+  __pyx_pw_4cdec_5_cdec_12SparseVector_18__len__, /*sq_length*/
   0, /*sq_concat*/
   0, /*sq_repeat*/
-  __pyx_sq_item_4cdec_5_cdec_SufficientStats, /*sq_item*/
+  __pyx_sq_item_4cdec_5_cdec_SparseVector, /*sq_item*/
   0, /*sq_slice*/
   0, /*sq_ass_item*/
   0, /*sq_ass_slice*/
-  0, /*sq_contains*/
+  __pyx_pw_4cdec_5_cdec_12SparseVector_20__contains__, /*sq_contains*/
   0, /*sq_inplace_concat*/
   0, /*sq_inplace_repeat*/
 };
 
-static PyMappingMethods __pyx_tp_as_mapping_SufficientStats = {
-  __pyx_pw_4cdec_5_cdec_15SufficientStats_3__len__, /*mp_length*/
-  __pyx_pw_4cdec_5_cdec_15SufficientStats_8__getitem__, /*mp_subscript*/
-  0, /*mp_ass_subscript*/
+static PyMappingMethods __pyx_tp_as_mapping_SparseVector = {
+  __pyx_pw_4cdec_5_cdec_12SparseVector_18__len__, /*mp_length*/
+  __pyx_pw_4cdec_5_cdec_12SparseVector_7__getitem__, /*mp_subscript*/
+  __pyx_mp_ass_subscript_4cdec_5_cdec_SparseVector, /*mp_ass_subscript*/
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec_SufficientStats = {
+static PyTypeObject __pyx_type_4cdec_5_cdec_SparseVector = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.SufficientStats"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_SufficientStats), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.SparseVector"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_SparseVector), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_SufficientStats, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_SparseVector, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -20724,9 +22090,9 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_SufficientStats = {
   0, /*reserved*/
   #endif
   0, /*tp_repr*/
-  &__pyx_tp_as_number_SufficientStats, /*tp_as_number*/
-  &__pyx_tp_as_sequence_SufficientStats, /*tp_as_sequence*/
-  &__pyx_tp_as_mapping_SufficientStats, /*tp_as_mapping*/
+  &__pyx_tp_as_number_SparseVector, /*tp_as_number*/
+  &__pyx_tp_as_sequence_SparseVector, /*tp_as_sequence*/
+  &__pyx_tp_as_mapping_SparseVector, /*tp_as_mapping*/
   0, /*tp_hash*/
   0, /*tp_call*/
   0, /*tp_str*/
@@ -20737,21 +22103,21 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_SufficientStats = {
   0, /*tp_doc*/
   0, /*tp_traverse*/
   0, /*tp_clear*/
-  0, /*tp_richcompare*/
+  __pyx_pw_4cdec_5_cdec_12SparseVector_16__richcmp__, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
-  __pyx_pw_4cdec_5_cdec_15SufficientStats_5__iter__, /*tp_iter*/
+  __pyx_pw_4cdec_5_cdec_12SparseVector_11__iter__, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_SufficientStats, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_SparseVector, /*tp_methods*/
   0, /*tp_members*/
-  __pyx_getsets_4cdec_5_cdec_SufficientStats, /*tp_getset*/
+  0, /*tp_getset*/
   0, /*tp_base*/
   0, /*tp_dict*/
   0, /*tp_descr_get*/
   0, /*tp_descr_set*/
   0, /*tp_dictoffset*/
-  0, /*tp_init*/
+  __pyx_pw_4cdec_5_cdec_12SparseVector_1__init__, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_SufficientStats, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_SparseVector, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -20763,183 +22129,79 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_SufficientStats = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_21___iter__[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_21___iter__ = 0;
-
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_21___iter__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec_NT(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+  struct __pyx_obj_4cdec_5_cdec_NT *p;
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_21___iter__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_21___iter__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_21___iter__];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__));
-    PyObject_INIT(o, t);
-    PyObject_GC_Track(o);
-  } else {
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
     o = (*t->tp_alloc)(t, 0);
-    if (unlikely(!o)) return 0;
-  }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *)o);
-  p->__pyx_v_i = 0;
-  p->__pyx_v_self = 0;
-  p->__pyx_t_1 = 0;
-  return o;
-}
-
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_21___iter__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *)o;
-  PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->__pyx_v_i);
-  Py_CLEAR(p->__pyx_v_self);
-  Py_CLEAR(p->__pyx_t_1);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_21___iter__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_21___iter__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_21___iter__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *)o);
   } else {
-    (*Py_TYPE(o)->tp_free)(o);
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
   }
+  if (unlikely(!o)) return 0;
+  p = ((struct __pyx_obj_4cdec_5_cdec_NT *)o);
+  p->cat = ((PyObject*)Py_None); Py_INCREF(Py_None);
+  return o;
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_21___iter__(PyObject *o, visitproc v, void *a) {
-  int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *)o;
-  if (p->__pyx_v_i) {
-    e = (*v)(p->__pyx_v_i, a); if (e) return e;
-  }
-  if (p->__pyx_v_self) {
-    e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
-  }
-  if (p->__pyx_t_1) {
-    e = (*v)(p->__pyx_t_1, a); if (e) return e;
+static void __pyx_tp_dealloc_4cdec_5_cdec_NT(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec_NT *p = (struct __pyx_obj_4cdec_5_cdec_NT *)o;
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
   }
-  return 0;
+  #endif
+  Py_CLEAR(p->cat);
+  (*Py_TYPE(o)->tp_free)(o);
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_21___iter__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *)o;
-  PyObject* tmp;
-  tmp = ((PyObject*)p->__pyx_v_i);
-  p->__pyx_v_i = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_self);
-  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)Py_None); Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_t_1);
-  p->__pyx_t_1 = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  return 0;
+static PyObject *__pyx_getprop_4cdec_5_cdec_2NT_cat(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_2NT_3cat_1__get__(o);
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_21___iter__[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_21___iter__ = {
-  PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_21___iter__"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__), /*tp_basicsize*/
-  0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_21___iter__, /*tp_dealloc*/
-  0, /*tp_print*/
-  0, /*tp_getattr*/
-  0, /*tp_setattr*/
-  #if PY_MAJOR_VERSION < 3
-  0, /*tp_compare*/
-  #else
-  0, /*reserved*/
-  #endif
-  0, /*tp_repr*/
-  0, /*tp_as_number*/
-  0, /*tp_as_sequence*/
-  0, /*tp_as_mapping*/
-  0, /*tp_hash*/
-  0, /*tp_call*/
-  0, /*tp_str*/
-  0, /*tp_getattro*/
-  0, /*tp_setattro*/
-  0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
-  0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_21___iter__, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_21___iter__, /*tp_clear*/
-  0, /*tp_richcompare*/
-  0, /*tp_weaklistoffset*/
-  0, /*tp_iter*/
-  0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_21___iter__, /*tp_methods*/
-  0, /*tp_members*/
-  0, /*tp_getset*/
-  0, /*tp_base*/
-  0, /*tp_dict*/
-  0, /*tp_descr_get*/
-  0, /*tp_descr_set*/
-  0, /*tp_dictoffset*/
-  0, /*tp_init*/
-  0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_21___iter__, /*tp_new*/
-  0, /*tp_free*/
-  0, /*tp_is_gc*/
-  0, /*tp_bases*/
-  0, /*tp_mro*/
-  0, /*tp_cache*/
-  0, /*tp_subclasses*/
-  0, /*tp_weaklist*/
-  0, /*tp_del*/
-  #if PY_VERSION_HEX >= 0x02060000
-  0, /*tp_version_tag*/
-  #endif
-};
-
-static PyObject *__pyx_tp_new_4cdec_5_cdec_Metric(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec_Metric *p;
-  PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
-  if (unlikely(!o)) return 0;
-  p = ((struct __pyx_obj_4cdec_5_cdec_Metric *)o);
-  p->scorer = ((struct __pyx_obj_4cdec_5_cdec_Scorer *)Py_None); Py_INCREF(Py_None);
-  if (unlikely(__pyx_pw_4cdec_5_cdec_6Metric_1__cinit__(o, __pyx_empty_tuple, NULL) < 0)) {
-    Py_DECREF(o); o = 0;
+static int __pyx_setprop_4cdec_5_cdec_2NT_cat(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
+  if (v) {
+    return __pyx_pw_4cdec_5_cdec_2NT_3cat_3__set__(o, v);
+  }
+  else {
+    return __pyx_pw_4cdec_5_cdec_2NT_3cat_5__del__(o);
   }
-  return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec_Metric(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec_Metric *p = (struct __pyx_obj_4cdec_5_cdec_Metric *)o;
-  PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->scorer);
-  (*Py_TYPE(o)->tp_free)(o);
+static PyObject *__pyx_getprop_4cdec_5_cdec_2NT_ref(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_2NT_3ref_1__get__(o);
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec_Metric(PyObject *o, visitproc v, void *a) {
-  int e;
-  struct __pyx_obj_4cdec_5_cdec_Metric *p = (struct __pyx_obj_4cdec_5_cdec_Metric *)o;
-  if (p->scorer) {
-    e = (*v)(((PyObject*)p->scorer), a); if (e) return e;
+static int __pyx_setprop_4cdec_5_cdec_2NT_ref(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
+  if (v) {
+    return __pyx_pw_4cdec_5_cdec_2NT_3ref_3__set__(o, v);
+  }
+  else {
+    PyErr_SetString(PyExc_NotImplementedError, "__del__");
+    return -1;
   }
-  return 0;
-}
-
-static int __pyx_tp_clear_4cdec_5_cdec_Metric(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec_Metric *p = (struct __pyx_obj_4cdec_5_cdec_Metric *)o;
-  PyObject* tmp;
-  tmp = ((PyObject*)p->scorer);
-  p->scorer = ((struct __pyx_obj_4cdec_5_cdec_Scorer *)Py_None); Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec_Metric[] = {
-  {__Pyx_NAMESTR("score"), (PyCFunction)__pyx_pw_4cdec_5_cdec_6Metric_5score, METH_NOARGS, __Pyx_DOCSTR(0)},
-  {__Pyx_NAMESTR("evaluate"), (PyCFunction)__pyx_pw_4cdec_5_cdec_6Metric_7evaluate, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
+static PyMethodDef __pyx_methods_4cdec_5_cdec_NT[] = {
   {0, 0, 0, 0}
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec_Metric = {
+static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_NT[] = {
+  {(char *)"cat", __pyx_getprop_4cdec_5_cdec_2NT_cat, __pyx_setprop_4cdec_5_cdec_2NT_cat, 0, 0},
+  {(char *)"ref", __pyx_getprop_4cdec_5_cdec_2NT_ref, __pyx_setprop_4cdec_5_cdec_2NT_ref, 0, 0},
+  {0, 0, 0, 0, 0}
+};
+
+static PyTypeObject __pyx_type_4cdec_5_cdec_NT = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.Metric"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_Metric), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.NT"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_NT), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_Metric, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_NT, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -20953,30 +22215,30 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Metric = {
   0, /*tp_as_sequence*/
   0, /*tp_as_mapping*/
   0, /*tp_hash*/
-  __pyx_pw_4cdec_5_cdec_6Metric_3__call__, /*tp_call*/
-  0, /*tp_str*/
+  0, /*tp_call*/
+  __pyx_pw_4cdec_5_cdec_2NT_3__str__, /*tp_str*/
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec_Metric, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec_Metric, /*tp_clear*/
+  0, /*tp_traverse*/
+  0, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_Metric, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_NT, /*tp_methods*/
   0, /*tp_members*/
-  0, /*tp_getset*/
+  __pyx_getsets_4cdec_5_cdec_NT, /*tp_getset*/
   0, /*tp_base*/
   0, /*tp_dict*/
   0, /*tp_descr_get*/
   0, /*tp_descr_set*/
   0, /*tp_dictoffset*/
-  0, /*tp_init*/
+  __pyx_pw_4cdec_5_cdec_2NT_1__init__, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_Metric, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_NT, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -20988,34 +22250,38 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Metric = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_Candidate(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+static PyObject *__pyx_tp_new_4cdec_5_cdec_NTRef(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
+    o = (*t->tp_alloc)(t, 0);
+  } else {
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
+  }
   if (unlikely(!o)) return 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec_Candidate(PyObject *o) {
+static void __pyx_tp_dealloc_4cdec_5_cdec_NTRef(PyObject *o) {
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
+  }
+  #endif
   (*Py_TYPE(o)->tp_free)(o);
 }
 
-static PyObject *__pyx_getprop_4cdec_5_cdec_9Candidate_words(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_9Candidate_5words_1__get__(o);
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_9Candidate_fmap(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_9Candidate_4fmap_1__get__(o);
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_9Candidate_score(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_9Candidate_5score_1__get__(o);
+static PyObject *__pyx_getprop_4cdec_5_cdec_5NTRef_ref(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_5NTRef_3ref_1__get__(o);
 }
 
-static int __pyx_setprop_4cdec_5_cdec_9Candidate_score(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
+static int __pyx_setprop_4cdec_5_cdec_5NTRef_ref(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
   if (v) {
-    return __pyx_pw_4cdec_5_cdec_9Candidate_5score_3__set__(o, v);
+    return __pyx_pw_4cdec_5_cdec_5NTRef_3ref_3__set__(o, v);
   }
   else {
     PyErr_SetString(PyExc_NotImplementedError, "__del__");
@@ -21023,23 +22289,21 @@ static int __pyx_setprop_4cdec_5_cdec_9Candidate_score(PyObject *o, PyObject *v,
   }
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec_Candidate[] = {
+static PyMethodDef __pyx_methods_4cdec_5_cdec_NTRef[] = {
   {0, 0, 0, 0}
 };
 
-static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_Candidate[] = {
-  {(char *)"words", __pyx_getprop_4cdec_5_cdec_9Candidate_words, 0, 0, 0},
-  {(char *)"fmap", __pyx_getprop_4cdec_5_cdec_9Candidate_fmap, 0, 0, 0},
-  {(char *)"score", __pyx_getprop_4cdec_5_cdec_9Candidate_score, __pyx_setprop_4cdec_5_cdec_9Candidate_score, 0, 0},
+static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_NTRef[] = {
+  {(char *)"ref", __pyx_getprop_4cdec_5_cdec_5NTRef_ref, __pyx_setprop_4cdec_5_cdec_5NTRef_ref, 0, 0},
   {0, 0, 0, 0, 0}
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec_Candidate = {
+static PyTypeObject __pyx_type_4cdec_5_cdec_NTRef = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.Candidate"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_Candidate), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.NTRef"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_NTRef), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_Candidate, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_NTRef, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -21054,7 +22318,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Candidate = {
   0, /*tp_as_mapping*/
   0, /*tp_hash*/
   0, /*tp_call*/
-  0, /*tp_str*/
+  __pyx_pw_4cdec_5_cdec_5NTRef_3__str__, /*tp_str*/
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
@@ -21066,17 +22330,17 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Candidate = {
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_Candidate, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_NTRef, /*tp_methods*/
   0, /*tp_members*/
-  __pyx_getsets_4cdec_5_cdec_Candidate, /*tp_getset*/
+  __pyx_getsets_4cdec_5_cdec_NTRef, /*tp_getset*/
   0, /*tp_base*/
   0, /*tp_dict*/
   0, /*tp_descr_get*/
   0, /*tp_descr_set*/
   0, /*tp_dictoffset*/
-  0, /*tp_init*/
+  __pyx_pw_4cdec_5_cdec_5NTRef_1__init__, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_Candidate, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_NTRef, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -21088,135 +22352,133 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Candidate = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_SparseVector(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+static PyObject *__pyx_tp_new_4cdec_5_cdec_TRule(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
+    o = (*t->tp_alloc)(t, 0);
+  } else {
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
+  }
   if (unlikely(!o)) return 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec_SparseVector(PyObject *o) {
+static void __pyx_tp_dealloc_4cdec_5_cdec_TRule(PyObject *o) {
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
+  }
+  #endif
   {
     PyObject *etype, *eval, *etb;
     PyErr_Fetch(&etype, &eval, &etb);
     ++Py_REFCNT(o);
-    __pyx_pw_4cdec_5_cdec_12SparseVector_3__dealloc__(o);
-    if (PyErr_Occurred()) PyErr_WriteUnraisable(o);
+    __pyx_pw_4cdec_5_cdec_5TRule_3__dealloc__(o);
     --Py_REFCNT(o);
     PyErr_Restore(etype, eval, etb);
   }
   (*Py_TYPE(o)->tp_free)(o);
 }
-static PyObject *__pyx_sq_item_4cdec_5_cdec_SparseVector(PyObject *o, Py_ssize_t i) {
-  PyObject *r;
-  PyObject *x = PyInt_FromSsize_t(i); if(!x) return 0;
-  r = Py_TYPE(o)->tp_as_mapping->mp_subscript(o, x);
-  Py_DECREF(x);
-  return r;
+
+static PyObject *__pyx_getprop_4cdec_5_cdec_5TRule_arity(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_5TRule_5arity_1__get__(o);
 }
 
-static int __pyx_mp_ass_subscript_4cdec_5_cdec_SparseVector(PyObject *o, PyObject *i, PyObject *v) {
+static PyObject *__pyx_getprop_4cdec_5_cdec_5TRule_f(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_5TRule_1f_1__get__(o);
+}
+
+static int __pyx_setprop_4cdec_5_cdec_5TRule_f(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
   if (v) {
-    return __pyx_pw_4cdec_5_cdec_12SparseVector_9__setitem__(o, i, v);
+    return __pyx_pw_4cdec_5_cdec_5TRule_1f_3__set__(o, v);
   }
   else {
-    PyErr_Format(PyExc_NotImplementedError,
-      "Subscript deletion not supported by %s", Py_TYPE(o)->tp_name);
+    PyErr_SetString(PyExc_NotImplementedError, "__del__");
     return -1;
   }
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec_SparseVector[] = {
-  {__Pyx_NAMESTR("copy"), (PyCFunction)__pyx_pw_4cdec_5_cdec_12SparseVector_5copy, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_12SparseVector_4copy)},
-  {__Pyx_NAMESTR("dot"), (PyCFunction)__pyx_pw_4cdec_5_cdec_12SparseVector_14dot, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_12SparseVector_13dot)},
-  {0, 0, 0, 0}
-};
+static PyObject *__pyx_getprop_4cdec_5_cdec_5TRule_e(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_5TRule_1e_1__get__(o);
+}
 
-static PyNumberMethods __pyx_tp_as_number_SparseVector = {
-  __pyx_pw_4cdec_5_cdec_12SparseVector_32__add__, /*nb_add*/
-  __pyx_pw_4cdec_5_cdec_12SparseVector_34__sub__, /*nb_subtract*/
-  __pyx_pw_4cdec_5_cdec_12SparseVector_36__mul__, /*nb_multiply*/
-  #if PY_MAJOR_VERSION < 3
-  __pyx_pw_4cdec_5_cdec_12SparseVector_38__div__, /*nb_divide*/
-  #endif
-  0, /*nb_remainder*/
-  0, /*nb_divmod*/
-  0, /*nb_power*/
-  __pyx_pw_4cdec_5_cdec_12SparseVector_22__neg__, /*nb_negative*/
-  0, /*nb_positive*/
-  0, /*nb_absolute*/
-  0, /*nb_nonzero*/
-  0, /*nb_invert*/
-  0, /*nb_lshift*/
-  0, /*nb_rshift*/
-  0, /*nb_and*/
-  0, /*nb_xor*/
-  0, /*nb_or*/
-  #if PY_MAJOR_VERSION < 3
-  0, /*nb_coerce*/
-  #endif
-  0, /*nb_int*/
-  #if PY_MAJOR_VERSION < 3
-  0, /*nb_long*/
-  #else
-  0, /*reserved*/
-  #endif
-  0, /*nb_float*/
-  #if PY_MAJOR_VERSION < 3
-  0, /*nb_oct*/
-  #endif
-  #if PY_MAJOR_VERSION < 3
-  0, /*nb_hex*/
-  #endif
-  __pyx_pw_4cdec_5_cdec_12SparseVector_24__iadd__, /*nb_inplace_add*/
-  __pyx_pw_4cdec_5_cdec_12SparseVector_26__isub__, /*nb_inplace_subtract*/
-  __pyx_pw_4cdec_5_cdec_12SparseVector_28__imul__, /*nb_inplace_multiply*/
-  #if PY_MAJOR_VERSION < 3
-  __pyx_pw_4cdec_5_cdec_12SparseVector_30__idiv__, /*nb_inplace_divide*/
-  #endif
-  0, /*nb_inplace_remainder*/
-  0, /*nb_inplace_power*/
-  0, /*nb_inplace_lshift*/
-  0, /*nb_inplace_rshift*/
-  0, /*nb_inplace_and*/
-  0, /*nb_inplace_xor*/
-  0, /*nb_inplace_or*/
-  0, /*nb_floor_divide*/
-  0, /*nb_true_divide*/
-  0, /*nb_inplace_floor_divide*/
-  0, /*nb_inplace_true_divide*/
-  #if PY_VERSION_HEX >= 0x02050000
-  0, /*nb_index*/
-  #endif
-};
+static int __pyx_setprop_4cdec_5_cdec_5TRule_e(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
+  if (v) {
+    return __pyx_pw_4cdec_5_cdec_5TRule_1e_3__set__(o, v);
+  }
+  else {
+    PyErr_SetString(PyExc_NotImplementedError, "__del__");
+    return -1;
+  }
+}
 
-static PySequenceMethods __pyx_tp_as_sequence_SparseVector = {
-  __pyx_pw_4cdec_5_cdec_12SparseVector_18__len__, /*sq_length*/
-  0, /*sq_concat*/
-  0, /*sq_repeat*/
-  __pyx_sq_item_4cdec_5_cdec_SparseVector, /*sq_item*/
-  0, /*sq_slice*/
-  0, /*sq_ass_item*/
-  0, /*sq_ass_slice*/
-  __pyx_pw_4cdec_5_cdec_12SparseVector_20__contains__, /*sq_contains*/
-  0, /*sq_inplace_concat*/
-  0, /*sq_inplace_repeat*/
+static PyObject *__pyx_getprop_4cdec_5_cdec_5TRule_a(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_5TRule_1a_1__get__(o);
+}
+
+static int __pyx_setprop_4cdec_5_cdec_5TRule_a(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
+  if (v) {
+    return __pyx_pw_4cdec_5_cdec_5TRule_1a_4__set__(o, v);
+  }
+  else {
+    PyErr_SetString(PyExc_NotImplementedError, "__del__");
+    return -1;
+  }
+}
+
+static PyObject *__pyx_getprop_4cdec_5_cdec_5TRule_scores(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_5TRule_6scores_1__get__(o);
+}
+
+static int __pyx_setprop_4cdec_5_cdec_5TRule_scores(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
+  if (v) {
+    return __pyx_pw_4cdec_5_cdec_5TRule_6scores_3__set__(o, v);
+  }
+  else {
+    PyErr_SetString(PyExc_NotImplementedError, "__del__");
+    return -1;
+  }
+}
+
+static PyObject *__pyx_getprop_4cdec_5_cdec_5TRule_lhs(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_5TRule_3lhs_1__get__(o);
+}
+
+static int __pyx_setprop_4cdec_5_cdec_5TRule_lhs(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
+  if (v) {
+    return __pyx_pw_4cdec_5_cdec_5TRule_3lhs_3__set__(o, v);
+  }
+  else {
+    PyErr_SetString(PyExc_NotImplementedError, "__del__");
+    return -1;
+  }
+}
+
+static PyMethodDef __pyx_methods_4cdec_5_cdec_TRule[] = {
+  {0, 0, 0, 0}
 };
 
-static PyMappingMethods __pyx_tp_as_mapping_SparseVector = {
-  __pyx_pw_4cdec_5_cdec_12SparseVector_18__len__, /*mp_length*/
-  __pyx_pw_4cdec_5_cdec_12SparseVector_7__getitem__, /*mp_subscript*/
-  __pyx_mp_ass_subscript_4cdec_5_cdec_SparseVector, /*mp_ass_subscript*/
+static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_TRule[] = {
+  {(char *)"arity", __pyx_getprop_4cdec_5_cdec_5TRule_arity, 0, 0, 0},
+  {(char *)"f", __pyx_getprop_4cdec_5_cdec_5TRule_f, __pyx_setprop_4cdec_5_cdec_5TRule_f, 0, 0},
+  {(char *)"e", __pyx_getprop_4cdec_5_cdec_5TRule_e, __pyx_setprop_4cdec_5_cdec_5TRule_e, 0, 0},
+  {(char *)"a", __pyx_getprop_4cdec_5_cdec_5TRule_a, __pyx_setprop_4cdec_5_cdec_5TRule_a, 0, 0},
+  {(char *)"scores", __pyx_getprop_4cdec_5_cdec_5TRule_scores, __pyx_setprop_4cdec_5_cdec_5TRule_scores, 0, 0},
+  {(char *)"lhs", __pyx_getprop_4cdec_5_cdec_5TRule_lhs, __pyx_setprop_4cdec_5_cdec_5TRule_lhs, 0, 0},
+  {0, 0, 0, 0, 0}
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec_SparseVector = {
+static PyTypeObject __pyx_type_4cdec_5_cdec_TRule = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.SparseVector"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_SparseVector), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.TRule"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_TRule), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_SparseVector, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_TRule, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -21226,12 +22488,12 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_SparseVector = {
   0, /*reserved*/
   #endif
   0, /*tp_repr*/
-  &__pyx_tp_as_number_SparseVector, /*tp_as_number*/
-  &__pyx_tp_as_sequence_SparseVector, /*tp_as_sequence*/
-  &__pyx_tp_as_mapping_SparseVector, /*tp_as_mapping*/
+  0, /*tp_as_number*/
+  0, /*tp_as_sequence*/
+  0, /*tp_as_mapping*/
   0, /*tp_hash*/
   0, /*tp_call*/
-  0, /*tp_str*/
+  __pyx_pw_4cdec_5_cdec_5TRule_5__str__, /*tp_str*/
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
@@ -21239,21 +22501,21 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_SparseVector = {
   0, /*tp_doc*/
   0, /*tp_traverse*/
   0, /*tp_clear*/
-  __pyx_pw_4cdec_5_cdec_12SparseVector_16__richcmp__, /*tp_richcompare*/
+  0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
-  __pyx_pw_4cdec_5_cdec_12SparseVector_11__iter__, /*tp_iter*/
+  0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_SparseVector, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_TRule, /*tp_methods*/
   0, /*tp_members*/
-  0, /*tp_getset*/
+  __pyx_getsets_4cdec_5_cdec_TRule, /*tp_getset*/
   0, /*tp_base*/
   0, /*tp_dict*/
   0, /*tp_descr_get*/
   0, /*tp_descr_set*/
   0, /*tp_dictoffset*/
-  __pyx_pw_4cdec_5_cdec_12SparseVector_1__init__, /*tp_init*/
+  __pyx_pw_4cdec_5_cdec_5TRule_1__init__, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_SparseVector, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_TRule, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -21265,67 +22527,27 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_SparseVector = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_15___get__[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_15___get__ = 0;
-
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_15___get__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *p;
-  PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_15___get__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_15___get__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_15___get__];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__));
-    PyObject_INIT(o, t);
-    PyObject_GC_Track(o);
-  } else {
-    o = (*t->tp_alloc)(t, 0);
-    if (unlikely(!o)) return 0;
-  }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *)o);
-  p->__pyx_v_self = 0;
+static PyObject *__pyx_tp_new_4cdec_5_cdec_MRule(PyTypeObject *t, PyObject *a, PyObject *k) {
+  PyObject *o = __pyx_tp_new_4cdec_5_cdec_TRule(t, a, k);
+  if (unlikely(!o)) return 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_15___get__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *)o;
-  PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->__pyx_v_self);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_15___get__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_15___get__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_15___get__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *)o);
-  } else {
-    (*Py_TYPE(o)->tp_free)(o);
-  }
-}
-
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_15___get__(PyObject *o, visitproc v, void *a) {
-  int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *)o;
-  if (p->__pyx_v_self) {
-    e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
-  }
-  return 0;
-}
-
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_15___get__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *)o;
-  PyObject* tmp;
-  tmp = ((PyObject*)p->__pyx_v_self);
-  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)Py_None); Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  return 0;
-}
-
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_15___get__[] = {
+static PyMethodDef __pyx_methods_4cdec_5_cdec_MRule[] = {
   {0, 0, 0, 0}
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_15___get__ = {
+static PyTypeObject __pyx_type_4cdec_5_cdec_MRule = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_15___get__"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.MRule"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_MRule), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_15___get__, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_TRule, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -21340,19 +22562,23 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_15___get__ = {
   0, /*tp_as_mapping*/
   0, /*tp_hash*/
   0, /*tp_call*/
+  #if CYTHON_COMPILING_IN_PYPY
+  __pyx_pw_4cdec_5_cdec_5TRule_5__str__, /*tp_str*/
+  #else
   0, /*tp_str*/
+  #endif
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_15___get__, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_15___get__, /*tp_clear*/
+  0, /*tp_traverse*/
+  0, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_15___get__, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_MRule, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -21360,9 +22586,9 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_15___get__ = {
   0, /*tp_descr_get*/
   0, /*tp_descr_set*/
   0, /*tp_dictoffset*/
-  0, /*tp_init*/
+  __pyx_pw_4cdec_5_cdec_5MRule_1__init__, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_15___get__, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_MRule, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -21374,63 +22600,46 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_15___get__ = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_NT(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec_NT *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec_Grammar(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
+    o = (*t->tp_alloc)(t, 0);
+  } else {
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
+  }
   if (unlikely(!o)) return 0;
-  p = ((struct __pyx_obj_4cdec_5_cdec_NT *)o);
-  p->cat = ((PyObject*)Py_None); Py_INCREF(Py_None);
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec_NT(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec_NT *p = (struct __pyx_obj_4cdec_5_cdec_NT *)o;
-  PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->cat);
-  (*Py_TYPE(o)->tp_free)(o);
-}
-
-static int __pyx_tp_traverse_4cdec_5_cdec_NT(PyObject *o, visitproc v, void *a) {
-  int e;
-  struct __pyx_obj_4cdec_5_cdec_NT *p = (struct __pyx_obj_4cdec_5_cdec_NT *)o;
-  if (p->cat) {
-    e = (*v)(p->cat, a); if (e) return e;
-  }
-  return 0;
-}
-
-static int __pyx_tp_clear_4cdec_5_cdec_NT(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec_NT *p = (struct __pyx_obj_4cdec_5_cdec_NT *)o;
-  PyObject* tmp;
-  tmp = ((PyObject*)p->cat);
-  p->cat = ((PyObject*)Py_None); Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  return 0;
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_2NT_cat(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_2NT_3cat_1__get__(o);
-}
-
-static int __pyx_setprop_4cdec_5_cdec_2NT_cat(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
-  if (v) {
-    return __pyx_pw_4cdec_5_cdec_2NT_3cat_3__set__(o, v);
+static void __pyx_tp_dealloc_4cdec_5_cdec_Grammar(PyObject *o) {
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
   }
-  else {
-    return __pyx_pw_4cdec_5_cdec_2NT_3cat_5__del__(o);
+  #endif
+  {
+    PyObject *etype, *eval, *etb;
+    PyErr_Fetch(&etype, &eval, &etb);
+    ++Py_REFCNT(o);
+    __pyx_pw_4cdec_5_cdec_7Grammar_1__dealloc__(o);
+    --Py_REFCNT(o);
+    PyErr_Restore(etype, eval, etb);
   }
+  (*Py_TYPE(o)->tp_free)(o);
 }
 
-static PyObject *__pyx_getprop_4cdec_5_cdec_2NT_ref(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_2NT_3ref_1__get__(o);
+static PyObject *__pyx_getprop_4cdec_5_cdec_7Grammar_name(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_7Grammar_4name_1__get__(o);
 }
 
-static int __pyx_setprop_4cdec_5_cdec_2NT_ref(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
+static int __pyx_setprop_4cdec_5_cdec_7Grammar_name(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
   if (v) {
-    return __pyx_pw_4cdec_5_cdec_2NT_3ref_3__set__(o, v);
+    return __pyx_pw_4cdec_5_cdec_7Grammar_4name_3__set__(o, v);
   }
   else {
     PyErr_SetString(PyExc_NotImplementedError, "__del__");
@@ -21438,22 +22647,21 @@ static int __pyx_setprop_4cdec_5_cdec_2NT_ref(PyObject *o, PyObject *v, CYTHON_U
   }
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec_NT[] = {
+static PyMethodDef __pyx_methods_4cdec_5_cdec_Grammar[] = {
   {0, 0, 0, 0}
 };
 
-static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_NT[] = {
-  {(char *)"cat", __pyx_getprop_4cdec_5_cdec_2NT_cat, __pyx_setprop_4cdec_5_cdec_2NT_cat, 0, 0},
-  {(char *)"ref", __pyx_getprop_4cdec_5_cdec_2NT_ref, __pyx_setprop_4cdec_5_cdec_2NT_ref, 0, 0},
+static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_Grammar[] = {
+  {(char *)"name", __pyx_getprop_4cdec_5_cdec_7Grammar_name, __pyx_setprop_4cdec_5_cdec_7Grammar_name, 0, 0},
   {0, 0, 0, 0, 0}
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec_NT = {
+static PyTypeObject __pyx_type_4cdec_5_cdec_Grammar = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.NT"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_NT), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.Grammar"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_Grammar), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_NT, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_Grammar, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -21468,29 +22676,29 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_NT = {
   0, /*tp_as_mapping*/
   0, /*tp_hash*/
   0, /*tp_call*/
-  __pyx_pw_4cdec_5_cdec_2NT_3__str__, /*tp_str*/
+  0, /*tp_str*/
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec_NT, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec_NT, /*tp_clear*/
+  0, /*tp_traverse*/
+  0, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
-  0, /*tp_iter*/
+  __pyx_pw_4cdec_5_cdec_7Grammar_3__iter__, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_NT, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_Grammar, /*tp_methods*/
   0, /*tp_members*/
-  __pyx_getsets_4cdec_5_cdec_NT, /*tp_getset*/
+  __pyx_getsets_4cdec_5_cdec_Grammar, /*tp_getset*/
   0, /*tp_base*/
   0, /*tp_dict*/
   0, /*tp_descr_get*/
   0, /*tp_descr_set*/
   0, /*tp_dictoffset*/
-  __pyx_pw_4cdec_5_cdec_2NT_1__init__, /*tp_init*/
+  0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_NT, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_Grammar, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -21502,81 +22710,27 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_NT = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_Lattice(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
+static PyObject *__pyx_tp_new_4cdec_5_cdec_TextGrammar(PyTypeObject *t, PyObject *a, PyObject *k) {
+  PyObject *o = __pyx_tp_new_4cdec_5_cdec_Grammar(t, a, k);
   if (unlikely(!o)) return 0;
-  if (unlikely(__pyx_pw_4cdec_5_cdec_7Lattice_1__cinit__(o, __pyx_empty_tuple, NULL) < 0)) {
-    Py_DECREF(o); o = 0;
-  }
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec_Lattice(PyObject *o) {
-  {
-    PyObject *etype, *eval, *etb;
-    PyErr_Fetch(&etype, &eval, &etb);
-    ++Py_REFCNT(o);
-    __pyx_pw_4cdec_5_cdec_7Lattice_5__dealloc__(o);
-    if (PyErr_Occurred()) PyErr_WriteUnraisable(o);
-    --Py_REFCNT(o);
-    PyErr_Restore(etype, eval, etb);
-  }
-  (*Py_TYPE(o)->tp_free)(o);
-}
-static PyObject *__pyx_sq_item_4cdec_5_cdec_Lattice(PyObject *o, Py_ssize_t i) {
-  PyObject *r;
-  PyObject *x = PyInt_FromSsize_t(i); if(!x) return 0;
-  r = Py_TYPE(o)->tp_as_mapping->mp_subscript(o, x);
-  Py_DECREF(x);
-  return r;
-}
-
-static int __pyx_mp_ass_subscript_4cdec_5_cdec_Lattice(PyObject *o, PyObject *i, PyObject *v) {
-  if (v) {
-    return __pyx_pw_4cdec_5_cdec_7Lattice_9__setitem__(o, i, v);
-  }
-  else {
-    PyErr_Format(PyExc_NotImplementedError,
-      "Subscript deletion not supported by %s", Py_TYPE(o)->tp_name);
-    return -1;
-  }
-}
-
-static PyMethodDef __pyx_methods_4cdec_5_cdec_Lattice[] = {
-  {__Pyx_NAMESTR("__unicode__"), (PyCFunction)__pyx_pw_4cdec_5_cdec_7Lattice_15__unicode__, METH_NOARGS, __Pyx_DOCSTR(0)},
-  {__Pyx_NAMESTR("todot"), (PyCFunction)__pyx_pw_4cdec_5_cdec_7Lattice_20todot, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_7Lattice_19todot)},
-  {__Pyx_NAMESTR("as_hypergraph"), (PyCFunction)__pyx_pw_4cdec_5_cdec_7Lattice_22as_hypergraph, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_7Lattice_21as_hypergraph)},
+static PyMethodDef __pyx_methods_4cdec_5_cdec_TextGrammar[] = {
   {0, 0, 0, 0}
 };
 
-static PySequenceMethods __pyx_tp_as_sequence_Lattice = {
-  __pyx_pw_4cdec_5_cdec_7Lattice_11__len__, /*sq_length*/
-  0, /*sq_concat*/
-  0, /*sq_repeat*/
-  __pyx_sq_item_4cdec_5_cdec_Lattice, /*sq_item*/
-  0, /*sq_slice*/
-  0, /*sq_ass_item*/
-  0, /*sq_ass_slice*/
-  0, /*sq_contains*/
-  0, /*sq_inplace_concat*/
-  0, /*sq_inplace_repeat*/
-};
-
-static PyMappingMethods __pyx_tp_as_mapping_Lattice = {
-  __pyx_pw_4cdec_5_cdec_7Lattice_11__len__, /*mp_length*/
-  __pyx_pw_4cdec_5_cdec_7Lattice_7__getitem__, /*mp_subscript*/
-  __pyx_mp_ass_subscript_4cdec_5_cdec_Lattice, /*mp_ass_subscript*/
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec_Lattice = {
+static PyTypeObject __pyx_type_4cdec_5_cdec_TextGrammar = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.Lattice"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_Lattice), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.TextGrammar"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_TextGrammar), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_Lattice, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_Grammar, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -21587,11 +22741,11 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Lattice = {
   #endif
   0, /*tp_repr*/
   0, /*tp_as_number*/
-  &__pyx_tp_as_sequence_Lattice, /*tp_as_sequence*/
-  &__pyx_tp_as_mapping_Lattice, /*tp_as_mapping*/
+  0, /*tp_as_sequence*/
+  0, /*tp_as_mapping*/
   0, /*tp_hash*/
   0, /*tp_call*/
-  __pyx_pw_4cdec_5_cdec_7Lattice_13__str__, /*tp_str*/
+  0, /*tp_str*/
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
@@ -21601,9 +22755,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Lattice = {
   0, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
-  __pyx_pw_4cdec_5_cdec_7Lattice_17__iter__, /*tp_iter*/
+  #if CYTHON_COMPILING_IN_PYPY
+  __pyx_pw_4cdec_5_cdec_7Grammar_3__iter__, /*tp_iter*/
+  #else
+  0, /*tp_iter*/
+  #endif
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_Lattice, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_TextGrammar, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -21611,9 +22769,9 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Lattice = {
   0, /*tp_descr_get*/
   0, /*tp_descr_set*/
   0, /*tp_dictoffset*/
-  __pyx_pw_4cdec_5_cdec_7Lattice_3__init__, /*tp_init*/
+  __pyx_pw_4cdec_5_cdec_11TextGrammar_1__init__, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_Lattice, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_TextGrammar, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -21625,115 +22783,93 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Lattice = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
+static struct __pyx_vtabstruct_4cdec_5_cdec_Hypergraph __pyx_vtable_4cdec_5_cdec_Hypergraph;
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_23__make_config[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_23__make_config = 0;
-
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_23__make_config(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec_Hypergraph(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+  struct __pyx_obj_4cdec_5_cdec_Hypergraph *p;
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_23__make_config > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_23__make_config[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_23__make_config];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config));
-    PyObject_INIT(o, t);
-    PyObject_GC_Track(o);
-  } else {
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
     o = (*t->tp_alloc)(t, 0);
-    if (unlikely(!o)) return 0;
+  } else {
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *)o);
-  p->__pyx_v_config = 0;
-  p->__pyx_v_info = 0;
-  p->__pyx_v_key = 0;
-  p->__pyx_v_name = 0;
-  p->__pyx_v_value = 0;
-  p->__pyx_t_0 = 0;
-  p->__pyx_t_1 = 0;
+  if (unlikely(!o)) return 0;
+  p = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)o);
+  p->__pyx_vtab = __pyx_vtabptr_4cdec_5_cdec_Hypergraph;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_23__make_config(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *)o;
-  PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->__pyx_v_config);
-  Py_CLEAR(p->__pyx_v_info);
-  Py_CLEAR(p->__pyx_v_key);
-  Py_CLEAR(p->__pyx_v_name);
-  Py_CLEAR(p->__pyx_v_value);
-  Py_CLEAR(p->__pyx_t_0);
-  Py_CLEAR(p->__pyx_t_1);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_23__make_config < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_23__make_config[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_23__make_config++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *)o);
-  } else {
-    (*Py_TYPE(o)->tp_free)(o);
+static void __pyx_tp_dealloc_4cdec_5_cdec_Hypergraph(PyObject *o) {
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
+  }
+  #endif
+  {
+    PyObject *etype, *eval, *etb;
+    PyErr_Fetch(&etype, &eval, &etb);
+    ++Py_REFCNT(o);
+    __pyx_pw_4cdec_5_cdec_10Hypergraph_1__dealloc__(o);
+    --Py_REFCNT(o);
+    PyErr_Restore(etype, eval, etb);
   }
+  (*Py_TYPE(o)->tp_free)(o);
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_23__make_config(PyObject *o, visitproc v, void *a) {
-  int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *)o;
-  if (p->__pyx_v_config) {
-    e = (*v)(p->__pyx_v_config, a); if (e) return e;
-  }
-  if (p->__pyx_v_info) {
-    e = (*v)(p->__pyx_v_info, a); if (e) return e;
-  }
-  if (p->__pyx_v_key) {
-    e = (*v)(p->__pyx_v_key, a); if (e) return e;
-  }
-  if (p->__pyx_v_name) {
-    e = (*v)(p->__pyx_v_name, a); if (e) return e;
-  }
-  if (p->__pyx_v_value) {
-    e = (*v)(p->__pyx_v_value, a); if (e) return e;
-  }
-  if (p->__pyx_t_0) {
-    e = (*v)(p->__pyx_t_0, a); if (e) return e;
-  }
-  if (p->__pyx_t_1) {
-    e = (*v)(p->__pyx_t_1, a); if (e) return e;
-  }
-  return 0;
+static PyObject *__pyx_getprop_4cdec_5_cdec_10Hypergraph_edges(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_10Hypergraph_5edges_1__get__(o);
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_23__make_config(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *)o;
-  PyObject* tmp;
-  tmp = ((PyObject*)p->__pyx_v_config);
-  p->__pyx_v_config = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_info);
-  p->__pyx_v_info = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_key);
-  p->__pyx_v_key = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_name);
-  p->__pyx_v_name = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_value);
-  p->__pyx_v_value = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_t_0);
-  p->__pyx_t_0 = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_t_1);
-  p->__pyx_t_1 = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  return 0;
+static PyObject *__pyx_getprop_4cdec_5_cdec_10Hypergraph_nodes(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_10Hypergraph_5nodes_1__get__(o);
+}
+
+static PyObject *__pyx_getprop_4cdec_5_cdec_10Hypergraph_goal(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_10Hypergraph_4goal_1__get__(o);
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_23__make_config[] = {
+static PyObject *__pyx_getprop_4cdec_5_cdec_10Hypergraph_npaths(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_10Hypergraph_6npaths_1__get__(o);
+}
+
+static PyMethodDef __pyx_methods_4cdec_5_cdec_Hypergraph[] = {
+  {__Pyx_NAMESTR("viterbi"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_3viterbi, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_2viterbi)},
+  {__Pyx_NAMESTR("viterbi_trees"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_5viterbi_trees, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_4viterbi_trees)},
+  {__Pyx_NAMESTR("viterbi_features"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_7viterbi_features, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_6viterbi_features)},
+  {__Pyx_NAMESTR("viterbi_forest"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_9viterbi_forest, METH_NOARGS, __Pyx_DOCSTR(0)},
+  {__Pyx_NAMESTR("viterbi_joshua"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_11viterbi_joshua, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_10viterbi_joshua)},
+  {__Pyx_NAMESTR("kbest"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_13kbest, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_12kbest)},
+  {__Pyx_NAMESTR("kbest_trees"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_16kbest_trees, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_15kbest_trees)},
+  {__Pyx_NAMESTR("kbest_features"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_19kbest_features, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_18kbest_features)},
+  {__Pyx_NAMESTR("sample"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_22sample, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_21sample)},
+  {__Pyx_NAMESTR("sample_trees"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_25sample_trees, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_24sample_trees)},
+  {__Pyx_NAMESTR("intersect"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_28intersect, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_27intersect)},
+  {__Pyx_NAMESTR("prune"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_30prune, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_29prune)},
+  {__Pyx_NAMESTR("lattice"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_32lattice, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_31lattice)},
+  {__Pyx_NAMESTR("plf"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_34plf, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_33plf)},
+  {__Pyx_NAMESTR("reweight"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_36reweight, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_35reweight)},
+  {__Pyx_NAMESTR("inside_outside"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_38inside_outside, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_37inside_outside)},
   {0, 0, 0, 0}
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_23__make_config = {
+static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_Hypergraph[] = {
+  {(char *)"edges", __pyx_getprop_4cdec_5_cdec_10Hypergraph_edges, 0, 0, 0},
+  {(char *)"nodes", __pyx_getprop_4cdec_5_cdec_10Hypergraph_nodes, 0, 0, 0},
+  {(char *)"goal", __pyx_getprop_4cdec_5_cdec_10Hypergraph_goal, 0, 0, 0},
+  {(char *)"npaths", __pyx_getprop_4cdec_5_cdec_10Hypergraph_npaths, 0, 0, 0},
+  {0, 0, 0, 0, 0}
+};
+
+static PyTypeObject __pyx_type_4cdec_5_cdec_Hypergraph = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_23__make_config"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.Hypergraph"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_Hypergraph), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_23__make_config, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_Hypergraph, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -21752,17 +22888,17 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_23__make_config =
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_23__make_config, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_23__make_config, /*tp_clear*/
+  0, /*tp_traverse*/
+  0, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_23__make_config, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_Hypergraph, /*tp_methods*/
   0, /*tp_members*/
-  0, /*tp_getset*/
+  __pyx_getsets_4cdec_5_cdec_Hypergraph, /*tp_getset*/
   0, /*tp_base*/
   0, /*tp_dict*/
   0, /*tp_descr_get*/
@@ -21770,7 +22906,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_23__make_config =
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_23__make_config, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_Hypergraph, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -21782,13 +22918,20 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_23__make_config =
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 static struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphEdge __pyx_vtable_4cdec_5_cdec_HypergraphEdge;
 
 static PyObject *__pyx_tp_new_4cdec_5_cdec_HypergraphEdge(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *p;
   PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
+    o = (*t->tp_alloc)(t, 0);
+  } else {
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
+  }
   if (unlikely(!o)) return 0;
   p = ((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)o);
   p->__pyx_vtab = __pyx_vtabptr_4cdec_5_cdec_HypergraphEdge;
@@ -21798,6 +22941,11 @@ static PyObject *__pyx_tp_new_4cdec_5_cdec_HypergraphEdge(PyTypeObject *t, CYTHO
 
 static void __pyx_tp_dealloc_4cdec_5_cdec_HypergraphEdge(PyObject *o) {
   struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *p = (struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)o;
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && !_PyGC_FINALIZED(o)) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
+  }
+  #endif
   PyObject_GC_UnTrack(o);
   Py_CLEAR(p->trule);
   (*Py_TYPE(o)->tp_free)(o);
@@ -21813,8 +22961,8 @@ static int __pyx_tp_traverse_4cdec_5_cdec_HypergraphEdge(PyObject *o, visitproc
 }
 
 static int __pyx_tp_clear_4cdec_5_cdec_HypergraphEdge(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *p = (struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)o;
   PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *p = (struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)o;
   tmp = ((PyObject*)p->trule);
   p->trule = ((struct __pyx_obj_4cdec_5_cdec_TRule *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
@@ -21946,67 +23094,74 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_HypergraphEdge = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
+static struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphNode __pyx_vtable_4cdec_5_cdec_HypergraphNode;
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_2__phrase[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_2__phrase = 0;
-
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_2__phrase(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec_HypergraphNode(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+  struct __pyx_obj_4cdec_5_cdec_HypergraphNode *p;
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_2__phrase > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_2__phrase[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_2__phrase];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase));
-    PyObject_INIT(o, t);
-    PyObject_GC_Track(o);
-  } else {
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
     o = (*t->tp_alloc)(t, 0);
-    if (unlikely(!o)) return 0;
+  } else {
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *)o);
-  p->__pyx_v_phrase = 0;
+  if (unlikely(!o)) return 0;
+  p = ((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)o);
+  p->__pyx_vtab = __pyx_vtabptr_4cdec_5_cdec_HypergraphNode;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_2__phrase(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *)o;
-  PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->__pyx_v_phrase);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_2__phrase < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_2__phrase[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_2__phrase++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *)o);
-  } else {
-    (*Py_TYPE(o)->tp_free)(o);
+static void __pyx_tp_dealloc_4cdec_5_cdec_HypergraphNode(PyObject *o) {
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
   }
+  #endif
+  (*Py_TYPE(o)->tp_free)(o);
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_2__phrase(PyObject *o, visitproc v, void *a) {
-  int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *)o;
-  if (p->__pyx_v_phrase) {
-    e = (*v)(p->__pyx_v_phrase, a); if (e) return e;
-  }
-  return 0;
+static PyObject *__pyx_getprop_4cdec_5_cdec_14HypergraphNode_id(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_14HypergraphNode_2id_1__get__(o);
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_2__phrase(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *)o;
-  PyObject* tmp;
-  tmp = ((PyObject*)p->__pyx_v_phrase);
-  p->__pyx_v_phrase = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  return 0;
+static PyObject *__pyx_getprop_4cdec_5_cdec_14HypergraphNode_in_edges(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_14HypergraphNode_8in_edges_1__get__(o);
+}
+
+static PyObject *__pyx_getprop_4cdec_5_cdec_14HypergraphNode_out_edges(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_14HypergraphNode_9out_edges_1__get__(o);
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_2__phrase[] = {
+static PyObject *__pyx_getprop_4cdec_5_cdec_14HypergraphNode_span(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_14HypergraphNode_4span_1__get__(o);
+}
+
+static PyObject *__pyx_getprop_4cdec_5_cdec_14HypergraphNode_cat(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_14HypergraphNode_3cat_1__get__(o);
+}
+
+static PyMethodDef __pyx_methods_4cdec_5_cdec_HypergraphNode[] = {
   {0, 0, 0, 0}
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_2__phrase = {
+static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_HypergraphNode[] = {
+  {(char *)"id", __pyx_getprop_4cdec_5_cdec_14HypergraphNode_id, 0, 0, 0},
+  {(char *)"in_edges", __pyx_getprop_4cdec_5_cdec_14HypergraphNode_in_edges, 0, 0, 0},
+  {(char *)"out_edges", __pyx_getprop_4cdec_5_cdec_14HypergraphNode_out_edges, 0, 0, 0},
+  {(char *)"span", __pyx_getprop_4cdec_5_cdec_14HypergraphNode_span, 0, 0, 0},
+  {(char *)"cat", __pyx_getprop_4cdec_5_cdec_14HypergraphNode_cat, 0, 0, 0},
+  {0, 0, 0, 0, 0}
+};
+
+static PyTypeObject __pyx_type_4cdec_5_cdec_HypergraphNode = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_2__phrase"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.HypergraphNode"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_HypergraphNode), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_2__phrase, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_HypergraphNode, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -22025,17 +23180,17 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_2__phrase = {
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_2__phrase, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_2__phrase, /*tp_clear*/
-  0, /*tp_richcompare*/
+  0, /*tp_traverse*/
+  0, /*tp_clear*/
+  __pyx_pw_4cdec_5_cdec_14HypergraphNode_1__richcmp__, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_2__phrase, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_HypergraphNode, /*tp_methods*/
   0, /*tp_members*/
-  0, /*tp_getset*/
+  __pyx_getsets_4cdec_5_cdec_HypergraphNode, /*tp_getset*/
   0, /*tp_base*/
   0, /*tp_dict*/
   0, /*tp_descr_get*/
@@ -22043,7 +23198,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_2__phrase = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_2__phrase, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_HypergraphNode, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -22055,67 +23210,92 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_2__phrase = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_13___get__[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_13___get__ = 0;
-
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_13___get__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec_Lattice(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_13___get__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_13___get__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_13___get__];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__));
-    PyObject_INIT(o, t);
-    PyObject_GC_Track(o);
-  } else {
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
     o = (*t->tp_alloc)(t, 0);
-    if (unlikely(!o)) return 0;
+  } else {
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
+  }
+  if (unlikely(!o)) return 0;
+  if (unlikely(__pyx_pw_4cdec_5_cdec_7Lattice_1__cinit__(o, __pyx_empty_tuple, NULL) < 0)) {
+    Py_DECREF(o); o = 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *)o);
-  p->__pyx_v_self = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_13___get__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *)o;
-  PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->__pyx_v_self);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_13___get__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_13___get__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_13___get__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *)o);
-  } else {
-    (*Py_TYPE(o)->tp_free)(o);
+static void __pyx_tp_dealloc_4cdec_5_cdec_Lattice(PyObject *o) {
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
   }
-}
-
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_13___get__(PyObject *o, visitproc v, void *a) {
-  int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *)o;
-  if (p->__pyx_v_self) {
-    e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
+  #endif
+  {
+    PyObject *etype, *eval, *etb;
+    PyErr_Fetch(&etype, &eval, &etb);
+    ++Py_REFCNT(o);
+    __pyx_pw_4cdec_5_cdec_7Lattice_5__dealloc__(o);
+    --Py_REFCNT(o);
+    PyErr_Restore(etype, eval, etb);
   }
-  return 0;
+  (*Py_TYPE(o)->tp_free)(o);
+}
+static PyObject *__pyx_sq_item_4cdec_5_cdec_Lattice(PyObject *o, Py_ssize_t i) {
+  PyObject *r;
+  PyObject *x = PyInt_FromSsize_t(i); if(!x) return 0;
+  r = Py_TYPE(o)->tp_as_mapping->mp_subscript(o, x);
+  Py_DECREF(x);
+  return r;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_13___get__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *)o;
-  PyObject* tmp;
-  tmp = ((PyObject*)p->__pyx_v_self);
-  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)Py_None); Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  return 0;
+static int __pyx_mp_ass_subscript_4cdec_5_cdec_Lattice(PyObject *o, PyObject *i, PyObject *v) {
+  if (v) {
+    return __pyx_pw_4cdec_5_cdec_7Lattice_9__setitem__(o, i, v);
+  }
+  else {
+    PyErr_Format(PyExc_NotImplementedError,
+      "Subscript deletion not supported by %.200s", Py_TYPE(o)->tp_name);
+    return -1;
+  }
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_13___get__[] = {
+static PyMethodDef __pyx_methods_4cdec_5_cdec_Lattice[] = {
+  {__Pyx_NAMESTR("__unicode__"), (PyCFunction)__pyx_pw_4cdec_5_cdec_7Lattice_15__unicode__, METH_NOARGS, __Pyx_DOCSTR(0)},
+  {__Pyx_NAMESTR("todot"), (PyCFunction)__pyx_pw_4cdec_5_cdec_7Lattice_20todot, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_7Lattice_19todot)},
+  {__Pyx_NAMESTR("as_hypergraph"), (PyCFunction)__pyx_pw_4cdec_5_cdec_7Lattice_22as_hypergraph, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_7Lattice_21as_hypergraph)},
   {0, 0, 0, 0}
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_13___get__ = {
+static PySequenceMethods __pyx_tp_as_sequence_Lattice = {
+  __pyx_pw_4cdec_5_cdec_7Lattice_11__len__, /*sq_length*/
+  0, /*sq_concat*/
+  0, /*sq_repeat*/
+  __pyx_sq_item_4cdec_5_cdec_Lattice, /*sq_item*/
+  0, /*sq_slice*/
+  0, /*sq_ass_item*/
+  0, /*sq_ass_slice*/
+  0, /*sq_contains*/
+  0, /*sq_inplace_concat*/
+  0, /*sq_inplace_repeat*/
+};
+
+static PyMappingMethods __pyx_tp_as_mapping_Lattice = {
+  __pyx_pw_4cdec_5_cdec_7Lattice_11__len__, /*mp_length*/
+  __pyx_pw_4cdec_5_cdec_7Lattice_7__getitem__, /*mp_subscript*/
+  __pyx_mp_ass_subscript_4cdec_5_cdec_Lattice, /*mp_ass_subscript*/
+};
+
+static PyTypeObject __pyx_type_4cdec_5_cdec_Lattice = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_13___get__"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.Lattice"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_Lattice), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_13___get__, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_Lattice, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -22126,23 +23306,23 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_13___get__ = {
   #endif
   0, /*tp_repr*/
   0, /*tp_as_number*/
-  0, /*tp_as_sequence*/
-  0, /*tp_as_mapping*/
+  &__pyx_tp_as_sequence_Lattice, /*tp_as_sequence*/
+  &__pyx_tp_as_mapping_Lattice, /*tp_as_mapping*/
   0, /*tp_hash*/
   0, /*tp_call*/
-  0, /*tp_str*/
+  __pyx_pw_4cdec_5_cdec_7Lattice_13__str__, /*tp_str*/
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_13___get__, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_13___get__, /*tp_clear*/
+  0, /*tp_traverse*/
+  0, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
-  0, /*tp_iter*/
+  __pyx_pw_4cdec_5_cdec_7Lattice_17__iter__, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_13___get__, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_Lattice, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -22150,9 +23330,9 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_13___get__ = {
   0, /*tp_descr_get*/
   0, /*tp_descr_set*/
   0, /*tp_dictoffset*/
-  0, /*tp_init*/
+  __pyx_pw_4cdec_5_cdec_7Lattice_3__init__, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_13___get__, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_Lattice, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -22164,115 +23344,66 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_13___get__ = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_20_lines[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_20_lines = 0;
-
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_20_lines(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec_Candidate(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_20_lines > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_20_lines[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_20_lines];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines));
-    PyObject_INIT(o, t);
-    PyObject_GC_Track(o);
-  } else {
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
     o = (*t->tp_alloc)(t, 0);
-    if (unlikely(!o)) return 0;
+  } else {
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *)o);
-  p->__pyx_outer_scope = 0;
-  p->__pyx_v_delta = 0;
-  p->__pyx_v_i = 0;
-  p->__pyx_v_label = 0;
-  p->__pyx_v_weight = 0;
-  p->__pyx_t_1 = 0;
-  p->__pyx_t_3 = 0;
+  if (unlikely(!o)) return 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_20_lines(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *)o;
-  PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->__pyx_outer_scope);
-  Py_CLEAR(p->__pyx_v_delta);
-  Py_CLEAR(p->__pyx_v_i);
-  Py_CLEAR(p->__pyx_v_label);
-  Py_CLEAR(p->__pyx_v_weight);
-  Py_CLEAR(p->__pyx_t_1);
-  Py_CLEAR(p->__pyx_t_3);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_20_lines < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_20_lines[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_20_lines++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *)o);
-  } else {
-    (*Py_TYPE(o)->tp_free)(o);
+static void __pyx_tp_dealloc_4cdec_5_cdec_Candidate(PyObject *o) {
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
   }
+  #endif
+  (*Py_TYPE(o)->tp_free)(o);
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_20_lines(PyObject *o, visitproc v, void *a) {
-  int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *)o;
-  if (p->__pyx_outer_scope) {
-    e = (*v)(((PyObject*)p->__pyx_outer_scope), a); if (e) return e;
-  }
-  if (p->__pyx_v_delta) {
-    e = (*v)(p->__pyx_v_delta, a); if (e) return e;
-  }
-  if (p->__pyx_v_i) {
-    e = (*v)(p->__pyx_v_i, a); if (e) return e;
-  }
-  if (p->__pyx_v_label) {
-    e = (*v)(p->__pyx_v_label, a); if (e) return e;
-  }
-  if (p->__pyx_v_weight) {
-    e = (*v)(p->__pyx_v_weight, a); if (e) return e;
-  }
-  if (p->__pyx_t_1) {
-    e = (*v)(p->__pyx_t_1, a); if (e) return e;
-  }
-  if (p->__pyx_t_3) {
-    e = (*v)(p->__pyx_t_3, a); if (e) return e;
-  }
-  return 0;
+static PyObject *__pyx_getprop_4cdec_5_cdec_9Candidate_words(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_9Candidate_5words_1__get__(o);
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_20_lines(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *)o;
-  PyObject* tmp;
-  tmp = ((PyObject*)p->__pyx_outer_scope);
-  p->__pyx_outer_scope = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *)Py_None); Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_delta);
-  p->__pyx_v_delta = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_i);
-  p->__pyx_v_i = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_label);
-  p->__pyx_v_label = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_weight);
-  p->__pyx_v_weight = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_t_1);
-  p->__pyx_t_1 = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_t_3);
-  p->__pyx_t_3 = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  return 0;
+static PyObject *__pyx_getprop_4cdec_5_cdec_9Candidate_fmap(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_9Candidate_4fmap_1__get__(o);
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_20_lines[] = {
-  {0, 0, 0, 0}
+static PyObject *__pyx_getprop_4cdec_5_cdec_9Candidate_score(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_9Candidate_5score_1__get__(o);
+}
+
+static int __pyx_setprop_4cdec_5_cdec_9Candidate_score(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
+  if (v) {
+    return __pyx_pw_4cdec_5_cdec_9Candidate_5score_3__set__(o, v);
+  }
+  else {
+    PyErr_SetString(PyExc_NotImplementedError, "__del__");
+    return -1;
+  }
+}
+
+static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_Candidate[] = {
+  {(char *)"words", __pyx_getprop_4cdec_5_cdec_9Candidate_words, 0, 0, 0},
+  {(char *)"fmap", __pyx_getprop_4cdec_5_cdec_9Candidate_fmap, 0, 0, 0},
+  {(char *)"score", __pyx_getprop_4cdec_5_cdec_9Candidate_score, __pyx_setprop_4cdec_5_cdec_9Candidate_score, 0, 0},
+  {0, 0, 0, 0, 0}
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_20_lines = {
+static PyTypeObject __pyx_type_4cdec_5_cdec_Candidate = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_20_lines"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.Candidate"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_Candidate), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_20_lines, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_Candidate, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -22291,17 +23422,17 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_20_lines = {
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_20_lines, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_20_lines, /*tp_clear*/
+  0, /*tp_traverse*/
+  0, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_20_lines, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
-  0, /*tp_getset*/
+  __pyx_getsets_4cdec_5_cdec_Candidate, /*tp_getset*/
   0, /*tp_base*/
   0, /*tp_dict*/
   0, /*tp_descr_get*/
@@ -22309,7 +23440,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_20_lines = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_20_lines, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_Candidate, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -22321,41 +23452,147 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_20_lines = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_Scorer(PyTypeObject *t, PyObject *a, PyObject *k) {
+static PyObject *__pyx_tp_new_4cdec_5_cdec_SufficientStats(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
-  if (unlikely(!o)) return 0;
-  if (unlikely(__pyx_pw_4cdec_5_cdec_6Scorer_1__cinit__(o, a, k) < 0)) {
-    Py_DECREF(o); o = 0;
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
+    o = (*t->tp_alloc)(t, 0);
+  } else {
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
   }
+  if (unlikely(!o)) return 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec_Scorer(PyObject *o) {
+static void __pyx_tp_dealloc_4cdec_5_cdec_SufficientStats(PyObject *o) {
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
+  }
+  #endif
   {
     PyObject *etype, *eval, *etb;
     PyErr_Fetch(&etype, &eval, &etb);
     ++Py_REFCNT(o);
-    __pyx_pw_4cdec_5_cdec_6Scorer_3__dealloc__(o);
-    if (PyErr_Occurred()) PyErr_WriteUnraisable(o);
+    __pyx_pw_4cdec_5_cdec_15SufficientStats_1__dealloc__(o);
     --Py_REFCNT(o);
     PyErr_Restore(etype, eval, etb);
   }
   (*Py_TYPE(o)->tp_free)(o);
 }
+static PyObject *__pyx_sq_item_4cdec_5_cdec_SufficientStats(PyObject *o, Py_ssize_t i) {
+  PyObject *r;
+  PyObject *x = PyInt_FromSsize_t(i); if(!x) return 0;
+  r = Py_TYPE(o)->tp_as_mapping->mp_subscript(o, x);
+  Py_DECREF(x);
+  return r;
+}
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec_Scorer[] = {
+static PyObject *__pyx_getprop_4cdec_5_cdec_15SufficientStats_score(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_15SufficientStats_5score_1__get__(o);
+}
+
+static PyObject *__pyx_getprop_4cdec_5_cdec_15SufficientStats_detail(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_15SufficientStats_6detail_1__get__(o);
+}
+
+static PyMethodDef __pyx_methods_4cdec_5_cdec_SufficientStats[] = {
   {0, 0, 0, 0}
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec_Scorer = {
+static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_SufficientStats[] = {
+  {(char *)"score", __pyx_getprop_4cdec_5_cdec_15SufficientStats_score, 0, 0, 0},
+  {(char *)"detail", __pyx_getprop_4cdec_5_cdec_15SufficientStats_detail, 0, 0, 0},
+  {0, 0, 0, 0, 0}
+};
+
+static PyNumberMethods __pyx_tp_as_number_SufficientStats = {
+  __pyx_pw_4cdec_5_cdec_15SufficientStats_12__add__, /*nb_add*/
+  0, /*nb_subtract*/
+  0, /*nb_multiply*/
+  #if PY_MAJOR_VERSION < 3
+  0, /*nb_divide*/
+  #endif
+  0, /*nb_remainder*/
+  0, /*nb_divmod*/
+  0, /*nb_power*/
+  0, /*nb_negative*/
+  0, /*nb_positive*/
+  0, /*nb_absolute*/
+  0, /*nb_nonzero*/
+  0, /*nb_invert*/
+  0, /*nb_lshift*/
+  0, /*nb_rshift*/
+  0, /*nb_and*/
+  0, /*nb_xor*/
+  0, /*nb_or*/
+  #if PY_MAJOR_VERSION < 3
+  0, /*nb_coerce*/
+  #endif
+  0, /*nb_int*/
+  #if PY_MAJOR_VERSION < 3
+  0, /*nb_long*/
+  #else
+  0, /*reserved*/
+  #endif
+  0, /*nb_float*/
+  #if PY_MAJOR_VERSION < 3
+  0, /*nb_oct*/
+  #endif
+  #if PY_MAJOR_VERSION < 3
+  0, /*nb_hex*/
+  #endif
+  __pyx_pw_4cdec_5_cdec_15SufficientStats_10__iadd__, /*nb_inplace_add*/
+  0, /*nb_inplace_subtract*/
+  0, /*nb_inplace_multiply*/
+  #if PY_MAJOR_VERSION < 3
+  0, /*nb_inplace_divide*/
+  #endif
+  0, /*nb_inplace_remainder*/
+  0, /*nb_inplace_power*/
+  0, /*nb_inplace_lshift*/
+  0, /*nb_inplace_rshift*/
+  0, /*nb_inplace_and*/
+  0, /*nb_inplace_xor*/
+  0, /*nb_inplace_or*/
+  0, /*nb_floor_divide*/
+  0, /*nb_true_divide*/
+  0, /*nb_inplace_floor_divide*/
+  0, /*nb_inplace_true_divide*/
+  #if PY_VERSION_HEX >= 0x02050000
+  0, /*nb_index*/
+  #endif
+};
+
+static PySequenceMethods __pyx_tp_as_sequence_SufficientStats = {
+  __pyx_pw_4cdec_5_cdec_15SufficientStats_3__len__, /*sq_length*/
+  0, /*sq_concat*/
+  0, /*sq_repeat*/
+  __pyx_sq_item_4cdec_5_cdec_SufficientStats, /*sq_item*/
+  0, /*sq_slice*/
+  0, /*sq_ass_item*/
+  0, /*sq_ass_slice*/
+  0, /*sq_contains*/
+  0, /*sq_inplace_concat*/
+  0, /*sq_inplace_repeat*/
+};
+
+static PyMappingMethods __pyx_tp_as_mapping_SufficientStats = {
+  __pyx_pw_4cdec_5_cdec_15SufficientStats_3__len__, /*mp_length*/
+  __pyx_pw_4cdec_5_cdec_15SufficientStats_8__getitem__, /*mp_subscript*/
+  0, /*mp_ass_subscript*/
+};
+
+static PyTypeObject __pyx_type_4cdec_5_cdec_SufficientStats = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.Scorer"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_Scorer), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.SufficientStats"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_SufficientStats), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_Scorer, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_SufficientStats, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -22365,12 +23602,12 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Scorer = {
   0, /*reserved*/
   #endif
   0, /*tp_repr*/
-  0, /*tp_as_number*/
-  0, /*tp_as_sequence*/
-  0, /*tp_as_mapping*/
+  &__pyx_tp_as_number_SufficientStats, /*tp_as_number*/
+  &__pyx_tp_as_sequence_SufficientStats, /*tp_as_sequence*/
+  &__pyx_tp_as_mapping_SufficientStats, /*tp_as_mapping*/
   0, /*tp_hash*/
-  __pyx_pw_4cdec_5_cdec_6Scorer_5__call__, /*tp_call*/
-  __pyx_pw_4cdec_5_cdec_6Scorer_7__str__, /*tp_str*/
+  0, /*tp_call*/
+  0, /*tp_str*/
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
@@ -22380,11 +23617,11 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Scorer = {
   0, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
-  0, /*tp_iter*/
+  __pyx_pw_4cdec_5_cdec_15SufficientStats_5__iter__, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_Scorer, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_SufficientStats, /*tp_methods*/
   0, /*tp_members*/
-  0, /*tp_getset*/
+  __pyx_getsets_4cdec_5_cdec_SufficientStats, /*tp_getset*/
   0, /*tp_base*/
   0, /*tp_dict*/
   0, /*tp_descr_get*/
@@ -22392,7 +23629,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Scorer = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_Scorer, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_SufficientStats, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -22404,62 +23641,79 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Scorer = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
-static struct __pyx_vtabstruct_4cdec_5_cdec_HypergraphNode __pyx_vtable_4cdec_5_cdec_HypergraphNode;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_HypergraphNode(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec_HypergraphNode *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec_CandidateSet(PyTypeObject *t, PyObject *a, PyObject *k) {
   PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
+    o = (*t->tp_alloc)(t, 0);
+  } else {
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
+  }
   if (unlikely(!o)) return 0;
-  p = ((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)o);
-  p->__pyx_vtab = __pyx_vtabptr_4cdec_5_cdec_HypergraphNode;
+  if (unlikely(__pyx_pw_4cdec_5_cdec_12CandidateSet_1__cinit__(o, a, k) < 0)) {
+    Py_DECREF(o); o = 0;
+  }
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec_HypergraphNode(PyObject *o) {
+static void __pyx_tp_dealloc_4cdec_5_cdec_CandidateSet(PyObject *o) {
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
+  }
+  #endif
+  {
+    PyObject *etype, *eval, *etb;
+    PyErr_Fetch(&etype, &eval, &etb);
+    ++Py_REFCNT(o);
+    __pyx_pw_4cdec_5_cdec_12CandidateSet_3__dealloc__(o);
+    --Py_REFCNT(o);
+    PyErr_Restore(etype, eval, etb);
+  }
   (*Py_TYPE(o)->tp_free)(o);
 }
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_14HypergraphNode_id(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_14HypergraphNode_2id_1__get__(o);
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_14HypergraphNode_in_edges(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_14HypergraphNode_8in_edges_1__get__(o);
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_14HypergraphNode_out_edges(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_14HypergraphNode_9out_edges_1__get__(o);
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_14HypergraphNode_span(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_14HypergraphNode_4span_1__get__(o);
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_14HypergraphNode_cat(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_14HypergraphNode_3cat_1__get__(o);
+static PyObject *__pyx_sq_item_4cdec_5_cdec_CandidateSet(PyObject *o, Py_ssize_t i) {
+  PyObject *r;
+  PyObject *x = PyInt_FromSsize_t(i); if(!x) return 0;
+  r = Py_TYPE(o)->tp_as_mapping->mp_subscript(o, x);
+  Py_DECREF(x);
+  return r;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec_HypergraphNode[] = {
+static PyMethodDef __pyx_methods_4cdec_5_cdec_CandidateSet[] = {
+  {__Pyx_NAMESTR("add_kbest"), (PyCFunction)__pyx_pw_4cdec_5_cdec_12CandidateSet_12add_kbest, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_12CandidateSet_11add_kbest)},
   {0, 0, 0, 0}
 };
 
-static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_HypergraphNode[] = {
-  {(char *)"id", __pyx_getprop_4cdec_5_cdec_14HypergraphNode_id, 0, 0, 0},
-  {(char *)"in_edges", __pyx_getprop_4cdec_5_cdec_14HypergraphNode_in_edges, 0, 0, 0},
-  {(char *)"out_edges", __pyx_getprop_4cdec_5_cdec_14HypergraphNode_out_edges, 0, 0, 0},
-  {(char *)"span", __pyx_getprop_4cdec_5_cdec_14HypergraphNode_span, 0, 0, 0},
-  {(char *)"cat", __pyx_getprop_4cdec_5_cdec_14HypergraphNode_cat, 0, 0, 0},
-  {0, 0, 0, 0, 0}
+static PySequenceMethods __pyx_tp_as_sequence_CandidateSet = {
+  __pyx_pw_4cdec_5_cdec_12CandidateSet_5__len__, /*sq_length*/
+  0, /*sq_concat*/
+  0, /*sq_repeat*/
+  __pyx_sq_item_4cdec_5_cdec_CandidateSet, /*sq_item*/
+  0, /*sq_slice*/
+  0, /*sq_ass_item*/
+  0, /*sq_ass_slice*/
+  0, /*sq_contains*/
+  0, /*sq_inplace_concat*/
+  0, /*sq_inplace_repeat*/
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec_HypergraphNode = {
+static PyMappingMethods __pyx_tp_as_mapping_CandidateSet = {
+  __pyx_pw_4cdec_5_cdec_12CandidateSet_5__len__, /*mp_length*/
+  __pyx_pw_4cdec_5_cdec_12CandidateSet_7__getitem__, /*mp_subscript*/
+  0, /*mp_ass_subscript*/
+};
+
+static PyTypeObject __pyx_type_4cdec_5_cdec_CandidateSet = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.HypergraphNode"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_HypergraphNode), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.CandidateSet"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_CandidateSet), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_HypergraphNode, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_CandidateSet, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -22470,8 +23724,8 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_HypergraphNode = {
   #endif
   0, /*tp_repr*/
   0, /*tp_as_number*/
-  0, /*tp_as_sequence*/
-  0, /*tp_as_mapping*/
+  &__pyx_tp_as_sequence_CandidateSet, /*tp_as_sequence*/
+  &__pyx_tp_as_mapping_CandidateSet, /*tp_as_mapping*/
   0, /*tp_hash*/
   0, /*tp_call*/
   0, /*tp_str*/
@@ -22482,13 +23736,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_HypergraphNode = {
   0, /*tp_doc*/
   0, /*tp_traverse*/
   0, /*tp_clear*/
-  __pyx_pw_4cdec_5_cdec_14HypergraphNode_1__richcmp__, /*tp_richcompare*/
+  0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
-  0, /*tp_iter*/
+  __pyx_pw_4cdec_5_cdec_12CandidateSet_9__iter__, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_HypergraphNode, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_CandidateSet, /*tp_methods*/
   0, /*tp_members*/
-  __pyx_getsets_4cdec_5_cdec_HypergraphNode, /*tp_getset*/
+  0, /*tp_getset*/
   0, /*tp_base*/
   0, /*tp_dict*/
   0, /*tp_descr_get*/
@@ -22496,7 +23750,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_HypergraphNode = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_HypergraphNode, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_CandidateSet, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -22508,83 +23762,51 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_HypergraphNode = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_10_kbest_features[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_10_kbest_features = 0;
-
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_10_kbest_features(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec_SegmentEvaluator(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_10_kbest_features > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_10_kbest_features[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_10_kbest_features];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features));
-    PyObject_INIT(o, t);
-    PyObject_GC_Track(o);
-  } else {
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
     o = (*t->tp_alloc)(t, 0);
-    if (unlikely(!o)) return 0;
-  }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *)o);
-  p->__pyx_v_fmap = 0;
-  p->__pyx_v_self = 0;
-  p->__pyx_v_size = 0;
-  return o;
-}
-
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_10_kbest_features(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *)o;
-  PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->__pyx_v_fmap);
-  Py_CLEAR(p->__pyx_v_self);
-  Py_CLEAR(p->__pyx_v_size);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_10_kbest_features < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_10_kbest_features[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_10_kbest_features++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *)o);
   } else {
-    (*Py_TYPE(o)->tp_free)(o);
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
   }
+  if (unlikely(!o)) return 0;
+  return o;
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_10_kbest_features(PyObject *o, visitproc v, void *a) {
-  int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *)o;
-  if (p->__pyx_v_fmap) {
-    e = (*v)(((PyObject*)p->__pyx_v_fmap), a); if (e) return e;
-  }
-  if (p->__pyx_v_self) {
-    e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
+static void __pyx_tp_dealloc_4cdec_5_cdec_SegmentEvaluator(PyObject *o) {
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
   }
-  if (p->__pyx_v_size) {
-    e = (*v)(p->__pyx_v_size, a); if (e) return e;
+  #endif
+  {
+    PyObject *etype, *eval, *etb;
+    PyErr_Fetch(&etype, &eval, &etb);
+    ++Py_REFCNT(o);
+    __pyx_pw_4cdec_5_cdec_16SegmentEvaluator_1__dealloc__(o);
+    --Py_REFCNT(o);
+    PyErr_Restore(etype, eval, etb);
   }
-  return 0;
-}
-
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_10_kbest_features(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *)o;
-  PyObject* tmp;
-  tmp = ((PyObject*)p->__pyx_v_fmap);
-  p->__pyx_v_fmap = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)Py_None); Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_self);
-  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)Py_None); Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_size);
-  p->__pyx_v_size = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  return 0;
+  (*Py_TYPE(o)->tp_free)(o);
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_10_kbest_features[] = {
+static PyMethodDef __pyx_methods_4cdec_5_cdec_SegmentEvaluator[] = {
+  {__Pyx_NAMESTR("evaluate"), (PyCFunction)__pyx_pw_4cdec_5_cdec_16SegmentEvaluator_3evaluate, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_16SegmentEvaluator_2evaluate)},
+  {__Pyx_NAMESTR("candidate_set"), (PyCFunction)__pyx_pw_4cdec_5_cdec_16SegmentEvaluator_5candidate_set, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_16SegmentEvaluator_4candidate_set)},
   {0, 0, 0, 0}
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_10_kbest_features = {
+static PyTypeObject __pyx_type_4cdec_5_cdec_SegmentEvaluator = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_10_kbest_features"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.SegmentEvaluator"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_10_kbest_features, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_SegmentEvaluator, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -22603,15 +23825,15 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_10_kbest_features
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_10_kbest_features, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_10_kbest_features, /*tp_clear*/
+  0, /*tp_traverse*/
+  0, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_10_kbest_features, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_SegmentEvaluator, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -22621,7 +23843,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_10_kbest_features
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_10_kbest_features, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_SegmentEvaluator, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -22633,48 +23855,52 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_10_kbest_features
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_NTRef(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+static PyObject *__pyx_tp_new_4cdec_5_cdec_Scorer(PyTypeObject *t, PyObject *a, PyObject *k) {
   PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
+    o = (*t->tp_alloc)(t, 0);
+  } else {
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
+  }
   if (unlikely(!o)) return 0;
+  if (unlikely(__pyx_pw_4cdec_5_cdec_6Scorer_1__cinit__(o, a, k) < 0)) {
+    Py_DECREF(o); o = 0;
+  }
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec_NTRef(PyObject *o) {
-  (*Py_TYPE(o)->tp_free)(o);
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_5NTRef_ref(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_5NTRef_3ref_1__get__(o);
-}
-
-static int __pyx_setprop_4cdec_5_cdec_5NTRef_ref(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
-  if (v) {
-    return __pyx_pw_4cdec_5_cdec_5NTRef_3ref_3__set__(o, v);
+static void __pyx_tp_dealloc_4cdec_5_cdec_Scorer(PyObject *o) {
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
   }
-  else {
-    PyErr_SetString(PyExc_NotImplementedError, "__del__");
-    return -1;
+  #endif
+  {
+    PyObject *etype, *eval, *etb;
+    PyErr_Fetch(&etype, &eval, &etb);
+    ++Py_REFCNT(o);
+    __pyx_pw_4cdec_5_cdec_6Scorer_3__dealloc__(o);
+    --Py_REFCNT(o);
+    PyErr_Restore(etype, eval, etb);
   }
+  (*Py_TYPE(o)->tp_free)(o);
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec_NTRef[] = {
+static PyMethodDef __pyx_methods_4cdec_5_cdec_Scorer[] = {
   {0, 0, 0, 0}
 };
 
-static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_NTRef[] = {
-  {(char *)"ref", __pyx_getprop_4cdec_5_cdec_5NTRef_ref, __pyx_setprop_4cdec_5_cdec_5NTRef_ref, 0, 0},
-  {0, 0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec_NTRef = {
+static PyTypeObject __pyx_type_4cdec_5_cdec_Scorer = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.NTRef"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_NTRef), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.Scorer"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_Scorer), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_NTRef, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_Scorer, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -22688,8 +23914,8 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_NTRef = {
   0, /*tp_as_sequence*/
   0, /*tp_as_mapping*/
   0, /*tp_hash*/
-  0, /*tp_call*/
-  __pyx_pw_4cdec_5_cdec_5NTRef_3__str__, /*tp_str*/
+  __pyx_pw_4cdec_5_cdec_6Scorer_5__call__, /*tp_call*/
+  __pyx_pw_4cdec_5_cdec_6Scorer_7__str__, /*tp_str*/
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
@@ -22701,17 +23927,17 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_NTRef = {
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_NTRef, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_Scorer, /*tp_methods*/
   0, /*tp_members*/
-  __pyx_getsets_4cdec_5_cdec_NTRef, /*tp_getset*/
+  0, /*tp_getset*/
   0, /*tp_base*/
   0, /*tp_dict*/
   0, /*tp_descr_get*/
   0, /*tp_descr_set*/
   0, /*tp_dictoffset*/
-  __pyx_pw_4cdec_5_cdec_5NTRef_1__init__, /*tp_init*/
+  0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_NTRef, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_Scorer, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -22723,57 +23949,70 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_NTRef = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_Grammar(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+static PyObject *__pyx_tp_new_4cdec_5_cdec_Metric(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+  struct __pyx_obj_4cdec_5_cdec_Metric *p;
   PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
+    o = (*t->tp_alloc)(t, 0);
+  } else {
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
+  }
   if (unlikely(!o)) return 0;
+  p = ((struct __pyx_obj_4cdec_5_cdec_Metric *)o);
+  p->scorer = ((struct __pyx_obj_4cdec_5_cdec_Scorer *)Py_None); Py_INCREF(Py_None);
+  if (unlikely(__pyx_pw_4cdec_5_cdec_6Metric_1__cinit__(o, __pyx_empty_tuple, NULL) < 0)) {
+    Py_DECREF(o); o = 0;
+  }
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec_Grammar(PyObject *o) {
-  {
-    PyObject *etype, *eval, *etb;
-    PyErr_Fetch(&etype, &eval, &etb);
-    ++Py_REFCNT(o);
-    __pyx_pw_4cdec_5_cdec_7Grammar_1__dealloc__(o);
-    if (PyErr_Occurred()) PyErr_WriteUnraisable(o);
-    --Py_REFCNT(o);
-    PyErr_Restore(etype, eval, etb);
+static void __pyx_tp_dealloc_4cdec_5_cdec_Metric(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec_Metric *p = (struct __pyx_obj_4cdec_5_cdec_Metric *)o;
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && !_PyGC_FINALIZED(o)) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
   }
+  #endif
+  PyObject_GC_UnTrack(o);
+  Py_CLEAR(p->scorer);
   (*Py_TYPE(o)->tp_free)(o);
 }
 
-static PyObject *__pyx_getprop_4cdec_5_cdec_7Grammar_name(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_7Grammar_4name_1__get__(o);
+static int __pyx_tp_traverse_4cdec_5_cdec_Metric(PyObject *o, visitproc v, void *a) {
+  int e;
+  struct __pyx_obj_4cdec_5_cdec_Metric *p = (struct __pyx_obj_4cdec_5_cdec_Metric *)o;
+  if (p->scorer) {
+    e = (*v)(((PyObject*)p->scorer), a); if (e) return e;
+  }
+  return 0;
 }
 
-static int __pyx_setprop_4cdec_5_cdec_7Grammar_name(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
-  if (v) {
-    return __pyx_pw_4cdec_5_cdec_7Grammar_4name_3__set__(o, v);
-  }
-  else {
-    PyErr_SetString(PyExc_NotImplementedError, "__del__");
-    return -1;
-  }
+static int __pyx_tp_clear_4cdec_5_cdec_Metric(PyObject *o) {
+  PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec_Metric *p = (struct __pyx_obj_4cdec_5_cdec_Metric *)o;
+  tmp = ((PyObject*)p->scorer);
+  p->scorer = ((struct __pyx_obj_4cdec_5_cdec_Scorer *)Py_None); Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec_Grammar[] = {
+static PyMethodDef __pyx_methods_4cdec_5_cdec_Metric[] = {
+  {__Pyx_NAMESTR("score"), (PyCFunction)__pyx_pw_4cdec_5_cdec_6Metric_5score, METH_NOARGS, __Pyx_DOCSTR(0)},
+  {__Pyx_NAMESTR("evaluate"), (PyCFunction)__pyx_pw_4cdec_5_cdec_6Metric_7evaluate, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
   {0, 0, 0, 0}
 };
 
-static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_Grammar[] = {
-  {(char *)"name", __pyx_getprop_4cdec_5_cdec_7Grammar_name, __pyx_setprop_4cdec_5_cdec_7Grammar_name, 0, 0},
-  {0, 0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec_Grammar = {
+static PyTypeObject __pyx_type_4cdec_5_cdec_Metric = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.Grammar"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_Grammar), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.Metric"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_Metric), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_Grammar, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_Metric, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -22787,22 +24026,22 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Grammar = {
   0, /*tp_as_sequence*/
   0, /*tp_as_mapping*/
   0, /*tp_hash*/
-  0, /*tp_call*/
+  __pyx_pw_4cdec_5_cdec_6Metric_3__call__, /*tp_call*/
   0, /*tp_str*/
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  0, /*tp_traverse*/
-  0, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec_Metric, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec_Metric, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
-  __pyx_pw_4cdec_5_cdec_7Grammar_3__iter__, /*tp_iter*/
+  0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_Grammar, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_Metric, /*tp_methods*/
   0, /*tp_members*/
-  __pyx_getsets_4cdec_5_cdec_Grammar, /*tp_getset*/
+  0, /*tp_getset*/
   0, /*tp_base*/
   0, /*tp_dict*/
   0, /*tp_descr_get*/
@@ -22810,7 +24049,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Grammar = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_Grammar, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_Metric, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -22822,82 +24061,99 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Grammar = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
-static struct __pyx_vtabstruct_4cdec_5_cdec_Hypergraph __pyx_vtable_4cdec_5_cdec_Hypergraph;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_Hypergraph(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec_Hypergraph *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec_Decoder(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+  struct __pyx_obj_4cdec_5_cdec_Decoder *p;
   PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
+  if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) {
+    o = (*t->tp_alloc)(t, 0);
+  } else {
+    o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0);
+  }
   if (unlikely(!o)) return 0;
-  p = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)o);
-  p->__pyx_vtab = __pyx_vtabptr_4cdec_5_cdec_Hypergraph;
+  p = ((struct __pyx_obj_4cdec_5_cdec_Decoder *)o);
+  p->weights = ((struct __pyx_obj_4cdec_5_cdec_DenseVector *)Py_None); Py_INCREF(Py_None);
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec_Hypergraph(PyObject *o) {
+static void __pyx_tp_dealloc_4cdec_5_cdec_Decoder(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec_Decoder *p = (struct __pyx_obj_4cdec_5_cdec_Decoder *)o;
+  #if PY_VERSION_HEX >= 0x030400a1
+  if (unlikely(Py_TYPE(o)->tp_finalize) && !_PyGC_FINALIZED(o)) {
+    if (PyObject_CallFinalizerFromDealloc(o)) return;
+  }
+  #endif
+  PyObject_GC_UnTrack(o);
   {
     PyObject *etype, *eval, *etb;
     PyErr_Fetch(&etype, &eval, &etb);
     ++Py_REFCNT(o);
-    __pyx_pw_4cdec_5_cdec_10Hypergraph_1__dealloc__(o);
-    if (PyErr_Occurred()) PyErr_WriteUnraisable(o);
+    __pyx_pw_4cdec_5_cdec_7Decoder_3__dealloc__(o);
     --Py_REFCNT(o);
     PyErr_Restore(etype, eval, etb);
   }
+  Py_CLEAR(p->weights);
   (*Py_TYPE(o)->tp_free)(o);
 }
 
-static PyObject *__pyx_getprop_4cdec_5_cdec_10Hypergraph_edges(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_10Hypergraph_5edges_1__get__(o);
+static int __pyx_tp_traverse_4cdec_5_cdec_Decoder(PyObject *o, visitproc v, void *a) {
+  int e;
+  struct __pyx_obj_4cdec_5_cdec_Decoder *p = (struct __pyx_obj_4cdec_5_cdec_Decoder *)o;
+  if (p->weights) {
+    e = (*v)(((PyObject*)p->weights), a); if (e) return e;
+  }
+  return 0;
 }
 
-static PyObject *__pyx_getprop_4cdec_5_cdec_10Hypergraph_nodes(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_10Hypergraph_5nodes_1__get__(o);
+static int __pyx_tp_clear_4cdec_5_cdec_Decoder(PyObject *o) {
+  PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec_Decoder *p = (struct __pyx_obj_4cdec_5_cdec_Decoder *)o;
+  tmp = ((PyObject*)p->weights);
+  p->weights = ((struct __pyx_obj_4cdec_5_cdec_DenseVector *)Py_None); Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  return 0;
 }
 
-static PyObject *__pyx_getprop_4cdec_5_cdec_10Hypergraph_goal(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_10Hypergraph_4goal_1__get__(o);
+static PyObject *__pyx_getprop_4cdec_5_cdec_7Decoder_weights(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_7Decoder_7weights_1__get__(o);
 }
 
-static PyObject *__pyx_getprop_4cdec_5_cdec_10Hypergraph_npaths(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_10Hypergraph_6npaths_1__get__(o);
+static int __pyx_setprop_4cdec_5_cdec_7Decoder_weights(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
+  if (v) {
+    return __pyx_pw_4cdec_5_cdec_7Decoder_7weights_3__set__(o, v);
+  }
+  else {
+    PyErr_SetString(PyExc_NotImplementedError, "__del__");
+    return -1;
+  }
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec_Hypergraph[] = {
-  {__Pyx_NAMESTR("viterbi"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_3viterbi, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_2viterbi)},
-  {__Pyx_NAMESTR("viterbi_trees"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_5viterbi_trees, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_4viterbi_trees)},
-  {__Pyx_NAMESTR("viterbi_features"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_7viterbi_features, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_6viterbi_features)},
-  {__Pyx_NAMESTR("viterbi_forest"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_9viterbi_forest, METH_NOARGS, __Pyx_DOCSTR(0)},
-  {__Pyx_NAMESTR("viterbi_joshua"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_11viterbi_joshua, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_10viterbi_joshua)},
-  {__Pyx_NAMESTR("kbest"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_13kbest, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_12kbest)},
-  {__Pyx_NAMESTR("kbest_trees"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_16kbest_trees, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_15kbest_trees)},
-  {__Pyx_NAMESTR("kbest_features"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_19kbest_features, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_18kbest_features)},
-  {__Pyx_NAMESTR("sample"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_22sample, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_21sample)},
-  {__Pyx_NAMESTR("sample_trees"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_25sample_trees, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_24sample_trees)},
-  {__Pyx_NAMESTR("intersect"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_28intersect, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_27intersect)},
-  {__Pyx_NAMESTR("prune"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_30prune, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_29prune)},
-  {__Pyx_NAMESTR("lattice"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_32lattice, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_31lattice)},
-  {__Pyx_NAMESTR("plf"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_34plf, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_33plf)},
-  {__Pyx_NAMESTR("reweight"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_36reweight, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_35reweight)},
-  {__Pyx_NAMESTR("inside_outside"), (PyCFunction)__pyx_pw_4cdec_5_cdec_10Hypergraph_38inside_outside, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_10Hypergraph_37inside_outside)},
+static PyObject *__pyx_getprop_4cdec_5_cdec_7Decoder_formalism(PyObject *o, CYTHON_UNUSED void *x) {
+  return __pyx_pw_4cdec_5_cdec_7Decoder_9formalism_1__get__(o);
+}
+
+static PyMethodDef __pyx_methods_4cdec_5_cdec_Decoder[] = {
+  {__Pyx_NAMESTR("read_weights"), (PyCFunction)__pyx_pw_4cdec_5_cdec_7Decoder_5read_weights, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_7Decoder_4read_weights)},
+  {__Pyx_NAMESTR("translate"), (PyCFunction)__pyx_pw_4cdec_5_cdec_7Decoder_7translate, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_7Decoder_6translate)},
   {0, 0, 0, 0}
 };
 
-static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_Hypergraph[] = {
-  {(char *)"edges", __pyx_getprop_4cdec_5_cdec_10Hypergraph_edges, 0, 0, 0},
-  {(char *)"nodes", __pyx_getprop_4cdec_5_cdec_10Hypergraph_nodes, 0, 0, 0},
-  {(char *)"goal", __pyx_getprop_4cdec_5_cdec_10Hypergraph_goal, 0, 0, 0},
-  {(char *)"npaths", __pyx_getprop_4cdec_5_cdec_10Hypergraph_npaths, 0, 0, 0},
+static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_Decoder[] = {
+  {(char *)"weights", __pyx_getprop_4cdec_5_cdec_7Decoder_weights, __pyx_setprop_4cdec_5_cdec_7Decoder_weights, 0, 0},
+  {(char *)"formalism", __pyx_getprop_4cdec_5_cdec_7Decoder_formalism, 0, 0, 0},
   {0, 0, 0, 0, 0}
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec_Hypergraph = {
+static PyTypeObject __pyx_type_4cdec_5_cdec_Decoder = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.Hypergraph"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_Hypergraph), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.Decoder"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec_Decoder), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_Hypergraph, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec_Decoder, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -22916,25 +24172,25 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Hypergraph = {
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  0, /*tp_traverse*/
-  0, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec_Decoder, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec_Decoder, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_Hypergraph, /*tp_methods*/
+  __pyx_methods_4cdec_5_cdec_Decoder, /*tp_methods*/
   0, /*tp_members*/
-  __pyx_getsets_4cdec_5_cdec_Hypergraph, /*tp_getset*/
+  __pyx_getsets_4cdec_5_cdec_Decoder, /*tp_getset*/
   0, /*tp_base*/
   0, /*tp_dict*/
   0, /*tp_descr_get*/
   0, /*tp_descr_set*/
   0, /*tp_dictoffset*/
-  0, /*tp_init*/
+  __pyx_pw_4cdec_5_cdec_7Decoder_1__init__, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_Hypergraph, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec_Decoder, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -22946,67 +24202,63 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Hypergraph = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_24___init__[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_24___init__ = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct____iter__[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct____iter__ = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_24___init__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct____iter__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_24___init__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_24___init__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_24___init__];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct____iter__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct____iter__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct____iter__];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *)o);
-  p->__pyx_v_config = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_24___init__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct____iter__(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *)o;
   PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->__pyx_v_config);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_24___init__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_24___init__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_24___init__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *)o);
+  Py_CLEAR(p->__pyx_v_self);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct____iter__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct____iter__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct____iter__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_24___init__(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct____iter__(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *)o;
-  if (p->__pyx_v_config) {
-    e = (*v)(p->__pyx_v_config, a); if (e) return e;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *)o;
+  if (p->__pyx_v_self) {
+    e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
   }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_24___init__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct____iter__(PyObject *o) {
   PyObject* tmp;
-  tmp = ((PyObject*)p->__pyx_v_config);
-  p->__pyx_v_config = ((PyObject*)Py_None); Py_INCREF(Py_None);
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *)o;
+  tmp = ((PyObject*)p->__pyx_v_self);
+  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_DenseVector *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_24___init__[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_24___init__ = {
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct____iter__ = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_24___init__"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct____iter__"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_24___init__, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct____iter__, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -23027,13 +24279,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_24___init__ = {
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_24___init__, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_24___init__, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct____iter__, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct____iter__, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_24___init__, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -23043,7 +24295,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_24___init__ = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_24___init__, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct____iter__, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -23055,68 +24307,168 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_24___init__ = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_CandidateSet(PyTypeObject *t, PyObject *a, PyObject *k) {
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_1___iter__[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_1___iter__ = 0;
+
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_1___iter__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
-  if (unlikely(!o)) return 0;
-  if (unlikely(__pyx_pw_4cdec_5_cdec_12CandidateSet_1__cinit__(o, a, k) < 0)) {
-    Py_DECREF(o); o = 0;
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_1___iter__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_1___iter__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_1___iter__];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__));
+    (void) PyObject_INIT(o, t);
+    PyObject_GC_Track(o);
+  } else {
+    o = (*t->tp_alloc)(t, 0);
+    if (unlikely(!o)) return 0;
   }
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec_CandidateSet(PyObject *o) {
-  {
-    PyObject *etype, *eval, *etb;
-    PyErr_Fetch(&etype, &eval, &etb);
-    ++Py_REFCNT(o);
-    __pyx_pw_4cdec_5_cdec_12CandidateSet_3__dealloc__(o);
-    if (PyErr_Occurred()) PyErr_WriteUnraisable(o);
-    --Py_REFCNT(o);
-    PyErr_Restore(etype, eval, etb);
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_1___iter__(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *)o;
+  PyObject_GC_UnTrack(o);
+  Py_CLEAR(p->__pyx_v_self);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_1___iter__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_1___iter__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_1___iter__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *)o);
+  } else {
+    (*Py_TYPE(o)->tp_free)(o);
   }
-  (*Py_TYPE(o)->tp_free)(o);
 }
-static PyObject *__pyx_sq_item_4cdec_5_cdec_CandidateSet(PyObject *o, Py_ssize_t i) {
-  PyObject *r;
-  PyObject *x = PyInt_FromSsize_t(i); if(!x) return 0;
-  r = Py_TYPE(o)->tp_as_mapping->mp_subscript(o, x);
-  Py_DECREF(x);
-  return r;
+
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_1___iter__(PyObject *o, visitproc v, void *a) {
+  int e;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *)o;
+  if (p->__pyx_v_self) {
+    e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
+  }
+  return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec_CandidateSet[] = {
-  {__Pyx_NAMESTR("add_kbest"), (PyCFunction)__pyx_pw_4cdec_5_cdec_12CandidateSet_12add_kbest, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_12CandidateSet_11add_kbest)},
-  {0, 0, 0, 0}
-};
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_1___iter__(PyObject *o) {
+  PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *)o;
+  tmp = ((PyObject*)p->__pyx_v_self);
+  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)Py_None); Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  return 0;
+}
 
-static PySequenceMethods __pyx_tp_as_sequence_CandidateSet = {
-  __pyx_pw_4cdec_5_cdec_12CandidateSet_5__len__, /*sq_length*/
-  0, /*sq_concat*/
-  0, /*sq_repeat*/
-  __pyx_sq_item_4cdec_5_cdec_CandidateSet, /*sq_item*/
-  0, /*sq_slice*/
-  0, /*sq_ass_item*/
-  0, /*sq_ass_slice*/
-  0, /*sq_contains*/
-  0, /*sq_inplace_concat*/
-  0, /*sq_inplace_repeat*/
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_1___iter__ = {
+  PyVarObject_HEAD_INIT(0, 0)
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_1___iter__"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__), /*tp_basicsize*/
+  0, /*tp_itemsize*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_1___iter__, /*tp_dealloc*/
+  0, /*tp_print*/
+  0, /*tp_getattr*/
+  0, /*tp_setattr*/
+  #if PY_MAJOR_VERSION < 3
+  0, /*tp_compare*/
+  #else
+  0, /*reserved*/
+  #endif
+  0, /*tp_repr*/
+  0, /*tp_as_number*/
+  0, /*tp_as_sequence*/
+  0, /*tp_as_mapping*/
+  0, /*tp_hash*/
+  0, /*tp_call*/
+  0, /*tp_str*/
+  0, /*tp_getattro*/
+  0, /*tp_setattro*/
+  0, /*tp_as_buffer*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+  0, /*tp_doc*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_1___iter__, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_1___iter__, /*tp_clear*/
+  0, /*tp_richcompare*/
+  0, /*tp_weaklistoffset*/
+  0, /*tp_iter*/
+  0, /*tp_iternext*/
+  0, /*tp_methods*/
+  0, /*tp_members*/
+  0, /*tp_getset*/
+  0, /*tp_base*/
+  0, /*tp_dict*/
+  0, /*tp_descr_get*/
+  0, /*tp_descr_set*/
+  0, /*tp_dictoffset*/
+  0, /*tp_init*/
+  0, /*tp_alloc*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_1___iter__, /*tp_new*/
+  0, /*tp_free*/
+  0, /*tp_is_gc*/
+  0, /*tp_bases*/
+  0, /*tp_mro*/
+  0, /*tp_cache*/
+  0, /*tp_subclasses*/
+  0, /*tp_weaklist*/
+  0, /*tp_del*/
+  #if PY_VERSION_HEX >= 0x02060000
+  0, /*tp_version_tag*/
+  #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyMappingMethods __pyx_tp_as_mapping_CandidateSet = {
-  __pyx_pw_4cdec_5_cdec_12CandidateSet_5__len__, /*mp_length*/
-  __pyx_pw_4cdec_5_cdec_12CandidateSet_7__getitem__, /*mp_subscript*/
-  0, /*mp_ass_subscript*/
-};
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_2__phrase[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_2__phrase = 0;
 
-static PyTypeObject __pyx_type_4cdec_5_cdec_CandidateSet = {
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_2__phrase(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+  PyObject *o;
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_2__phrase > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_2__phrase[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_2__phrase];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase));
+    (void) PyObject_INIT(o, t);
+    PyObject_GC_Track(o);
+  } else {
+    o = (*t->tp_alloc)(t, 0);
+    if (unlikely(!o)) return 0;
+  }
+  return o;
+}
+
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_2__phrase(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *)o;
+  PyObject_GC_UnTrack(o);
+  Py_CLEAR(p->__pyx_v_phrase);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_2__phrase < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_2__phrase[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_2__phrase++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *)o);
+  } else {
+    (*Py_TYPE(o)->tp_free)(o);
+  }
+}
+
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_2__phrase(PyObject *o, visitproc v, void *a) {
+  int e;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *)o;
+  if (p->__pyx_v_phrase) {
+    e = (*v)(p->__pyx_v_phrase, a); if (e) return e;
+  }
+  return 0;
+}
+
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_2__phrase(PyObject *o) {
+  PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *)o;
+  tmp = ((PyObject*)p->__pyx_v_phrase);
+  p->__pyx_v_phrase = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  return 0;
+}
+
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_2__phrase = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.CandidateSet"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_CandidateSet), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_2__phrase"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_CandidateSet, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_2__phrase, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -23127,23 +24479,23 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_CandidateSet = {
   #endif
   0, /*tp_repr*/
   0, /*tp_as_number*/
-  &__pyx_tp_as_sequence_CandidateSet, /*tp_as_sequence*/
-  &__pyx_tp_as_mapping_CandidateSet, /*tp_as_mapping*/
+  0, /*tp_as_sequence*/
+  0, /*tp_as_mapping*/
   0, /*tp_hash*/
   0, /*tp_call*/
   0, /*tp_str*/
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  0, /*tp_traverse*/
-  0, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_2__phrase, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_2__phrase, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
-  __pyx_pw_4cdec_5_cdec_12CandidateSet_9__iter__, /*tp_iter*/
+  0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_CandidateSet, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -23153,7 +24505,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_CandidateSet = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_CandidateSet, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_2__phrase, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -23165,91 +24517,77 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_CandidateSet = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_3_genexpr[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_3_genexpr = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_3_genexpr(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_3_genexpr > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_3_genexpr[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_3_genexpr];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *)o);
-  p->__pyx_v_e_tree = 0;
-  p->__pyx_v_f_tree = 0;
-  p->__pyx_v_self = 0;
-  p->__pyx_v_size = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_3_genexpr(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *)o;
   PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->__pyx_v_e_tree);
-  Py_CLEAR(p->__pyx_v_f_tree);
-  Py_CLEAR(p->__pyx_v_self);
-  Py_CLEAR(p->__pyx_v_size);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *)o);
+  Py_CLEAR(p->__pyx_outer_scope);
+  Py_CLEAR(p->__pyx_v_w);
+  Py_CLEAR(p->__pyx_t_0);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_3_genexpr < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_3_genexpr[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_3_genexpr++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_3_genexpr(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *)o;
-  if (p->__pyx_v_e_tree) {
-    e = (*v)(p->__pyx_v_e_tree, a); if (e) return e;
-  }
-  if (p->__pyx_v_f_tree) {
-    e = (*v)(p->__pyx_v_f_tree, a); if (e) return e;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *)o;
+  if (p->__pyx_outer_scope) {
+    e = (*v)(((PyObject*)p->__pyx_outer_scope), a); if (e) return e;
   }
-  if (p->__pyx_v_self) {
-    e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
+  if (p->__pyx_v_w) {
+    e = (*v)(p->__pyx_v_w, a); if (e) return e;
   }
-  if (p->__pyx_v_size) {
-    e = (*v)(p->__pyx_v_size, a); if (e) return e;
+  if (p->__pyx_t_0) {
+    e = (*v)(p->__pyx_t_0, a); if (e) return e;
   }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_3_genexpr(PyObject *o) {
   PyObject* tmp;
-  tmp = ((PyObject*)p->__pyx_v_e_tree);
-  p->__pyx_v_e_tree = ((PyObject*)Py_None); Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_f_tree);
-  p->__pyx_v_f_tree = ((PyObject*)Py_None); Py_INCREF(Py_None);
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *)o;
+  tmp = ((PyObject*)p->__pyx_outer_scope);
+  p->__pyx_outer_scope = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_self);
-  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)Py_None); Py_INCREF(Py_None);
+  tmp = ((PyObject*)p->__pyx_v_w);
+  p->__pyx_v_w = Py_None; Py_INCREF(Py_None);
   Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_size);
-  p->__pyx_v_size = Py_None; Py_INCREF(Py_None);
+  tmp = ((PyObject*)p->__pyx_t_0);
+  p->__pyx_t_0 = Py_None; Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees = {
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_3_genexpr = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_9_kbest_trees"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_3_genexpr"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_3_genexpr, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -23270,13 +24608,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees = {
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_3_genexpr, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_3_genexpr, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -23286,7 +24624,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_3_genexpr, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -23298,67 +24636,63 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_19_todot[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_19_todot = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_4___get__[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_4___get__ = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_19_todot(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_4___get__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_19_todot > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_19_todot[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_19_todot];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_4___get__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_4___get__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_4___get__];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *)o);
-  p->__pyx_v_self = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_19_todot(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_4___get__(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *)o;
   PyObject_GC_UnTrack(o);
   Py_CLEAR(p->__pyx_v_self);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_19_todot < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_19_todot[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_19_todot++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *)o);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_4___get__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_4___get__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_4___get__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_19_todot(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_4___get__(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *)o;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *)o;
   if (p->__pyx_v_self) {
     e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
   }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_19_todot(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_4___get__(PyObject *o) {
   PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *)o;
   tmp = ((PyObject*)p->__pyx_v_self);
-  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Lattice *)Py_None); Py_INCREF(Py_None);
+  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_TRule *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_19_todot[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_19_todot = {
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_4___get__ = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_19_todot"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_4___get__"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_19_todot, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_4___get__, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -23379,13 +24713,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_19_todot = {
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_19_todot, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_19_todot, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_4___get__, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_4___get__, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_19_todot, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -23395,7 +24729,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_19_todot = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_19_todot, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_4___get__, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -23407,25 +24741,25 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_19_todot = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
 static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_5___str__[8];
 static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_5___str__ = 0;
 
 static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_5___str__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__ *p;
   PyObject *o;
   if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_5___str__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__)))) {
     o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_5___str__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_5___str__];
     memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__));
-    PyObject_INIT(o, t);
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__ *)o);
-  p->__pyx_v_self = 0;
   return o;
 }
 
@@ -23450,18 +24784,14 @@ static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_5___str__(PyObject
 }
 
 static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_5___str__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__ *)o;
   PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__ *)o;
   tmp = ((PyObject*)p->__pyx_v_self);
   p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_TRule *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_5___str__[] = {
-  {0, 0, 0, 0}
-};
-
 static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_5___str__ = {
   PyVarObject_HEAD_INIT(0, 0)
   __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_5___str__"), /*tp_name*/
@@ -23494,7 +24824,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_5___str__ = {
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_5___str__, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -23516,40 +24846,77 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_5___str__ = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_SegmentEvaluator(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_6_genexpr[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_6_genexpr = 0;
+
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_6_genexpr(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
-  if (unlikely(!o)) return 0;
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_6_genexpr > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_6_genexpr[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_6_genexpr];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr));
+    (void) PyObject_INIT(o, t);
+    PyObject_GC_Track(o);
+  } else {
+    o = (*t->tp_alloc)(t, 0);
+    if (unlikely(!o)) return 0;
+  }
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec_SegmentEvaluator(PyObject *o) {
-  {
-    PyObject *etype, *eval, *etb;
-    PyErr_Fetch(&etype, &eval, &etb);
-    ++Py_REFCNT(o);
-    __pyx_pw_4cdec_5_cdec_16SegmentEvaluator_1__dealloc__(o);
-    if (PyErr_Occurred()) PyErr_WriteUnraisable(o);
-    --Py_REFCNT(o);
-    PyErr_Restore(etype, eval, etb);
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_6_genexpr(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *)o;
+  PyObject_GC_UnTrack(o);
+  Py_CLEAR(p->__pyx_outer_scope);
+  Py_CLEAR(p->__pyx_v_feat);
+  Py_CLEAR(p->__pyx_t_0);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_6_genexpr < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_6_genexpr[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_6_genexpr++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *)o);
+  } else {
+    (*Py_TYPE(o)->tp_free)(o);
   }
-  (*Py_TYPE(o)->tp_free)(o);
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec_SegmentEvaluator[] = {
-  {__Pyx_NAMESTR("evaluate"), (PyCFunction)__pyx_pw_4cdec_5_cdec_16SegmentEvaluator_3evaluate, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_16SegmentEvaluator_2evaluate)},
-  {__Pyx_NAMESTR("candidate_set"), (PyCFunction)__pyx_pw_4cdec_5_cdec_16SegmentEvaluator_5candidate_set, METH_NOARGS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_16SegmentEvaluator_4candidate_set)},
-  {0, 0, 0, 0}
-};
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_6_genexpr(PyObject *o, visitproc v, void *a) {
+  int e;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *)o;
+  if (p->__pyx_outer_scope) {
+    e = (*v)(((PyObject*)p->__pyx_outer_scope), a); if (e) return e;
+  }
+  if (p->__pyx_v_feat) {
+    e = (*v)(p->__pyx_v_feat, a); if (e) return e;
+  }
+  if (p->__pyx_t_0) {
+    e = (*v)(p->__pyx_t_0, a); if (e) return e;
+  }
+  return 0;
+}
 
-static PyTypeObject __pyx_type_4cdec_5_cdec_SegmentEvaluator = {
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_6_genexpr(PyObject *o) {
+  PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *)o;
+  tmp = ((PyObject*)p->__pyx_outer_scope);
+  p->__pyx_outer_scope = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__ *)Py_None); Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_v_feat);
+  p->__pyx_v_feat = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_t_0);
+  p->__pyx_t_0 = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  return 0;
+}
+
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_6_genexpr = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.SegmentEvaluator"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_SegmentEvaluator), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_6_genexpr"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_SegmentEvaluator, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_6_genexpr, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -23568,15 +24935,15 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_SegmentEvaluator = {
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  0, /*tp_traverse*/
-  0, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_6_genexpr, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_6_genexpr, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_SegmentEvaluator, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -23586,7 +24953,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_SegmentEvaluator = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_SegmentEvaluator, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_6_genexpr, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -23598,67 +24965,70 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_SegmentEvaluator = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_16___get__[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_16___get__ = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_7___iter__[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_7___iter__ = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_16___get__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_7___iter__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_16___get__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_16___get__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_16___get__];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_7___iter__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_7___iter__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_7___iter__];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *)o);
-  p->__pyx_v_self = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_16___get__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_7___iter__(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *)o;
   PyObject_GC_UnTrack(o);
   Py_CLEAR(p->__pyx_v_self);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_16___get__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_16___get__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_16___get__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *)o);
+  Py_CLEAR(p->__pyx_v_trule);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_7___iter__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_7___iter__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_7___iter__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_16___get__(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_7___iter__(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *)o;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *)o;
   if (p->__pyx_v_self) {
     e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
   }
+  if (p->__pyx_v_trule) {
+    e = (*v)(((PyObject*)p->__pyx_v_trule), a); if (e) return e;
+  }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_16___get__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_7___iter__(PyObject *o) {
   PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *)o;
   tmp = ((PyObject*)p->__pyx_v_self);
-  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)Py_None); Py_INCREF(Py_None);
+  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Grammar *)Py_None); Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_v_trule);
+  p->__pyx_v_trule = ((struct __pyx_obj_4cdec_5_cdec_TRule *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_16___get__[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_16___get__ = {
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_7___iter__ = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_16___get__"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_7___iter__"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_16___get__, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_7___iter__, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -23679,13 +25049,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_16___get__ = {
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_16___get__, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_16___get__, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_7___iter__, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_7___iter__, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_16___get__, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -23695,7 +25065,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_16___get__ = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_16___get__, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_7___iter__, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -23707,83 +25077,70 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_16___get__ = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_25_genexpr[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_25_genexpr = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_8_kbest[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_8_kbest = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_25_genexpr(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_8_kbest(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_25_genexpr > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_25_genexpr[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_25_genexpr];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_8_kbest > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_8_kbest[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_8_kbest];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *)o);
-  p->__pyx_outer_scope = 0;
-  p->__pyx_v_kv = 0;
-  p->__pyx_t_0 = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_25_genexpr(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_8_kbest(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *)o;
   PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->__pyx_outer_scope);
-  Py_CLEAR(p->__pyx_v_kv);
-  Py_CLEAR(p->__pyx_t_0);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_25_genexpr < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_25_genexpr[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_25_genexpr++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *)o);
+  Py_CLEAR(p->__pyx_v_self);
+  Py_CLEAR(p->__pyx_v_size);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_8_kbest < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_8_kbest[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_8_kbest++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_25_genexpr(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_8_kbest(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *)o;
-  if (p->__pyx_outer_scope) {
-    e = (*v)(((PyObject*)p->__pyx_outer_scope), a); if (e) return e;
-  }
-  if (p->__pyx_v_kv) {
-    e = (*v)(p->__pyx_v_kv, a); if (e) return e;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *)o;
+  if (p->__pyx_v_self) {
+    e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
   }
-  if (p->__pyx_t_0) {
-    e = (*v)(p->__pyx_t_0, a); if (e) return e;
+  if (p->__pyx_v_size) {
+    e = (*v)(p->__pyx_v_size, a); if (e) return e;
   }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_25_genexpr(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_8_kbest(PyObject *o) {
   PyObject* tmp;
-  tmp = ((PyObject*)p->__pyx_outer_scope);
-  p->__pyx_outer_scope = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *)Py_None); Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_kv);
-  p->__pyx_v_kv = Py_None; Py_INCREF(Py_None);
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *)o;
+  tmp = ((PyObject*)p->__pyx_v_self);
+  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_t_0);
-  p->__pyx_t_0 = Py_None; Py_INCREF(Py_None);
+  tmp = ((PyObject*)p->__pyx_v_size);
+  p->__pyx_v_size = Py_None; Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_25_genexpr[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_25_genexpr = {
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_8_kbest = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_25_genexpr"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_8_kbest"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_25_genexpr, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_8_kbest, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -23804,13 +25161,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_25_genexpr = {
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_25_genexpr, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_25_genexpr, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_8_kbest, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_8_kbest, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_25_genexpr, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -23820,7 +25177,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_25_genexpr = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_25_genexpr, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_8_kbest, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -23832,83 +25189,72 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_25_genexpr = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_3_genexpr[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_3_genexpr = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_3_genexpr(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_3_genexpr > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_3_genexpr[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_3_genexpr];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *)o);
-  p->__pyx_outer_scope = 0;
-  p->__pyx_v_w = 0;
-  p->__pyx_t_0 = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_3_genexpr(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *)o;
   PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->__pyx_outer_scope);
-  Py_CLEAR(p->__pyx_v_w);
-  Py_CLEAR(p->__pyx_t_0);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_3_genexpr < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_3_genexpr[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_3_genexpr++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *)o);
+  Py_CLEAR(p->__pyx_v_e_tree);
+  Py_CLEAR(p->__pyx_v_f_tree);
+  Py_CLEAR(p->__pyx_v_self);
+  Py_CLEAR(p->__pyx_v_size);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_3_genexpr(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *)o;
-  if (p->__pyx_outer_scope) {
-    e = (*v)(((PyObject*)p->__pyx_outer_scope), a); if (e) return e;
-  }
-  if (p->__pyx_v_w) {
-    e = (*v)(p->__pyx_v_w, a); if (e) return e;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *)o;
+  if (p->__pyx_v_self) {
+    e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
   }
-  if (p->__pyx_t_0) {
-    e = (*v)(p->__pyx_t_0, a); if (e) return e;
+  if (p->__pyx_v_size) {
+    e = (*v)(p->__pyx_v_size, a); if (e) return e;
   }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_3_genexpr(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees(PyObject *o) {
   PyObject* tmp;
-  tmp = ((PyObject*)p->__pyx_outer_scope);
-  p->__pyx_outer_scope = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_2__phrase *)Py_None); Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_w);
-  p->__pyx_v_w = Py_None; Py_INCREF(Py_None);
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees *)o;
+  tmp = ((PyObject*)p->__pyx_v_self);
+  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_t_0);
-  p->__pyx_t_0 = Py_None; Py_INCREF(Py_None);
+  tmp = ((PyObject*)p->__pyx_v_size);
+  p->__pyx_v_size = Py_None; Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_3_genexpr[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_3_genexpr = {
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_3_genexpr"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_3_genexpr), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_9_kbest_trees"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_3_genexpr, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -23929,13 +25275,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_3_genexpr = {
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_3_genexpr, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_3_genexpr, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_3_genexpr, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -23945,7 +25291,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_3_genexpr = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_3_genexpr, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -23957,67 +25303,77 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_3_genexpr = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_11_sample[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_11_sample = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_10_kbest_features[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_10_kbest_features = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_11_sample(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_10_kbest_features(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_11_sample > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_11_sample[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_11_sample];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_10_kbest_features > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_10_kbest_features[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_10_kbest_features];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *)o);
-  p->__pyx_v_self = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_11_sample(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_10_kbest_features(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *)o;
   PyObject_GC_UnTrack(o);
+  Py_CLEAR(p->__pyx_v_fmap);
   Py_CLEAR(p->__pyx_v_self);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_11_sample < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_11_sample[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_11_sample++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *)o);
+  Py_CLEAR(p->__pyx_v_size);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_10_kbest_features < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_10_kbest_features[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_10_kbest_features++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_11_sample(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_10_kbest_features(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *)o;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *)o;
+  if (p->__pyx_v_fmap) {
+    e = (*v)(((PyObject*)p->__pyx_v_fmap), a); if (e) return e;
+  }
   if (p->__pyx_v_self) {
     e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
   }
+  if (p->__pyx_v_size) {
+    e = (*v)(p->__pyx_v_size, a); if (e) return e;
+  }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_11_sample(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_10_kbest_features(PyObject *o) {
   PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features *)o;
+  tmp = ((PyObject*)p->__pyx_v_fmap);
+  p->__pyx_v_fmap = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)Py_None); Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
   tmp = ((PyObject*)p->__pyx_v_self);
   p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_v_size);
+  p->__pyx_v_size = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_11_sample[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_11_sample = {
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_10_kbest_features = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_11_sample"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_10_kbest_features"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_10_kbest_features), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_11_sample, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_10_kbest_features, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -24038,13 +25394,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_11_sample = {
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_11_sample, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_11_sample, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_10_kbest_features, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_10_kbest_features, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_11_sample, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -24054,7 +25410,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_11_sample = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_11_sample, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_10_kbest_features, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -24066,75 +25422,63 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_11_sample = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_8_kbest[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_8_kbest = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_11_sample[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_11_sample = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_8_kbest(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_11_sample(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_8_kbest > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_8_kbest[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_8_kbest];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_11_sample > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_11_sample[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_11_sample];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *)o);
-  p->__pyx_v_self = 0;
-  p->__pyx_v_size = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_8_kbest(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_11_sample(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *)o;
   PyObject_GC_UnTrack(o);
   Py_CLEAR(p->__pyx_v_self);
-  Py_CLEAR(p->__pyx_v_size);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_8_kbest < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_8_kbest[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_8_kbest++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *)o);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_11_sample < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_11_sample[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_11_sample++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_8_kbest(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_11_sample(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *)o;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *)o;
   if (p->__pyx_v_self) {
     e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
   }
-  if (p->__pyx_v_size) {
-    e = (*v)(p->__pyx_v_size, a); if (e) return e;
-  }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_8_kbest(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_11_sample(PyObject *o) {
   PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample *)o;
   tmp = ((PyObject*)p->__pyx_v_self);
   p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_size);
-  p->__pyx_v_size = Py_None; Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_8_kbest[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_8_kbest = {
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_11_sample = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_8_kbest"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_8_kbest), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_11_sample"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_11_sample), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_8_kbest, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_11_sample, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -24155,13 +25499,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_8_kbest = {
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_8_kbest, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_8_kbest, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_11_sample, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_11_sample, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_8_kbest, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -24171,7 +25515,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_8_kbest = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_8_kbest, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_11_sample, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -24183,67 +25527,63 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_8_kbest = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_14___get__[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_14___get__ = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_12_sample_trees[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_12_sample_trees = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_14___get__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_12_sample_trees(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_14___get__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_14___get__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_14___get__];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_12_sample_trees > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_12_sample_trees[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_12_sample_trees];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *)o);
-  p->__pyx_v_self = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_14___get__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_12_sample_trees(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *)o;
   PyObject_GC_UnTrack(o);
   Py_CLEAR(p->__pyx_v_self);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_14___get__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_14___get__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_14___get__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *)o);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_12_sample_trees < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_12_sample_trees[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_12_sample_trees++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_14___get__(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_12_sample_trees(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *)o;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *)o;
   if (p->__pyx_v_self) {
     e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
   }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_14___get__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_12_sample_trees(PyObject *o) {
   PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *)o;
   tmp = ((PyObject*)p->__pyx_v_self);
   p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_14___get__[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_14___get__ = {
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_12_sample_trees = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_14___get__"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_12_sample_trees"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_14___get__, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_12_sample_trees, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -24264,13 +25604,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_14___get__ = {
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_14___get__, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_14___get__, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_12_sample_trees, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_12_sample_trees, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_14___get__, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -24280,7 +25620,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_14___get__ = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_14___get__, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_12_sample_trees, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -24292,75 +25632,63 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_14___get__ = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_7___iter__[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_7___iter__ = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_13___get__[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_13___get__ = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_7___iter__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_13___get__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_7___iter__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_7___iter__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_7___iter__];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_13___get__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_13___get__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_13___get__];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *)o);
-  p->__pyx_v_self = 0;
-  p->__pyx_v_trule = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_7___iter__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_13___get__(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *)o;
   PyObject_GC_UnTrack(o);
   Py_CLEAR(p->__pyx_v_self);
-  Py_CLEAR(p->__pyx_v_trule);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_7___iter__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_7___iter__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_7___iter__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *)o);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_13___get__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_13___get__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_13___get__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_7___iter__(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_13___get__(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *)o;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *)o;
   if (p->__pyx_v_self) {
     e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
   }
-  if (p->__pyx_v_trule) {
-    e = (*v)(((PyObject*)p->__pyx_v_trule), a); if (e) return e;
-  }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_7___iter__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__ *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_13___get__(PyObject *o) {
   PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__ *)o;
   tmp = ((PyObject*)p->__pyx_v_self);
-  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Grammar *)Py_None); Py_INCREF(Py_None);
-  Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_trule);
-  p->__pyx_v_trule = ((struct __pyx_obj_4cdec_5_cdec_TRule *)Py_None); Py_INCREF(Py_None);
+  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_7___iter__[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_7___iter__ = {
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_13___get__ = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_7___iter__"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_7___iter__), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_13___get__"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_13___get__), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_7___iter__, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_13___get__, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -24381,13 +25709,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_7___iter__ = {
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_7___iter__, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_7___iter__, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_13___get__, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_13___get__, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_7___iter__, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -24397,7 +25725,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_7___iter__ = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_7___iter__, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_13___get__, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -24409,24 +25737,63 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_7___iter__ = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_TextGrammar(PyTypeObject *t, PyObject *a, PyObject *k) {
-  PyObject *o = __pyx_tp_new_4cdec_5_cdec_Grammar(t, a, k);
-  if (unlikely(!o)) return 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_14___get__[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_14___get__ = 0;
+
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_14___get__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+  PyObject *o;
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_14___get__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_14___get__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_14___get__];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__));
+    (void) PyObject_INIT(o, t);
+    PyObject_GC_Track(o);
+  } else {
+    o = (*t->tp_alloc)(t, 0);
+    if (unlikely(!o)) return 0;
+  }
   return o;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec_TextGrammar[] = {
-  {0, 0, 0, 0}
-};
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_14___get__(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *)o;
+  PyObject_GC_UnTrack(o);
+  Py_CLEAR(p->__pyx_v_self);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_14___get__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_14___get__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_14___get__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *)o);
+  } else {
+    (*Py_TYPE(o)->tp_free)(o);
+  }
+}
 
-static PyTypeObject __pyx_type_4cdec_5_cdec_TextGrammar = {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_14___get__(PyObject *o, visitproc v, void *a) {
+  int e;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *)o;
+  if (p->__pyx_v_self) {
+    e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
+  }
+  return 0;
+}
+
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_14___get__(PyObject *o) {
+  PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__ *)o;
+  tmp = ((PyObject*)p->__pyx_v_self);
+  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)Py_None); Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  return 0;
+}
+
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_14___get__ = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.TextGrammar"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_TextGrammar), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_14___get__"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_14___get__), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_Grammar, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_14___get__, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -24445,19 +25812,15 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_TextGrammar = {
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  0, /*tp_traverse*/
-  0, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_14___get__, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_14___get__, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
-  #if CYTHON_COMPILING_IN_PYPY
-  __pyx_pw_4cdec_5_cdec_7Grammar_3__iter__, /*tp_iter*/
-  #else
   0, /*tp_iter*/
-  #endif
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_TextGrammar, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -24465,9 +25828,9 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_TextGrammar = {
   0, /*tp_descr_get*/
   0, /*tp_descr_set*/
   0, /*tp_dictoffset*/
-  __pyx_pw_4cdec_5_cdec_11TextGrammar_1__init__, /*tp_init*/
+  0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_TextGrammar, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_14___get__, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -24479,88 +25842,63 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_TextGrammar = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec_Decoder(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec_Decoder *p;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_15___get__[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_15___get__ = 0;
+
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_15___get__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  o = (*t->tp_alloc)(t, 0);
-  if (unlikely(!o)) return 0;
-  p = ((struct __pyx_obj_4cdec_5_cdec_Decoder *)o);
-  p->weights = ((struct __pyx_obj_4cdec_5_cdec_DenseVector *)Py_None); Py_INCREF(Py_None);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_15___get__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_15___get__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_15___get__];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__));
+    (void) PyObject_INIT(o, t);
+    PyObject_GC_Track(o);
+  } else {
+    o = (*t->tp_alloc)(t, 0);
+    if (unlikely(!o)) return 0;
+  }
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec_Decoder(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec_Decoder *p = (struct __pyx_obj_4cdec_5_cdec_Decoder *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_15___get__(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *)o;
   PyObject_GC_UnTrack(o);
-  {
-    PyObject *etype, *eval, *etb;
-    PyErr_Fetch(&etype, &eval, &etb);
-    ++Py_REFCNT(o);
-    __pyx_pw_4cdec_5_cdec_7Decoder_3__dealloc__(o);
-    if (PyErr_Occurred()) PyErr_WriteUnraisable(o);
-    --Py_REFCNT(o);
-    PyErr_Restore(etype, eval, etb);
+  Py_CLEAR(p->__pyx_v_self);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_15___get__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_15___get__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_15___get__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *)o);
+  } else {
+    (*Py_TYPE(o)->tp_free)(o);
   }
-  Py_CLEAR(p->weights);
-  (*Py_TYPE(o)->tp_free)(o);
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec_Decoder(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_15___get__(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec_Decoder *p = (struct __pyx_obj_4cdec_5_cdec_Decoder *)o;
-  if (p->weights) {
-    e = (*v)(((PyObject*)p->weights), a); if (e) return e;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *)o;
+  if (p->__pyx_v_self) {
+    e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
   }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec_Decoder(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec_Decoder *p = (struct __pyx_obj_4cdec_5_cdec_Decoder *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_15___get__(PyObject *o) {
   PyObject* tmp;
-  tmp = ((PyObject*)p->weights);
-  p->weights = ((struct __pyx_obj_4cdec_5_cdec_DenseVector *)Py_None); Py_INCREF(Py_None);
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__ *)o;
+  tmp = ((PyObject*)p->__pyx_v_self);
+  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyObject *__pyx_getprop_4cdec_5_cdec_7Decoder_weights(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_7Decoder_7weights_1__get__(o);
-}
-
-static int __pyx_setprop_4cdec_5_cdec_7Decoder_weights(PyObject *o, PyObject *v, CYTHON_UNUSED void *x) {
-  if (v) {
-    return __pyx_pw_4cdec_5_cdec_7Decoder_7weights_3__set__(o, v);
-  }
-  else {
-    PyErr_SetString(PyExc_NotImplementedError, "__del__");
-    return -1;
-  }
-}
-
-static PyObject *__pyx_getprop_4cdec_5_cdec_7Decoder_formalism(PyObject *o, CYTHON_UNUSED void *x) {
-  return __pyx_pw_4cdec_5_cdec_7Decoder_9formalism_1__get__(o);
-}
-
-static PyMethodDef __pyx_methods_4cdec_5_cdec_Decoder[] = {
-  {__Pyx_NAMESTR("read_weights"), (PyCFunction)__pyx_pw_4cdec_5_cdec_7Decoder_5read_weights, METH_O, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_7Decoder_4read_weights)},
-  {__Pyx_NAMESTR("translate"), (PyCFunction)__pyx_pw_4cdec_5_cdec_7Decoder_7translate, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_4cdec_5_cdec_7Decoder_6translate)},
-  {0, 0, 0, 0}
-};
-
-static struct PyGetSetDef __pyx_getsets_4cdec_5_cdec_Decoder[] = {
-  {(char *)"weights", __pyx_getprop_4cdec_5_cdec_7Decoder_weights, __pyx_setprop_4cdec_5_cdec_7Decoder_weights, 0, 0},
-  {(char *)"formalism", __pyx_getprop_4cdec_5_cdec_7Decoder_formalism, 0, 0, 0},
-  {0, 0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec_Decoder = {
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_15___get__ = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.Decoder"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec_Decoder), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_15___get__"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_15___get__), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec_Decoder, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_15___get__, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -24579,25 +25917,25 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Decoder = {
   0, /*tp_getattro*/
   0, /*tp_setattro*/
   0, /*tp_as_buffer*/
-  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec_Decoder, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec_Decoder, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_15___get__, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_15___get__, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec_Decoder, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
-  __pyx_getsets_4cdec_5_cdec_Decoder, /*tp_getset*/
+  0, /*tp_getset*/
   0, /*tp_base*/
   0, /*tp_dict*/
   0, /*tp_descr_get*/
   0, /*tp_descr_set*/
   0, /*tp_dictoffset*/
-  __pyx_pw_4cdec_5_cdec_7Decoder_1__init__, /*tp_init*/
+  0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec_Decoder, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_15___get__, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -24609,67 +25947,63 @@ static PyTypeObject __pyx_type_4cdec_5_cdec_Decoder = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct____iter__[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct____iter__ = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_16___get__[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_16___get__ = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct____iter__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_16___get__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct____iter__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct____iter__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct____iter__];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_16___get__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_16___get__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_16___get__];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *)o);
-  p->__pyx_v_self = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct____iter__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_16___get__(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *)o;
   PyObject_GC_UnTrack(o);
   Py_CLEAR(p->__pyx_v_self);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct____iter__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct____iter__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct____iter__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *)o);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_16___get__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_16___get__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_16___get__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct____iter__(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_16___get__(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *)o;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *)o;
   if (p->__pyx_v_self) {
     e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
   }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct____iter__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__ *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_16___get__(PyObject *o) {
   PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__ *)o;
   tmp = ((PyObject*)p->__pyx_v_self);
-  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_DenseVector *)Py_None); Py_INCREF(Py_None);
+  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct____iter__[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct____iter__ = {
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_16___get__ = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct____iter__"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct____iter__), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_16___get__"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_16___get__), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct____iter__, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_16___get__, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -24690,13 +26024,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct____iter__ = {
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct____iter__, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct____iter__, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_16___get__, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_16___get__, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct____iter__, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -24706,7 +26040,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct____iter__ = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct____iter__, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_16___get__, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -24718,25 +26052,25 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct____iter__ = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
 static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_17___get__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_17___get__[8];
 static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_17___get__ = 0;
 
 static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_17___get__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_17___get__ *p;
   PyObject *o;
   if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_17___get__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_17___get__)))) {
     o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_17___get__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_17___get__];
     memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_17___get__));
-    PyObject_INIT(o, t);
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_17___get__ *)o);
-  p->__pyx_v_self = 0;
   return o;
 }
 
@@ -24761,18 +26095,14 @@ static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_17___get__(PyObject
 }
 
 static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_17___get__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_17___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_17___get__ *)o;
   PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_17___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_17___get__ *)o;
   tmp = ((PyObject*)p->__pyx_v_self);
   p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_HypergraphNode *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_17___get__[] = {
-  {0, 0, 0, 0}
-};
-
 static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_17___get__ = {
   PyVarObject_HEAD_INIT(0, 0)
   __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_17___get__"), /*tp_name*/
@@ -24805,7 +26135,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_17___get__ = {
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_17___get__, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -24827,25 +26157,25 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_17___get__ = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
 static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_18___iter__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_18___iter__[8];
 static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_18___iter__ = 0;
 
 static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_18___iter__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_18___iter__ *p;
   PyObject *o;
   if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_18___iter__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_18___iter__)))) {
     o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_18___iter__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_18___iter__];
     memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_18___iter__));
-    PyObject_INIT(o, t);
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_18___iter__ *)o);
-  p->__pyx_v_self = 0;
   return o;
 }
 
@@ -24870,18 +26200,14 @@ static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_18___iter__(PyObjec
 }
 
 static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_18___iter__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_18___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_18___iter__ *)o;
   PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_18___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_18___iter__ *)o;
   tmp = ((PyObject*)p->__pyx_v_self);
   p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Lattice *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_18___iter__[] = {
-  {0, 0, 0, 0}
-};
-
 static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_18___iter__ = {
   PyVarObject_HEAD_INIT(0, 0)
   __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_18___iter__"), /*tp_name*/
@@ -24914,7 +26240,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_18___iter__ = {
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_18___iter__, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -24936,83 +26262,210 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_18___iter__ = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_6_genexpr[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_6_genexpr = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_19_todot[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_19_todot = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_6_genexpr(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_19_todot(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_6_genexpr > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_6_genexpr[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_6_genexpr];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_19_todot > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_19_todot[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_19_todot];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *)o);
-  p->__pyx_outer_scope = 0;
-  p->__pyx_v_feat = 0;
-  p->__pyx_t_0 = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_6_genexpr(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_19_todot(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *)o;
+  PyObject_GC_UnTrack(o);
+  Py_CLEAR(p->__pyx_v_self);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_19_todot < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_19_todot[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_19_todot++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *)o);
+  } else {
+    (*Py_TYPE(o)->tp_free)(o);
+  }
+}
+
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_19_todot(PyObject *o, visitproc v, void *a) {
+  int e;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *)o;
+  if (p->__pyx_v_self) {
+    e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
+  }
+  return 0;
+}
+
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_19_todot(PyObject *o) {
+  PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *)o;
+  tmp = ((PyObject*)p->__pyx_v_self);
+  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Lattice *)Py_None); Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  return 0;
+}
+
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_19_todot = {
+  PyVarObject_HEAD_INIT(0, 0)
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_19_todot"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot), /*tp_basicsize*/
+  0, /*tp_itemsize*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_19_todot, /*tp_dealloc*/
+  0, /*tp_print*/
+  0, /*tp_getattr*/
+  0, /*tp_setattr*/
+  #if PY_MAJOR_VERSION < 3
+  0, /*tp_compare*/
+  #else
+  0, /*reserved*/
+  #endif
+  0, /*tp_repr*/
+  0, /*tp_as_number*/
+  0, /*tp_as_sequence*/
+  0, /*tp_as_mapping*/
+  0, /*tp_hash*/
+  0, /*tp_call*/
+  0, /*tp_str*/
+  0, /*tp_getattro*/
+  0, /*tp_setattro*/
+  0, /*tp_as_buffer*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+  0, /*tp_doc*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_19_todot, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_19_todot, /*tp_clear*/
+  0, /*tp_richcompare*/
+  0, /*tp_weaklistoffset*/
+  0, /*tp_iter*/
+  0, /*tp_iternext*/
+  0, /*tp_methods*/
+  0, /*tp_members*/
+  0, /*tp_getset*/
+  0, /*tp_base*/
+  0, /*tp_dict*/
+  0, /*tp_descr_get*/
+  0, /*tp_descr_set*/
+  0, /*tp_dictoffset*/
+  0, /*tp_init*/
+  0, /*tp_alloc*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_19_todot, /*tp_new*/
+  0, /*tp_free*/
+  0, /*tp_is_gc*/
+  0, /*tp_bases*/
+  0, /*tp_mro*/
+  0, /*tp_cache*/
+  0, /*tp_subclasses*/
+  0, /*tp_weaklist*/
+  0, /*tp_del*/
+  #if PY_VERSION_HEX >= 0x02060000
+  0, /*tp_version_tag*/
+  #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
+};
+
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_20_lines[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_20_lines = 0;
+
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_20_lines(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+  PyObject *o;
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_20_lines > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_20_lines[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_20_lines];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines));
+    (void) PyObject_INIT(o, t);
+    PyObject_GC_Track(o);
+  } else {
+    o = (*t->tp_alloc)(t, 0);
+    if (unlikely(!o)) return 0;
+  }
+  return o;
+}
+
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_20_lines(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *)o;
   PyObject_GC_UnTrack(o);
   Py_CLEAR(p->__pyx_outer_scope);
-  Py_CLEAR(p->__pyx_v_feat);
-  Py_CLEAR(p->__pyx_t_0);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_6_genexpr < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_6_genexpr[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_6_genexpr++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *)o);
+  Py_CLEAR(p->__pyx_v_delta);
+  Py_CLEAR(p->__pyx_v_i);
+  Py_CLEAR(p->__pyx_v_label);
+  Py_CLEAR(p->__pyx_v_weight);
+  Py_CLEAR(p->__pyx_t_1);
+  Py_CLEAR(p->__pyx_t_3);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_20_lines < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_20_lines[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_20_lines++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_6_genexpr(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_20_lines(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *)o;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *)o;
   if (p->__pyx_outer_scope) {
     e = (*v)(((PyObject*)p->__pyx_outer_scope), a); if (e) return e;
   }
-  if (p->__pyx_v_feat) {
-    e = (*v)(p->__pyx_v_feat, a); if (e) return e;
+  if (p->__pyx_v_delta) {
+    e = (*v)(p->__pyx_v_delta, a); if (e) return e;
   }
-  if (p->__pyx_t_0) {
-    e = (*v)(p->__pyx_t_0, a); if (e) return e;
+  if (p->__pyx_v_i) {
+    e = (*v)(p->__pyx_v_i, a); if (e) return e;
+  }
+  if (p->__pyx_v_label) {
+    e = (*v)(p->__pyx_v_label, a); if (e) return e;
+  }
+  if (p->__pyx_v_weight) {
+    e = (*v)(p->__pyx_v_weight, a); if (e) return e;
+  }
+  if (p->__pyx_t_1) {
+    e = (*v)(p->__pyx_t_1, a); if (e) return e;
+  }
+  if (p->__pyx_t_3) {
+    e = (*v)(p->__pyx_t_3, a); if (e) return e;
   }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_6_genexpr(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_20_lines(PyObject *o) {
   PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines *)o;
   tmp = ((PyObject*)p->__pyx_outer_scope);
-  p->__pyx_outer_scope = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_5___str__ *)Py_None); Py_INCREF(Py_None);
+  p->__pyx_outer_scope = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_19_todot *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_v_feat);
-  p->__pyx_v_feat = Py_None; Py_INCREF(Py_None);
+  tmp = ((PyObject*)p->__pyx_v_delta);
+  p->__pyx_v_delta = Py_None; Py_INCREF(Py_None);
   Py_XDECREF(tmp);
-  tmp = ((PyObject*)p->__pyx_t_0);
-  p->__pyx_t_0 = Py_None; Py_INCREF(Py_None);
+  tmp = ((PyObject*)p->__pyx_v_i);
+  p->__pyx_v_i = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_v_label);
+  p->__pyx_v_label = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_v_weight);
+  p->__pyx_v_weight = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_t_1);
+  p->__pyx_t_1 = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_t_3);
+  p->__pyx_t_3 = Py_None; Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_6_genexpr[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_6_genexpr = {
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_20_lines = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_6_genexpr"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_6_genexpr), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_20_lines"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_20_lines), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_6_genexpr, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_20_lines, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -25033,13 +26486,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_6_genexpr = {
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_6_genexpr, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_6_genexpr, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_20_lines, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_20_lines, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_6_genexpr, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -25049,7 +26502,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_6_genexpr = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_6_genexpr, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_20_lines, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -25061,67 +26514,63 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_6_genexpr = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_12_sample_trees[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_12_sample_trees = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_21___iter__[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_21___iter__ = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_12_sample_trees(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_21___iter__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_12_sample_trees > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_12_sample_trees[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_12_sample_trees];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_21___iter__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_21___iter__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_21___iter__];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *)o);
-  p->__pyx_v_self = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_12_sample_trees(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_21___iter__(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *)o;
   PyObject_GC_UnTrack(o);
   Py_CLEAR(p->__pyx_v_self);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_12_sample_trees < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_12_sample_trees[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_12_sample_trees++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *)o);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_21___iter__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_21___iter__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_21___iter__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_12_sample_trees(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_21___iter__(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *)o;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *)o;
   if (p->__pyx_v_self) {
     e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
   }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_12_sample_trees(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_21___iter__(PyObject *o) {
   PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__ *)o;
   tmp = ((PyObject*)p->__pyx_v_self);
-  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_Hypergraph *)Py_None); Py_INCREF(Py_None);
+  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_SufficientStats *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_12_sample_trees[] = {
-  {0, 0, 0, 0}
-};
-
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_12_sample_trees = {
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_21___iter__ = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_12_sample_trees"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_12_sample_trees), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_21___iter__"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_21___iter__), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_12_sample_trees, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_21___iter__, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -25142,13 +26591,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_12_sample_trees =
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_12_sample_trees, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_12_sample_trees, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_21___iter__, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_21___iter__, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_12_sample_trees, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -25158,7 +26607,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_12_sample_trees =
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_12_sample_trees, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_21___iter__, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -25170,67 +26619,210 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_12_sample_trees =
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_4___get__[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_4___get__ = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_22___iter__[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_22___iter__ = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_4___get__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_22___iter__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_4___get__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_4___get__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_4___get__];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_22___iter__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_22___iter__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_22___iter__];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *)o);
-  p->__pyx_v_self = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_4___get__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_22___iter__(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *)o;
   PyObject_GC_UnTrack(o);
   Py_CLEAR(p->__pyx_v_self);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_4___get__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_4___get__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_4___get__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *)o);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_22___iter__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_22___iter__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_22___iter__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_4___get__(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_22___iter__(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *)o;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *)o;
   if (p->__pyx_v_self) {
     e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
   }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_4___get__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__ *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_22___iter__(PyObject *o) {
   PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__ *)o;
   tmp = ((PyObject*)p->__pyx_v_self);
-  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_TRule *)Py_None); Py_INCREF(Py_None);
+  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_CandidateSet *)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_4___get__[] = {
-  {0, 0, 0, 0}
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_22___iter__ = {
+  PyVarObject_HEAD_INIT(0, 0)
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_22___iter__"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_22___iter__), /*tp_basicsize*/
+  0, /*tp_itemsize*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_22___iter__, /*tp_dealloc*/
+  0, /*tp_print*/
+  0, /*tp_getattr*/
+  0, /*tp_setattr*/
+  #if PY_MAJOR_VERSION < 3
+  0, /*tp_compare*/
+  #else
+  0, /*reserved*/
+  #endif
+  0, /*tp_repr*/
+  0, /*tp_as_number*/
+  0, /*tp_as_sequence*/
+  0, /*tp_as_mapping*/
+  0, /*tp_hash*/
+  0, /*tp_call*/
+  0, /*tp_str*/
+  0, /*tp_getattro*/
+  0, /*tp_setattro*/
+  0, /*tp_as_buffer*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+  0, /*tp_doc*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_22___iter__, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_22___iter__, /*tp_clear*/
+  0, /*tp_richcompare*/
+  0, /*tp_weaklistoffset*/
+  0, /*tp_iter*/
+  0, /*tp_iternext*/
+  0, /*tp_methods*/
+  0, /*tp_members*/
+  0, /*tp_getset*/
+  0, /*tp_base*/
+  0, /*tp_dict*/
+  0, /*tp_descr_get*/
+  0, /*tp_descr_set*/
+  0, /*tp_dictoffset*/
+  0, /*tp_init*/
+  0, /*tp_alloc*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_22___iter__, /*tp_new*/
+  0, /*tp_free*/
+  0, /*tp_is_gc*/
+  0, /*tp_bases*/
+  0, /*tp_mro*/
+  0, /*tp_cache*/
+  0, /*tp_subclasses*/
+  0, /*tp_weaklist*/
+  0, /*tp_del*/
+  #if PY_VERSION_HEX >= 0x02060000
+  0, /*tp_version_tag*/
+  #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_4___get__ = {
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_23__make_config[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_23__make_config = 0;
+
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_23__make_config(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+  PyObject *o;
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_23__make_config > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_23__make_config[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_23__make_config];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config));
+    (void) PyObject_INIT(o, t);
+    PyObject_GC_Track(o);
+  } else {
+    o = (*t->tp_alloc)(t, 0);
+    if (unlikely(!o)) return 0;
+  }
+  return o;
+}
+
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_23__make_config(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *)o;
+  PyObject_GC_UnTrack(o);
+  Py_CLEAR(p->__pyx_v_config);
+  Py_CLEAR(p->__pyx_v_info);
+  Py_CLEAR(p->__pyx_v_key);
+  Py_CLEAR(p->__pyx_v_name);
+  Py_CLEAR(p->__pyx_v_value);
+  Py_CLEAR(p->__pyx_t_0);
+  Py_CLEAR(p->__pyx_t_1);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_23__make_config < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_23__make_config[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_23__make_config++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *)o);
+  } else {
+    (*Py_TYPE(o)->tp_free)(o);
+  }
+}
+
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_23__make_config(PyObject *o, visitproc v, void *a) {
+  int e;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *)o;
+  if (p->__pyx_v_config) {
+    e = (*v)(p->__pyx_v_config, a); if (e) return e;
+  }
+  if (p->__pyx_v_info) {
+    e = (*v)(p->__pyx_v_info, a); if (e) return e;
+  }
+  if (p->__pyx_v_key) {
+    e = (*v)(p->__pyx_v_key, a); if (e) return e;
+  }
+  if (p->__pyx_v_name) {
+    e = (*v)(p->__pyx_v_name, a); if (e) return e;
+  }
+  if (p->__pyx_v_value) {
+    e = (*v)(p->__pyx_v_value, a); if (e) return e;
+  }
+  if (p->__pyx_t_0) {
+    e = (*v)(p->__pyx_t_0, a); if (e) return e;
+  }
+  if (p->__pyx_t_1) {
+    e = (*v)(p->__pyx_t_1, a); if (e) return e;
+  }
+  return 0;
+}
+
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_23__make_config(PyObject *o) {
+  PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config *)o;
+  tmp = ((PyObject*)p->__pyx_v_config);
+  p->__pyx_v_config = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_v_info);
+  p->__pyx_v_info = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_v_key);
+  p->__pyx_v_key = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_v_name);
+  p->__pyx_v_name = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_v_value);
+  p->__pyx_v_value = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_t_0);
+  p->__pyx_t_0 = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_t_1);
+  p->__pyx_t_1 = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  return 0;
+}
+
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_23__make_config = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_4___get__"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_4___get__), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_23__make_config"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_23__make_config), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_4___get__, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_23__make_config, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -25251,13 +26843,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_4___get__ = {
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_4___get__, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_4___get__, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_23__make_config, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_23__make_config, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_4___get__, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -25267,7 +26859,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_4___get__ = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_4___get__, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_23__make_config, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -25279,67 +26871,182 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_4___get__ = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_1___iter__[8];
-static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_1___iter__ = 0;
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_24___init__[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_24___init__ = 0;
 
-static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_1___iter__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *p;
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_24___init__(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
   PyObject *o;
-  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_1___iter__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__)))) {
-    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_1___iter__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_1___iter__];
-    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__));
-    PyObject_INIT(o, t);
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_24___init__ > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_24___init__[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_24___init__];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__));
+    (void) PyObject_INIT(o, t);
     PyObject_GC_Track(o);
   } else {
     o = (*t->tp_alloc)(t, 0);
     if (unlikely(!o)) return 0;
   }
-  p = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *)o);
-  p->__pyx_v_self = 0;
   return o;
 }
 
-static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_1___iter__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *)o;
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_24___init__(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *)o;
   PyObject_GC_UnTrack(o);
-  Py_CLEAR(p->__pyx_v_self);
-  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_1___iter__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__))) {
-    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_1___iter__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_1___iter__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *)o);
+  Py_CLEAR(p->__pyx_v_config);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_24___init__ < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_24___init__[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_24___init__++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *)o);
   } else {
     (*Py_TYPE(o)->tp_free)(o);
   }
 }
 
-static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_1___iter__(PyObject *o, visitproc v, void *a) {
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_24___init__(PyObject *o, visitproc v, void *a) {
   int e;
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *)o;
-  if (p->__pyx_v_self) {
-    e = (*v)(((PyObject*)p->__pyx_v_self), a); if (e) return e;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *)o;
+  if (p->__pyx_v_config) {
+    e = (*v)(p->__pyx_v_config, a); if (e) return e;
   }
   return 0;
 }
 
-static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_1___iter__(PyObject *o) {
-  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__ *)o;
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_24___init__(PyObject *o) {
   PyObject* tmp;
-  tmp = ((PyObject*)p->__pyx_v_self);
-  p->__pyx_v_self = ((struct __pyx_obj_4cdec_5_cdec_SparseVector *)Py_None); Py_INCREF(Py_None);
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *)o;
+  tmp = ((PyObject*)p->__pyx_v_config);
+  p->__pyx_v_config = ((PyObject*)Py_None); Py_INCREF(Py_None);
   Py_XDECREF(tmp);
   return 0;
 }
 
-static PyMethodDef __pyx_methods_4cdec_5_cdec___pyx_scope_struct_1___iter__[] = {
-  {0, 0, 0, 0}
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_24___init__ = {
+  PyVarObject_HEAD_INIT(0, 0)
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_24___init__"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__), /*tp_basicsize*/
+  0, /*tp_itemsize*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_24___init__, /*tp_dealloc*/
+  0, /*tp_print*/
+  0, /*tp_getattr*/
+  0, /*tp_setattr*/
+  #if PY_MAJOR_VERSION < 3
+  0, /*tp_compare*/
+  #else
+  0, /*reserved*/
+  #endif
+  0, /*tp_repr*/
+  0, /*tp_as_number*/
+  0, /*tp_as_sequence*/
+  0, /*tp_as_mapping*/
+  0, /*tp_hash*/
+  0, /*tp_call*/
+  0, /*tp_str*/
+  0, /*tp_getattro*/
+  0, /*tp_setattro*/
+  0, /*tp_as_buffer*/
+  Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+  0, /*tp_doc*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_24___init__, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_24___init__, /*tp_clear*/
+  0, /*tp_richcompare*/
+  0, /*tp_weaklistoffset*/
+  0, /*tp_iter*/
+  0, /*tp_iternext*/
+  0, /*tp_methods*/
+  0, /*tp_members*/
+  0, /*tp_getset*/
+  0, /*tp_base*/
+  0, /*tp_dict*/
+  0, /*tp_descr_get*/
+  0, /*tp_descr_set*/
+  0, /*tp_dictoffset*/
+  0, /*tp_init*/
+  0, /*tp_alloc*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_24___init__, /*tp_new*/
+  0, /*tp_free*/
+  0, /*tp_is_gc*/
+  0, /*tp_bases*/
+  0, /*tp_mro*/
+  0, /*tp_cache*/
+  0, /*tp_subclasses*/
+  0, /*tp_weaklist*/
+  0, /*tp_del*/
+  #if PY_VERSION_HEX >= 0x02060000
+  0, /*tp_version_tag*/
+  #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
-static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_1___iter__ = {
+static struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_25_genexpr[8];
+static int __pyx_freecount_4cdec_5_cdec___pyx_scope_struct_25_genexpr = 0;
+
+static PyObject *__pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_25_genexpr(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) {
+  PyObject *o;
+  if (likely((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_25_genexpr > 0) & (t->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr)))) {
+    o = (PyObject*)__pyx_freelist_4cdec_5_cdec___pyx_scope_struct_25_genexpr[--__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_25_genexpr];
+    memset(o, 0, sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr));
+    (void) PyObject_INIT(o, t);
+    PyObject_GC_Track(o);
+  } else {
+    o = (*t->tp_alloc)(t, 0);
+    if (unlikely(!o)) return 0;
+  }
+  return o;
+}
+
+static void __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_25_genexpr(PyObject *o) {
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *)o;
+  PyObject_GC_UnTrack(o);
+  Py_CLEAR(p->__pyx_outer_scope);
+  Py_CLEAR(p->__pyx_v_kv);
+  Py_CLEAR(p->__pyx_t_0);
+  if ((__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_25_genexpr < 8) & (Py_TYPE(o)->tp_basicsize == sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr))) {
+    __pyx_freelist_4cdec_5_cdec___pyx_scope_struct_25_genexpr[__pyx_freecount_4cdec_5_cdec___pyx_scope_struct_25_genexpr++] = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *)o);
+  } else {
+    (*Py_TYPE(o)->tp_free)(o);
+  }
+}
+
+static int __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_25_genexpr(PyObject *o, visitproc v, void *a) {
+  int e;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *)o;
+  if (p->__pyx_outer_scope) {
+    e = (*v)(((PyObject*)p->__pyx_outer_scope), a); if (e) return e;
+  }
+  if (p->__pyx_v_kv) {
+    e = (*v)(p->__pyx_v_kv, a); if (e) return e;
+  }
+  if (p->__pyx_t_0) {
+    e = (*v)(p->__pyx_t_0, a); if (e) return e;
+  }
+  return 0;
+}
+
+static int __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_25_genexpr(PyObject *o) {
+  PyObject* tmp;
+  struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *p = (struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr *)o;
+  tmp = ((PyObject*)p->__pyx_outer_scope);
+  p->__pyx_outer_scope = ((struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_24___init__ *)Py_None); Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_v_kv);
+  p->__pyx_v_kv = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  tmp = ((PyObject*)p->__pyx_t_0);
+  p->__pyx_t_0 = Py_None; Py_INCREF(Py_None);
+  Py_XDECREF(tmp);
+  return 0;
+}
+
+static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_25_genexpr = {
   PyVarObject_HEAD_INIT(0, 0)
-  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_1___iter__"), /*tp_name*/
-  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_1___iter__), /*tp_basicsize*/
+  __Pyx_NAMESTR("cdec._cdec.__pyx_scope_struct_25_genexpr"), /*tp_name*/
+  sizeof(struct __pyx_obj_4cdec_5_cdec___pyx_scope_struct_25_genexpr), /*tp_basicsize*/
   0, /*tp_itemsize*/
-  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_1___iter__, /*tp_dealloc*/
+  __pyx_tp_dealloc_4cdec_5_cdec___pyx_scope_struct_25_genexpr, /*tp_dealloc*/
   0, /*tp_print*/
   0, /*tp_getattr*/
   0, /*tp_setattr*/
@@ -25360,13 +27067,13 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_1___iter__ = {
   0, /*tp_as_buffer*/
   Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_HAVE_GC, /*tp_flags*/
   0, /*tp_doc*/
-  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_1___iter__, /*tp_traverse*/
-  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_1___iter__, /*tp_clear*/
+  __pyx_tp_traverse_4cdec_5_cdec___pyx_scope_struct_25_genexpr, /*tp_traverse*/
+  __pyx_tp_clear_4cdec_5_cdec___pyx_scope_struct_25_genexpr, /*tp_clear*/
   0, /*tp_richcompare*/
   0, /*tp_weaklistoffset*/
   0, /*tp_iter*/
   0, /*tp_iternext*/
-  __pyx_methods_4cdec_5_cdec___pyx_scope_struct_1___iter__, /*tp_methods*/
+  0, /*tp_methods*/
   0, /*tp_members*/
   0, /*tp_getset*/
   0, /*tp_base*/
@@ -25376,7 +27083,7 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_1___iter__ = {
   0, /*tp_dictoffset*/
   0, /*tp_init*/
   0, /*tp_alloc*/
-  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_1___iter__, /*tp_new*/
+  __pyx_tp_new_4cdec_5_cdec___pyx_scope_struct_25_genexpr, /*tp_new*/
   0, /*tp_free*/
   0, /*tp_is_gc*/
   0, /*tp_bases*/
@@ -25388,6 +27095,9 @@ static PyTypeObject __pyx_type_4cdec_5_cdec___pyx_scope_struct_1___iter__ = {
   #if PY_VERSION_HEX >= 0x02060000
   0, /*tp_version_tag*/
   #endif
+  #if PY_VERSION_HEX >= 0x030400a1
+  0, /*tp_finalize*/
+  #endif
 };
 
 static PyMethodDef __pyx_methods[] = {
@@ -25413,162 +27123,165 @@ static struct PyModuleDef __pyx_moduledef = {
 #endif
 
 static __Pyx_StringTabEntry __pyx_string_tab[] = {
-  {&__pyx_kp_s_10, __pyx_k_10, sizeof(__pyx_k_10), 0, 0, 1, 0},
-  {&__pyx_kp_s_11, __pyx_k_11, sizeof(__pyx_k_11), 0, 0, 1, 0},
-  {&__pyx_kp_s_12, __pyx_k_12, sizeof(__pyx_k_12), 0, 0, 1, 0},
-  {&__pyx_kp_s_13, __pyx_k_13, sizeof(__pyx_k_13), 0, 0, 1, 0},
-  {&__pyx_kp_s_15, __pyx_k_15, sizeof(__pyx_k_15), 0, 0, 1, 0},
-  {&__pyx_n_s_16, __pyx_k_16, sizeof(__pyx_k_16), 0, 0, 1, 1},
-  {&__pyx_kp_s_17, __pyx_k_17, sizeof(__pyx_k_17), 0, 0, 1, 0},
-  {&__pyx_kp_s_18, __pyx_k_18, sizeof(__pyx_k_18), 0, 0, 1, 0},
-  {&__pyx_kp_s_20, __pyx_k_20, sizeof(__pyx_k_20), 0, 0, 1, 0},
-  {&__pyx_kp_s_22, __pyx_k_22, sizeof(__pyx_k_22), 0, 0, 1, 0},
-  {&__pyx_kp_s_23, __pyx_k_23, sizeof(__pyx_k_23), 0, 0, 1, 0},
-  {&__pyx_kp_s_26, __pyx_k_26, sizeof(__pyx_k_26), 0, 0, 1, 0},
-  {&__pyx_kp_s_27, __pyx_k_27, sizeof(__pyx_k_27), 0, 0, 1, 0},
-  {&__pyx_kp_s_28, __pyx_k_28, sizeof(__pyx_k_28), 0, 0, 1, 0},
-  {&__pyx_kp_s_29, __pyx_k_29, sizeof(__pyx_k_29), 0, 0, 1, 0},
-  {&__pyx_kp_s_3, __pyx_k_3, sizeof(__pyx_k_3), 0, 0, 1, 0},
-  {&__pyx_kp_s_30, __pyx_k_30, sizeof(__pyx_k_30), 0, 0, 1, 0},
-  {&__pyx_kp_s_31, __pyx_k_31, sizeof(__pyx_k_31), 0, 0, 1, 0},
-  {&__pyx_kp_s_33, __pyx_k_33, sizeof(__pyx_k_33), 0, 0, 1, 0},
-  {&__pyx_kp_s_34, __pyx_k_34, sizeof(__pyx_k_34), 0, 0, 1, 0},
-  {&__pyx_kp_s_37, __pyx_k_37, sizeof(__pyx_k_37), 0, 0, 1, 0},
-  {&__pyx_n_s_38, __pyx_k_38, sizeof(__pyx_k_38), 0, 0, 1, 1},
-  {&__pyx_n_s_39, __pyx_k_39, sizeof(__pyx_k_39), 0, 0, 1, 1},
-  {&__pyx_kp_s_4, __pyx_k_4, sizeof(__pyx_k_4), 0, 0, 1, 0},
-  {&__pyx_kp_s_40, __pyx_k_40, sizeof(__pyx_k_40), 0, 0, 1, 0},
-  {&__pyx_kp_s_42, __pyx_k_42, sizeof(__pyx_k_42), 0, 0, 1, 0},
-  {&__pyx_kp_s_44, __pyx_k_44, sizeof(__pyx_k_44), 0, 0, 1, 0},
-  {&__pyx_kp_s_46, __pyx_k_46, sizeof(__pyx_k_46), 0, 0, 1, 0},
-  {&__pyx_kp_s_47, __pyx_k_47, sizeof(__pyx_k_47), 0, 0, 1, 0},
-  {&__pyx_kp_s_48, __pyx_k_48, sizeof(__pyx_k_48), 0, 0, 1, 0},
-  {&__pyx_kp_s_49, __pyx_k_49, sizeof(__pyx_k_49), 0, 0, 1, 0},
-  {&__pyx_kp_s_50, __pyx_k_50, sizeof(__pyx_k_50), 0, 0, 1, 0},
-  {&__pyx_kp_s_53, __pyx_k_53, sizeof(__pyx_k_53), 0, 0, 1, 0},
-  {&__pyx_n_s_54, __pyx_k_54, sizeof(__pyx_k_54), 0, 0, 1, 1},
-  {&__pyx_n_s_55, __pyx_k_55, sizeof(__pyx_k_55), 0, 0, 1, 1},
-  {&__pyx_kp_s_58, __pyx_k_58, sizeof(__pyx_k_58), 0, 0, 1, 0},
-  {&__pyx_kp_s_66, __pyx_k_66, sizeof(__pyx_k_66), 0, 0, 1, 0},
-  {&__pyx_kp_s_7, __pyx_k_7, sizeof(__pyx_k_7), 0, 0, 1, 0},
-  {&__pyx_kp_s_8, __pyx_k_8, sizeof(__pyx_k_8), 0, 0, 1, 0},
-  {&__pyx_kp_s_9, __pyx_k_9, sizeof(__pyx_k_9), 0, 0, 1, 0},
-  {&__pyx_n_s__BLEU, __pyx_k__BLEU, sizeof(__pyx_k__BLEU), 0, 0, 1, 1},
-  {&__pyx_n_s__CER, __pyx_k__CER, sizeof(__pyx_k__CER), 0, 0, 1, 1},
-  {&__pyx_n_s__Exception, __pyx_k__Exception, sizeof(__pyx_k__Exception), 0, 0, 1, 1},
-  {&__pyx_n_s__IBM_BLEU, __pyx_k__IBM_BLEU, sizeof(__pyx_k__IBM_BLEU), 0, 0, 1, 1},
-  {&__pyx_n_s__IndexError, __pyx_k__IndexError, sizeof(__pyx_k__IndexError), 0, 0, 1, 1},
-  {&__pyx_n_s__InvalidConfig, __pyx_k__InvalidConfig, sizeof(__pyx_k__InvalidConfig), 0, 0, 1, 1},
-  {&__pyx_n_s__KeyError, __pyx_k__KeyError, sizeof(__pyx_k__KeyError), 0, 0, 1, 1},
-  {&__pyx_n_s__NotImplemented, __pyx_k__NotImplemented, sizeof(__pyx_k__NotImplemented), 0, 0, 1, 1},
-  {&__pyx_n_s__ParseFailed, __pyx_k__ParseFailed, sizeof(__pyx_k__ParseFailed), 0, 0, 1, 1},
-  {&__pyx_n_s__QCRI, __pyx_k__QCRI, sizeof(__pyx_k__QCRI), 0, 0, 1, 1},
-  {&__pyx_n_s__QCRI_BLEU, __pyx_k__QCRI_BLEU, sizeof(__pyx_k__QCRI_BLEU), 0, 0, 1, 1},
-  {&__pyx_n_s__SSK, __pyx_k__SSK, sizeof(__pyx_k__SSK), 0, 0, 1, 1},
-  {&__pyx_n_s__TER, __pyx_k__TER, sizeof(__pyx_k__TER), 0, 0, 1, 1},
-  {&__pyx_n_s__TypeError, __pyx_k__TypeError, sizeof(__pyx_k__TypeError), 0, 0, 1, 1},
-  {&__pyx_n_s__ValueError, __pyx_k__ValueError, sizeof(__pyx_k__ValueError), 0, 0, 1, 1},
-  {&__pyx_n_s____class__, __pyx_k____class__, sizeof(__pyx_k____class__), 0, 0, 1, 1},
-  {&__pyx_n_s____dict__, __pyx_k____dict__, sizeof(__pyx_k____dict__), 0, 0, 1, 1},
-  {&__pyx_n_s____enter__, __pyx_k____enter__, sizeof(__pyx_k____enter__), 0, 0, 1, 1},
-  {&__pyx_n_s____exit__, __pyx_k____exit__, sizeof(__pyx_k____exit__), 0, 0, 1, 1},
-  {&__pyx_n_s____import__, __pyx_k____import__, sizeof(__pyx_k____import__), 0, 0, 1, 1},
-  {&__pyx_n_s____init__, __pyx_k____init__, sizeof(__pyx_k____init__), 0, 0, 1, 1},
-  {&__pyx_n_s____main__, __pyx_k____main__, sizeof(__pyx_k____main__), 0, 0, 1, 1},
-  {&__pyx_n_s____metaclass__, __pyx_k____metaclass__, sizeof(__pyx_k____metaclass__), 0, 0, 1, 1},
-  {&__pyx_n_s____module__, __pyx_k____module__, sizeof(__pyx_k____module__), 0, 0, 1, 1},
-  {&__pyx_n_s____name__, __pyx_k____name__, sizeof(__pyx_k____name__), 0, 0, 1, 1},
-  {&__pyx_n_s____pyx_vtable__, __pyx_k____pyx_vtable__, sizeof(__pyx_k____pyx_vtable__), 0, 0, 1, 1},
-  {&__pyx_n_s____qualname__, __pyx_k____qualname__, sizeof(__pyx_k____qualname__), 0, 0, 1, 1},
-  {&__pyx_n_s____test__, __pyx_k____test__, sizeof(__pyx_k____test__), 0, 0, 1, 1},
-  {&__pyx_n_s___make_config, __pyx_k___make_config, sizeof(__pyx_k___make_config), 0, 0, 1, 1},
-  {&__pyx_n_s___phrase, __pyx_k___phrase, sizeof(__pyx_k___phrase), 0, 0, 1, 1},
-  {&__pyx_n_s___sa, __pyx_k___sa, sizeof(__pyx_k___sa), 0, 0, 1, 1},
-  {&__pyx_n_s__a, __pyx_k__a, sizeof(__pyx_k__a), 0, 0, 1, 1},
-  {&__pyx_n_s__alignments, __pyx_k__alignments, sizeof(__pyx_k__alignments), 0, 0, 1, 1},
-  {&__pyx_n_s__append, __pyx_k__append, sizeof(__pyx_k__append), 0, 0, 1, 1},
-  {&__pyx_n_s__args, __pyx_k__args, sizeof(__pyx_k__args), 0, 0, 1, 1},
-  {&__pyx_n_s__beam_alpha, __pyx_k__beam_alpha, sizeof(__pyx_k__beam_alpha), 0, 0, 1, 1},
-  {&__pyx_n_s__cat, __pyx_k__cat, sizeof(__pyx_k__cat), 0, 0, 1, 1},
-  {&__pyx_n_s__close, __pyx_k__close, sizeof(__pyx_k__close), 0, 0, 1, 1},
-  {&__pyx_n_s__config, __pyx_k__config, sizeof(__pyx_k__config), 0, 0, 1, 1},
-  {&__pyx_n_s__config_str, __pyx_k__config_str, sizeof(__pyx_k__config_str), 0, 0, 1, 1},
-  {&__pyx_n_s__csplit, __pyx_k__csplit, sizeof(__pyx_k__csplit), 0, 0, 1, 1},
-  {&__pyx_n_s__delta, __pyx_k__delta, sizeof(__pyx_k__delta), 0, 0, 1, 1},
-  {&__pyx_n_s__density, __pyx_k__density, sizeof(__pyx_k__density), 0, 0, 1, 1},
-  {&__pyx_n_s__dot, __pyx_k__dot, sizeof(__pyx_k__dot), 0, 0, 1, 1},
-  {&__pyx_n_s__e, __pyx_k__e, sizeof(__pyx_k__e), 0, 0, 1, 1},
-  {&__pyx_n_s__encode, __pyx_k__encode, sizeof(__pyx_k__encode), 0, 0, 1, 1},
-  {&__pyx_n_s__encoding, __pyx_k__encoding, sizeof(__pyx_k__encoding), 0, 0, 1, 1},
-  {&__pyx_n_s__enumerate, __pyx_k__enumerate, sizeof(__pyx_k__enumerate), 0, 0, 1, 1},
-  {&__pyx_n_s__eval, __pyx_k__eval, sizeof(__pyx_k__eval), 0, 0, 1, 1},
-  {&__pyx_n_s__evaluate, __pyx_k__evaluate, sizeof(__pyx_k__evaluate), 0, 0, 1, 1},
-  {&__pyx_n_s__evaluator, __pyx_k__evaluator, sizeof(__pyx_k__evaluator), 0, 0, 1, 1},
-  {&__pyx_n_s__f, __pyx_k__f, sizeof(__pyx_k__f), 0, 0, 1, 1},
-  {&__pyx_n_s__formalism, __pyx_k__formalism, sizeof(__pyx_k__formalism), 0, 0, 1, 1},
-  {&__pyx_n_s__format, __pyx_k__format, sizeof(__pyx_k__format), 0, 0, 1, 1},
-  {&__pyx_n_s__fst, __pyx_k__fst, sizeof(__pyx_k__fst), 0, 0, 1, 1},
-  {&__pyx_n_s__genexpr, __pyx_k__genexpr, sizeof(__pyx_k__genexpr), 0, 0, 1, 1},
-  {&__pyx_n_s__get, __pyx_k__get, sizeof(__pyx_k__get), 0, 0, 1, 1},
-  {&__pyx_n_s__grammar, __pyx_k__grammar, sizeof(__pyx_k__grammar), 0, 0, 1, 1},
-  {&__pyx_n_s__hyp, __pyx_k__hyp, sizeof(__pyx_k__hyp), 0, 0, 1, 1},
-  {&__pyx_n_s__hypergraph, __pyx_k__hypergraph, sizeof(__pyx_k__hypergraph), 0, 0, 1, 1},
-  {&__pyx_n_s__i, __pyx_k__i, sizeof(__pyx_k__i), 0, 0, 1, 1},
-  {&__pyx_n_s__in_edges, __pyx_k__in_edges, sizeof(__pyx_k__in_edges), 0, 0, 1, 1},
-  {&__pyx_n_s__info, __pyx_k__info, sizeof(__pyx_k__info), 0, 0, 1, 1},
-  {&__pyx_n_s__inp, __pyx_k__inp, sizeof(__pyx_k__inp), 0, 0, 1, 1},
-  {&__pyx_n_s__items, __pyx_k__items, sizeof(__pyx_k__items), 0, 0, 1, 1},
-  {&__pyx_n_s__join, __pyx_k__join, sizeof(__pyx_k__join), 0, 0, 1, 1},
-  {&__pyx_n_s__k, __pyx_k__k, sizeof(__pyx_k__k), 0, 0, 1, 1},
-  {&__pyx_n_s__key, __pyx_k__key, sizeof(__pyx_k__key), 0, 0, 1, 1},
-  {&__pyx_n_s__label, __pyx_k__label, sizeof(__pyx_k__label), 0, 0, 1, 1},
-  {&__pyx_n_s__lexalign, __pyx_k__lexalign, sizeof(__pyx_k__lexalign), 0, 0, 1, 1},
-  {&__pyx_n_s__lextrans, __pyx_k__lextrans, sizeof(__pyx_k__lextrans), 0, 0, 1, 1},
-  {&__pyx_n_s__lhs, __pyx_k__lhs, sizeof(__pyx_k__lhs), 0, 0, 1, 1},
-  {&__pyx_n_s__lines, __pyx_k__lines, sizeof(__pyx_k__lines), 0, 0, 1, 1},
-  {&__pyx_n_s__name, __pyx_k__name, sizeof(__pyx_k__name), 0, 0, 1, 1},
-  {&__pyx_n_s__open, __pyx_k__open, sizeof(__pyx_k__open), 0, 0, 1, 1},
-  {&__pyx_n_s__pb, __pyx_k__pb, sizeof(__pyx_k__pb), 0, 0, 1, 1},
-  {&__pyx_n_s__phrase, __pyx_k__phrase, sizeof(__pyx_k__phrase), 0, 0, 1, 1},
-  {&__pyx_n_s__plf, __pyx_k__plf, sizeof(__pyx_k__plf), 0, 0, 1, 1},
-  {&__pyx_n_s__range, __pyx_k__range, sizeof(__pyx_k__range), 0, 0, 1, 1},
-  {&__pyx_n_s__ref, __pyx_k__ref, sizeof(__pyx_k__ref), 0, 0, 1, 1},
-  {&__pyx_n_s__refs, __pyx_k__refs, sizeof(__pyx_k__refs), 0, 0, 1, 1},
-  {&__pyx_n_s__replace, __pyx_k__replace, sizeof(__pyx_k__replace), 0, 0, 1, 1},
-  {&__pyx_n_s__rhs, __pyx_k__rhs, sizeof(__pyx_k__rhs), 0, 0, 1, 1},
-  {&__pyx_n_s__rules, __pyx_k__rules, sizeof(__pyx_k__rules), 0, 0, 1, 1},
-  {&__pyx_n_s__scfg, __pyx_k__scfg, sizeof(__pyx_k__scfg), 0, 0, 1, 1},
-  {&__pyx_n_s__score, __pyx_k__score, sizeof(__pyx_k__score), 0, 0, 1, 1},
-  {&__pyx_n_s__scores, __pyx_k__scores, sizeof(__pyx_k__scores), 0, 0, 1, 1},
-  {&__pyx_n_s__self, __pyx_k__self, sizeof(__pyx_k__self), 0, 0, 1, 1},
-  {&__pyx_n_s__send, __pyx_k__send, sizeof(__pyx_k__send), 0, 0, 1, 1},
-  {&__pyx_n_s__sentence, __pyx_k__sentence, sizeof(__pyx_k__sentence), 0, 0, 1, 1},
-  {&__pyx_n_s__set_silent, __pyx_k__set_silent, sizeof(__pyx_k__set_silent), 0, 0, 1, 1},
-  {&__pyx_n_s__span, __pyx_k__span, sizeof(__pyx_k__span), 0, 0, 1, 1},
-  {&__pyx_n_s__split, __pyx_k__split, sizeof(__pyx_k__split), 0, 0, 1, 1},
-  {&__pyx_n_s__startswith, __pyx_k__startswith, sizeof(__pyx_k__startswith), 0, 0, 1, 1},
-  {&__pyx_n_s__strip, __pyx_k__strip, sizeof(__pyx_k__strip), 0, 0, 1, 1},
-  {&__pyx_n_s__super, __pyx_k__super, sizeof(__pyx_k__super), 0, 0, 1, 1},
-  {&__pyx_n_s__tagger, __pyx_k__tagger, sizeof(__pyx_k__tagger), 0, 0, 1, 1},
-  {&__pyx_n_s__throw, __pyx_k__throw, sizeof(__pyx_k__throw), 0, 0, 1, 1},
-  {&__pyx_n_s__utf8, __pyx_k__utf8, sizeof(__pyx_k__utf8), 0, 0, 1, 1},
-  {&__pyx_n_s__value, __pyx_k__value, sizeof(__pyx_k__value), 0, 0, 1, 1},
-  {&__pyx_n_s__weight, __pyx_k__weight, sizeof(__pyx_k__weight), 0, 0, 1, 1},
-  {&__pyx_n_s__yn, __pyx_k__yn, sizeof(__pyx_k__yn), 0, 0, 1, 1},
+  {&__pyx_n_s_BLEU, __pyx_k_BLEU, sizeof(__pyx_k_BLEU), 0, 0, 1, 1},
+  {&__pyx_n_s_CER, __pyx_k_CER, sizeof(__pyx_k_CER), 0, 0, 1, 1},
+  {&__pyx_kp_s_Cannot_translate_input_type_s, __pyx_k_Cannot_translate_input_type_s, sizeof(__pyx_k_Cannot_translate_input_type_s), 0, 0, 1, 0},
+  {&__pyx_n_s_Exception, __pyx_k_Exception, sizeof(__pyx_k_Exception), 0, 0, 1, 1},
+  {&__pyx_n_s_IBM_BLEU, __pyx_k_IBM_BLEU, sizeof(__pyx_k_IBM_BLEU), 0, 0, 1, 1},
+  {&__pyx_n_s_IndexError, __pyx_k_IndexError, sizeof(__pyx_k_IndexError), 0, 0, 1, 1},
+  {&__pyx_n_s_InvalidConfig, __pyx_k_InvalidConfig, sizeof(__pyx_k_InvalidConfig), 0, 0, 1, 1},
+  {&__pyx_n_s_KeyError, __pyx_k_KeyError, sizeof(__pyx_k_KeyError), 0, 0, 1, 1},
+  {&__pyx_n_s_NotImplemented, __pyx_k_NotImplemented, sizeof(__pyx_k_NotImplemented), 0, 0, 1, 1},
+  {&__pyx_n_s_ParseFailed, __pyx_k_ParseFailed, sizeof(__pyx_k_ParseFailed), 0, 0, 1, 1},
+  {&__pyx_n_s_QCRI, __pyx_k_QCRI, sizeof(__pyx_k_QCRI), 0, 0, 1, 1},
+  {&__pyx_n_s_QCRI_BLEU, __pyx_k_QCRI_BLEU, sizeof(__pyx_k_QCRI_BLEU), 0, 0, 1, 1},
+  {&__pyx_n_s_SSK, __pyx_k_SSK, sizeof(__pyx_k_SSK), 0, 0, 1, 1},
+  {&__pyx_n_s_TER, __pyx_k_TER, sizeof(__pyx_k_TER), 0, 0, 1, 1},
+  {&__pyx_n_s_TypeError, __pyx_k_TypeError, sizeof(__pyx_k_TypeError), 0, 0, 1, 1},
+  {&__pyx_n_s_ValueError, __pyx_k_ValueError, sizeof(__pyx_k_ValueError), 0, 0, 1, 1},
+  {&__pyx_kp_s__10, __pyx_k__10, sizeof(__pyx_k__10), 0, 0, 1, 0},
+  {&__pyx_kp_s__11, __pyx_k__11, sizeof(__pyx_k__11), 0, 0, 1, 0},
+  {&__pyx_kp_s__13, __pyx_k__13, sizeof(__pyx_k__13), 0, 0, 1, 0},
+  {&__pyx_kp_s__16, __pyx_k__16, sizeof(__pyx_k__16), 0, 0, 1, 0},
+  {&__pyx_kp_s__20, __pyx_k__20, sizeof(__pyx_k__20), 0, 0, 1, 0},
+  {&__pyx_n_s__23, __pyx_k__23, sizeof(__pyx_k__23), 0, 0, 1, 1},
+  {&__pyx_kp_s__4, __pyx_k__4, sizeof(__pyx_k__4), 0, 0, 1, 0},
+  {&__pyx_n_s_a, __pyx_k_a, sizeof(__pyx_k_a), 0, 0, 1, 1},
+  {&__pyx_n_s_alignments, __pyx_k_alignments, sizeof(__pyx_k_alignments), 0, 0, 1, 1},
+  {&__pyx_n_s_append, __pyx_k_append, sizeof(__pyx_k_append), 0, 0, 1, 1},
+  {&__pyx_n_s_args, __pyx_k_args, sizeof(__pyx_k_args), 0, 0, 1, 1},
+  {&__pyx_n_s_beam_alpha, __pyx_k_beam_alpha, sizeof(__pyx_k_beam_alpha), 0, 0, 1, 1},
+  {&__pyx_kp_s_candidate_set_index_out_of_range, __pyx_k_candidate_set_index_out_of_range, sizeof(__pyx_k_candidate_set_index_out_of_range), 0, 0, 1, 0},
+  {&__pyx_kp_s_cannot_create_lattice_from_s, __pyx_k_cannot_create_lattice_from_s, sizeof(__pyx_k_cannot_create_lattice_from_s), 0, 0, 1, 0},
+  {&__pyx_kp_s_cannot_initialize_weights_with_s, __pyx_k_cannot_initialize_weights_with_s, sizeof(__pyx_k_cannot_initialize_weights_with_s), 0, 0, 1, 0},
+  {&__pyx_kp_s_cannot_intersect_hypergraph_with, __pyx_k_cannot_intersect_hypergraph_with, sizeof(__pyx_k_cannot_intersect_hypergraph_with), 0, 0, 1, 0},
+  {&__pyx_kp_s_cannot_reweight_hypergraph_with, __pyx_k_cannot_reweight_hypergraph_with, sizeof(__pyx_k_cannot_reweight_hypergraph_with), 0, 0, 1, 0},
+  {&__pyx_kp_s_cannot_take_the_dot_product_of_s, __pyx_k_cannot_take_the_dot_product_of_s, sizeof(__pyx_k_cannot_take_the_dot_product_of_s), 0, 0, 1, 0},
+  {&__pyx_n_s_cat, __pyx_k_cat, sizeof(__pyx_k_cat), 0, 0, 1, 1},
+  {&__pyx_n_s_cdec__cdec, __pyx_k_cdec__cdec, sizeof(__pyx_k_cdec__cdec), 0, 0, 1, 1},
+  {&__pyx_n_s_cdec_sa__sa, __pyx_k_cdec_sa__sa, sizeof(__pyx_k_cdec_sa__sa), 0, 0, 1, 1},
+  {&__pyx_n_s_class, __pyx_k_class, sizeof(__pyx_k_class), 0, 0, 1, 1},
+  {&__pyx_n_s_close, __pyx_k_close, sizeof(__pyx_k_close), 0, 0, 1, 1},
+  {&__pyx_kp_s_comparison_not_implemented_for_H, __pyx_k_comparison_not_implemented_for_H, sizeof(__pyx_k_comparison_not_implemented_for_H), 0, 0, 1, 0},
+  {&__pyx_kp_s_comparison_not_implemented_for_H_2, __pyx_k_comparison_not_implemented_for_H_2, sizeof(__pyx_k_comparison_not_implemented_for_H_2), 0, 0, 1, 0},
+  {&__pyx_kp_s_comparison_not_implemented_for_S, __pyx_k_comparison_not_implemented_for_S, sizeof(__pyx_k_comparison_not_implemented_for_S), 0, 0, 1, 0},
+  {&__pyx_n_s_config, __pyx_k_config, sizeof(__pyx_k_config), 0, 0, 1, 1},
+  {&__pyx_n_s_config_str, __pyx_k_config_str, sizeof(__pyx_k_config_str), 0, 0, 1, 1},
+  {&__pyx_n_s_csplit, __pyx_k_csplit, sizeof(__pyx_k_csplit), 0, 0, 1, 1},
+  {&__pyx_n_s_csplit_preserve_full_word, __pyx_k_csplit_preserve_full_word, sizeof(__pyx_k_csplit_preserve_full_word), 0, 0, 1, 1},
+  {&__pyx_kp_s_d, __pyx_k_d, sizeof(__pyx_k_d), 0, 0, 1, 0},
+  {&__pyx_kp_s_d_d_label_s, __pyx_k_d_d_label_s, sizeof(__pyx_k_d_d_label_s), 0, 0, 1, 0},
+  {&__pyx_kp_s_d_shape_doublecircle, __pyx_k_d_shape_doublecircle, sizeof(__pyx_k_d_shape_doublecircle), 0, 0, 1, 0},
+  {&__pyx_n_s_delta, __pyx_k_delta, sizeof(__pyx_k_delta), 0, 0, 1, 1},
+  {&__pyx_n_s_density, __pyx_k_density, sizeof(__pyx_k_density), 0, 0, 1, 1},
+  {&__pyx_n_s_dict, __pyx_k_dict, sizeof(__pyx_k_dict), 0, 0, 1, 1},
+  {&__pyx_kp_s_digraph_lattice, __pyx_k_digraph_lattice, sizeof(__pyx_k_digraph_lattice), 0, 0, 1, 0},
+  {&__pyx_n_s_doc, __pyx_k_doc, sizeof(__pyx_k_doc), 0, 0, 1, 1},
+  {&__pyx_n_s_dot, __pyx_k_dot, sizeof(__pyx_k_dot), 0, 0, 1, 1},
+  {&__pyx_n_s_e, __pyx_k_e, sizeof(__pyx_k_e), 0, 0, 1, 1},
+  {&__pyx_n_s_encode, __pyx_k_encode, sizeof(__pyx_k_encode), 0, 0, 1, 1},
+  {&__pyx_n_s_encoding, __pyx_k_encoding, sizeof(__pyx_k_encoding), 0, 0, 1, 1},
+  {&__pyx_n_s_enter, __pyx_k_enter, sizeof(__pyx_k_enter), 0, 0, 1, 1},
+  {&__pyx_n_s_enumerate, __pyx_k_enumerate, sizeof(__pyx_k_enumerate), 0, 0, 1, 1},
+  {&__pyx_n_s_eval, __pyx_k_eval, sizeof(__pyx_k_eval), 0, 0, 1, 1},
+  {&__pyx_n_s_evaluate, __pyx_k_evaluate, sizeof(__pyx_k_evaluate), 0, 0, 1, 1},
+  {&__pyx_n_s_evaluator, __pyx_k_evaluator, sizeof(__pyx_k_evaluator), 0, 0, 1, 1},
+  {&__pyx_n_s_exit, __pyx_k_exit, sizeof(__pyx_k_exit), 0, 0, 1, 1},
+  {&__pyx_n_s_f, __pyx_k_f, sizeof(__pyx_k_f), 0, 0, 1, 1},
+  {&__pyx_n_s_formalism, __pyx_k_formalism, sizeof(__pyx_k_formalism), 0, 0, 1, 1},
+  {&__pyx_kp_s_formalism_s_unknown, __pyx_k_formalism_s_unknown, sizeof(__pyx_k_formalism_s_unknown), 0, 0, 1, 0},
+  {&__pyx_n_s_format, __pyx_k_format, sizeof(__pyx_k_format), 0, 0, 1, 1},
+  {&__pyx_n_s_fst, __pyx_k_fst, sizeof(__pyx_k_fst), 0, 0, 1, 1},
+  {&__pyx_n_s_genexpr, __pyx_k_genexpr, sizeof(__pyx_k_genexpr), 0, 0, 1, 1},
+  {&__pyx_n_s_get, __pyx_k_get, sizeof(__pyx_k_get), 0, 0, 1, 1},
+  {&__pyx_n_s_grammar, __pyx_k_grammar, sizeof(__pyx_k_grammar), 0, 0, 1, 1},
+  {&__pyx_n_s_hyp, __pyx_k_hyp, sizeof(__pyx_k_hyp), 0, 0, 1, 1},
+  {&__pyx_n_s_hypergraph, __pyx_k_hypergraph, sizeof(__pyx_k_hypergraph), 0, 0, 1, 1},
+  {&__pyx_n_s_i, __pyx_k_i, sizeof(__pyx_k_i), 0, 0, 1, 1},
+  {&__pyx_n_s_import, __pyx_k_import, sizeof(__pyx_k_import), 0, 0, 1, 1},
+  {&__pyx_n_s_in_edges, __pyx_k_in_edges, sizeof(__pyx_k_in_edges), 0, 0, 1, 1},
+  {&__pyx_n_s_info, __pyx_k_info, sizeof(__pyx_k_info), 0, 0, 1, 1},
+  {&__pyx_n_s_init, __pyx_k_init, sizeof(__pyx_k_init), 0, 0, 1, 1},
+  {&__pyx_n_s_inp, __pyx_k_inp, sizeof(__pyx_k_inp), 0, 0, 1, 1},
+  {&__pyx_n_s_items, __pyx_k_items, sizeof(__pyx_k_items), 0, 0, 1, 1},
+  {&__pyx_n_s_join, __pyx_k_join, sizeof(__pyx_k_join), 0, 0, 1, 1},
+  {&__pyx_n_s_k, __pyx_k_k, sizeof(__pyx_k_k), 0, 0, 1, 1},
+  {&__pyx_n_s_key, __pyx_k_key, sizeof(__pyx_k_key), 0, 0, 1, 1},
+  {&__pyx_n_s_label, __pyx_k_label, sizeof(__pyx_k_label), 0, 0, 1, 1},
+  {&__pyx_kp_s_lattice_index_out_of_range, __pyx_k_lattice_index_out_of_range, sizeof(__pyx_k_lattice_index_out_of_range), 0, 0, 1, 0},
+  {&__pyx_n_s_lexalign, __pyx_k_lexalign, sizeof(__pyx_k_lexalign), 0, 0, 1, 1},
+  {&__pyx_n_s_lextrans, __pyx_k_lextrans, sizeof(__pyx_k_lextrans), 0, 0, 1, 1},
+  {&__pyx_n_s_lhs, __pyx_k_lhs, sizeof(__pyx_k_lhs), 0, 0, 1, 1},
+  {&__pyx_n_s_lines, __pyx_k_lines, sizeof(__pyx_k_lines), 0, 0, 1, 1},
+  {&__pyx_n_s_main, __pyx_k_main, sizeof(__pyx_k_main), 0, 0, 1, 1},
+  {&__pyx_n_s_make_config, __pyx_k_make_config, sizeof(__pyx_k_make_config), 0, 0, 1, 1},
+  {&__pyx_n_s_metaclass, __pyx_k_metaclass, sizeof(__pyx_k_metaclass), 0, 0, 1, 1},
+  {&__pyx_n_s_module, __pyx_k_module, sizeof(__pyx_k_module), 0, 0, 1, 1},
+  {&__pyx_n_s_name, __pyx_k_name, sizeof(__pyx_k_name), 0, 0, 1, 1},
+  {&__pyx_n_s_name_2, __pyx_k_name_2, sizeof(__pyx_k_name_2), 0, 0, 1, 1},
+  {&__pyx_kp_s_node_shape_circle, __pyx_k_node_shape_circle, sizeof(__pyx_k_node_shape_circle), 0, 0, 1, 0},
+  {&__pyx_n_s_open, __pyx_k_open, sizeof(__pyx_k_open), 0, 0, 1, 1},
+  {&__pyx_n_s_pb, __pyx_k_pb, sizeof(__pyx_k_pb), 0, 0, 1, 1},
+  {&__pyx_n_s_phrase, __pyx_k_phrase, sizeof(__pyx_k_phrase), 0, 0, 1, 1},
+  {&__pyx_n_s_phrase_2, __pyx_k_phrase_2, sizeof(__pyx_k_phrase_2), 0, 0, 1, 1},
+  {&__pyx_n_s_plf, __pyx_k_plf, sizeof(__pyx_k_plf), 0, 0, 1, 1},
+  {&__pyx_n_s_prepare, __pyx_k_prepare, sizeof(__pyx_k_prepare), 0, 0, 1, 1},
+  {&__pyx_n_s_pyx_vtable, __pyx_k_pyx_vtable, sizeof(__pyx_k_pyx_vtable), 0, 0, 1, 1},
+  {&__pyx_n_s_qualname, __pyx_k_qualname, sizeof(__pyx_k_qualname), 0, 0, 1, 1},
+  {&__pyx_n_s_range, __pyx_k_range, sizeof(__pyx_k_range), 0, 0, 1, 1},
+  {&__pyx_kp_s_rankdir_LR, __pyx_k_rankdir_LR, sizeof(__pyx_k_rankdir_LR), 0, 0, 1, 0},
+  {&__pyx_n_s_ref, __pyx_k_ref, sizeof(__pyx_k_ref), 0, 0, 1, 1},
+  {&__pyx_n_s_refs, __pyx_k_refs, sizeof(__pyx_k_refs), 0, 0, 1, 1},
+  {&__pyx_n_s_replace, __pyx_k_replace, sizeof(__pyx_k_replace), 0, 0, 1, 1},
+  {&__pyx_n_s_rhs, __pyx_k_rhs, sizeof(__pyx_k_rhs), 0, 0, 1, 1},
+  {&__pyx_n_s_rules, __pyx_k_rules, sizeof(__pyx_k_rules), 0, 0, 1, 1},
+  {&__pyx_kp_s_s, __pyx_k_s, sizeof(__pyx_k_s), 0, 0, 1, 0},
+  {&__pyx_kp_s_s_d, __pyx_k_s_d, sizeof(__pyx_k_s_d), 0, 0, 1, 0},
+  {&__pyx_kp_s_s_s, __pyx_k_s_s, sizeof(__pyx_k_s_s), 0, 0, 1, 0},
+  {&__pyx_kp_s_s_s_2, __pyx_k_s_s_2, sizeof(__pyx_k_s_s_2), 0, 0, 1, 0},
+  {&__pyx_kp_s_s_s_3, __pyx_k_s_s_3, sizeof(__pyx_k_s_s_3), 0, 0, 1, 0},
+  {&__pyx_kp_s_s_s_s_s, __pyx_k_s_s_s_s, sizeof(__pyx_k_s_s_s_s), 0, 0, 1, 0},
+  {&__pyx_n_s_sa, __pyx_k_sa, sizeof(__pyx_k_sa), 0, 0, 1, 1},
+  {&__pyx_n_s_scfg, __pyx_k_scfg, sizeof(__pyx_k_scfg), 0, 0, 1, 1},
+  {&__pyx_n_s_score, __pyx_k_score, sizeof(__pyx_k_score), 0, 0, 1, 1},
+  {&__pyx_n_s_scores, __pyx_k_scores, sizeof(__pyx_k_scores), 0, 0, 1, 1},
+  {&__pyx_n_s_self, __pyx_k_self, sizeof(__pyx_k_self), 0, 0, 1, 1},
+  {&__pyx_n_s_send, __pyx_k_send, sizeof(__pyx_k_send), 0, 0, 1, 1},
+  {&__pyx_n_s_sentence, __pyx_k_sentence, sizeof(__pyx_k_sentence), 0, 0, 1, 1},
+  {&__pyx_n_s_set_silent, __pyx_k_set_silent, sizeof(__pyx_k_set_silent), 0, 0, 1, 1},
+  {&__pyx_n_s_span, __pyx_k_span, sizeof(__pyx_k_span), 0, 0, 1, 1},
+  {&__pyx_n_s_split, __pyx_k_split, sizeof(__pyx_k_split), 0, 0, 1, 1},
+  {&__pyx_n_s_startswith, __pyx_k_startswith, sizeof(__pyx_k_startswith), 0, 0, 1, 1},
+  {&__pyx_n_s_strip, __pyx_k_strip, sizeof(__pyx_k_strip), 0, 0, 1, 1},
+  {&__pyx_kp_s_sufficient_stats_vector_index_ou, __pyx_k_sufficient_stats_vector_index_ou, sizeof(__pyx_k_sufficient_stats_vector_index_ou), 0, 0, 1, 0},
+  {&__pyx_n_s_super, __pyx_k_super, sizeof(__pyx_k_super), 0, 0, 1, 1},
+  {&__pyx_n_s_tagger, __pyx_k_tagger, sizeof(__pyx_k_tagger), 0, 0, 1, 1},
+  {&__pyx_n_s_test, __pyx_k_test, sizeof(__pyx_k_test), 0, 0, 1, 1},
+  {&__pyx_n_s_text, __pyx_k_text, sizeof(__pyx_k_text), 0, 0, 1, 1},
+  {&__pyx_kp_s_the_grammar_should_contain_TRule, __pyx_k_the_grammar_should_contain_TRule, sizeof(__pyx_k_the_grammar_should_contain_TRule), 0, 0, 1, 0},
+  {&__pyx_n_s_throw, __pyx_k_throw, sizeof(__pyx_k_throw), 0, 0, 1, 1},
+  {&__pyx_n_s_todot_locals_lines, __pyx_k_todot_locals_lines, sizeof(__pyx_k_todot_locals_lines), 0, 0, 1, 1},
+  {&__pyx_kp_s_usr0_home_cdyer_cdec_python_cde, __pyx_k_usr0_home_cdyer_cdec_python_cde, sizeof(__pyx_k_usr0_home_cdyer_cdec_python_cde), 0, 0, 1, 0},
+  {&__pyx_kp_s_usr0_home_cdyer_cdec_python_cde_2, __pyx_k_usr0_home_cdyer_cdec_python_cde_2, sizeof(__pyx_k_usr0_home_cdyer_cdec_python_cde_2), 0, 0, 1, 0},
+  {&__pyx_kp_s_usr0_home_cdyer_cdec_python_cde_3, __pyx_k_usr0_home_cdyer_cdec_python_cde_3, sizeof(__pyx_k_usr0_home_cdyer_cdec_python_cde_3), 0, 0, 1, 0},
+  {&__pyx_n_s_utf8, __pyx_k_utf8, sizeof(__pyx_k_utf8), 0, 0, 1, 1},
+  {&__pyx_n_s_value, __pyx_k_value, sizeof(__pyx_k_value), 0, 0, 1, 1},
+  {&__pyx_n_s_weight, __pyx_k_weight, sizeof(__pyx_k_weight), 0, 0, 1, 1},
+  {&__pyx_n_s_yn, __pyx_k_yn, sizeof(__pyx_k_yn), 0, 0, 1, 1},
   {0, 0, 0, 0, 0, 0, 0}
 };
 static int __Pyx_InitCachedBuiltins(void) {
-  __pyx_builtin_Exception = __Pyx_GetBuiltinName(__pyx_n_s__Exception); if (!__pyx_builtin_Exception) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s__TypeError); if (!__pyx_builtin_TypeError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_builtin_KeyError = __Pyx_GetBuiltinName(__pyx_n_s__KeyError); if (!__pyx_builtin_KeyError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s__range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_builtin_NotImplemented = __Pyx_GetBuiltinName(__pyx_n_s__NotImplemented); if (!__pyx_builtin_NotImplemented) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_builtin_super = __Pyx_GetBuiltinName(__pyx_n_s__super); if (!__pyx_builtin_super) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s__ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 226; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_builtin_eval = __Pyx_GetBuiltinName(__pyx_n_s__eval); if (!__pyx_builtin_eval) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s__enumerate); if (!__pyx_builtin_enumerate) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_builtin_IndexError = __Pyx_GetBuiltinName(__pyx_n_s__IndexError); if (!__pyx_builtin_IndexError) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_builtin_open = __Pyx_GetBuiltinName(__pyx_n_s__open); if (!__pyx_builtin_open) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_Exception = __Pyx_GetBuiltinName(__pyx_n_s_Exception); if (!__pyx_builtin_Exception) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_TypeError = __Pyx_GetBuiltinName(__pyx_n_s_TypeError); if (!__pyx_builtin_TypeError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_KeyError = __Pyx_GetBuiltinName(__pyx_n_s_KeyError); if (!__pyx_builtin_KeyError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_range = __Pyx_GetBuiltinName(__pyx_n_s_range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_NotImplemented = __Pyx_GetBuiltinName(__pyx_n_s_NotImplemented); if (!__pyx_builtin_NotImplemented) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_super = __Pyx_GetBuiltinName(__pyx_n_s_super); if (!__pyx_builtin_super) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_eval = __Pyx_GetBuiltinName(__pyx_n_s_eval); if (!__pyx_builtin_eval) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_IndexError = __Pyx_GetBuiltinName(__pyx_n_s_IndexError); if (!__pyx_builtin_IndexError) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_open = __Pyx_GetBuiltinName(__pyx_n_s_open); if (!__pyx_builtin_open) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   return 0;
   __pyx_L1_error:;
   return -1;
@@ -25585,139 +27298,139 @@ static int __Pyx_InitCachedConstants(void) {
  *     elif isinstance(data, str):
  *         ret = data
  */
-  __pyx_k_tuple_2 = PyTuple_Pack(1, ((PyObject *)__pyx_n_s__utf8)); if (unlikely(!__pyx_k_tuple_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_2);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_2));
+  __pyx_tuple_ = PyTuple_Pack(1, __pyx_n_s_utf8); if (unlikely(!__pyx_tuple_)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple_);
+  __Pyx_GIVEREF(__pyx_tuple_);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/vectors.pxi":95
+  /* "/usr0/home/cdyer/cdec/python/cdec/vectors.pxi":95
  *         elif op == 3: # !=
  *             return not (x == y)
  *         raise NotImplemented('comparison not implemented for SparseVector')             # <<<<<<<<<<<<<<
  * 
  *     def __len__(self):
  */
-  __pyx_k_tuple_5 = PyTuple_Pack(1, ((PyObject *)__pyx_kp_s_4)); if (unlikely(!__pyx_k_tuple_5)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_5);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_5));
+  __pyx_tuple__2 = PyTuple_Pack(1, __pyx_kp_s_comparison_not_implemented_for_S); if (unlikely(!__pyx_tuple__2)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__2);
+  __Pyx_GIVEREF(__pyx_tuple__2);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":6
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":6
  * 
  * def _phrase(phrase):
  *     return ' '.join(w.encode('utf8') if isinstance(w, unicode) else str(w) for w in phrase)             # <<<<<<<<<<<<<<
  * 
  * cdef class NT:
  */
-  __pyx_k_tuple_6 = PyTuple_Pack(1, ((PyObject *)__pyx_n_s__utf8)); if (unlikely(!__pyx_k_tuple_6)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_6);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_6));
+  __pyx_tuple__3 = PyTuple_Pack(1, __pyx_n_s_utf8); if (unlikely(!__pyx_tuple__3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__3);
+  __Pyx_GIVEREF(__pyx_tuple__3);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":226
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":232
  *                 trule = convert_rule(trule)
  *             elif not isinstance(trule, TRule):
  *                 raise ValueError('the grammar should contain TRule objects')             # <<<<<<<<<<<<<<
  *             _g.AddRule((<TRule> trule).rule[0])
  */
-  __pyx_k_tuple_14 = PyTuple_Pack(1, ((PyObject *)__pyx_kp_s_13)); if (unlikely(!__pyx_k_tuple_14)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 226; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_14);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_14));
+  __pyx_tuple__5 = PyTuple_Pack(1, __pyx_kp_s_the_grammar_should_contain_TRule); if (unlikely(!__pyx_tuple__5)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__5);
+  __Pyx_GIVEREF(__pyx_tuple__5);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":244
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":244
  *         elif op == 3: # !=
  *             return not (x == y)
  *         raise NotImplemented('comparison not implemented for HypergraphEdge')             # <<<<<<<<<<<<<<
  * 
  * cdef class HypergraphNode:
  */
-  __pyx_k_tuple_19 = PyTuple_Pack(1, ((PyObject *)__pyx_kp_s_18)); if (unlikely(!__pyx_k_tuple_19)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_19);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_19));
+  __pyx_tuple__6 = PyTuple_Pack(1, __pyx_kp_s_comparison_not_implemented_for_H); if (unlikely(!__pyx_tuple__6)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__6);
+  __Pyx_GIVEREF(__pyx_tuple__6);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/hypergraph.pxi":285
+  /* "/usr0/home/cdyer/cdec/python/cdec/hypergraph.pxi":285
  *         elif op == 3: # !=
  *             return not (x == y)
  *         raise NotImplemented('comparison not implemented for HypergraphNode')             # <<<<<<<<<<<<<<
  */
-  __pyx_k_tuple_21 = PyTuple_Pack(1, ((PyObject *)__pyx_kp_s_20)); if (unlikely(!__pyx_k_tuple_21)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_21);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_21));
+  __pyx_tuple__7 = PyTuple_Pack(1, __pyx_kp_s_comparison_not_implemented_for_H_2); if (unlikely(!__pyx_tuple__7)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__7);
+  __Pyx_GIVEREF(__pyx_tuple__7);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":26
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":26
  *     def __getitem__(self, int index):
  *         if not 0 <= index < len(self):
  *             raise IndexError('lattice index out of range')             # <<<<<<<<<<<<<<
  *         arcs = []
  *         cdef vector[lattice.LatticeArc] arc_vector = self.lattice[0][index]
  */
-  __pyx_k_tuple_24 = PyTuple_Pack(1, ((PyObject *)__pyx_kp_s_23)); if (unlikely(!__pyx_k_tuple_24)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_24);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_24));
+  __pyx_tuple__8 = PyTuple_Pack(1, __pyx_kp_s_lattice_index_out_of_range); if (unlikely(!__pyx_tuple__8)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__8);
+  __Pyx_GIVEREF(__pyx_tuple__8);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":39
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":39
  *     def __setitem__(self, int index, tuple arcs):
  *         if not 0 <= index < len(self):
  *             raise IndexError('lattice index out of range')             # <<<<<<<<<<<<<<
  *         cdef lattice.LatticeArc* arc
  *         for (label, cost, dist2next) in arcs:
  */
-  __pyx_k_tuple_25 = PyTuple_Pack(1, ((PyObject *)__pyx_kp_s_23)); if (unlikely(!__pyx_k_tuple_25)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_25);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_25));
+  __pyx_tuple__9 = PyTuple_Pack(1, __pyx_kp_s_lattice_index_out_of_range); if (unlikely(!__pyx_tuple__9)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__9);
+  __Pyx_GIVEREF(__pyx_tuple__9);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":69
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":69
  *             for i in range(len(self)):
  *                 for label, weight, delta in self[i]:
  *                     yield '%d -> %d [label="%s"];' % (i, i+delta, label.replace('"', '\\"'))             # <<<<<<<<<<<<<<
  *             yield '%d [shape=doublecircle]' % len(self)
  *             yield '}'
  */
-  __pyx_k_tuple_32 = PyTuple_Pack(2, ((PyObject *)__pyx_kp_s_30), ((PyObject *)__pyx_kp_s_31)); if (unlikely(!__pyx_k_tuple_32)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_32);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_32));
+  __pyx_tuple__12 = PyTuple_Pack(2, __pyx_kp_s__10, __pyx_kp_s__11); if (unlikely(!__pyx_tuple__12)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__12);
+  __Pyx_GIVEREF(__pyx_tuple__12);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":63
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":63
  *     def todot(self):
  *         """lattice.todot() -> Representation of the lattice in GraphViz dot format."""
  *         def lines():             # <<<<<<<<<<<<<<
  *             yield 'digraph lattice {'
  *             yield 'rankdir = LR;'
  */
-  __pyx_k_tuple_35 = PyTuple_Pack(4, ((PyObject *)__pyx_n_s__i), ((PyObject *)__pyx_n_s__label), ((PyObject *)__pyx_n_s__weight), ((PyObject *)__pyx_n_s__delta)); if (unlikely(!__pyx_k_tuple_35)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_35);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_35));
-  __pyx_k_codeobj_36 = (PyObject*)__Pyx_PyCode_New(0, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_k_tuple_35, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_37, __pyx_n_s__lines, 63, __pyx_empty_bytes); if (unlikely(!__pyx_k_codeobj_36)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_tuple__14 = PyTuple_Pack(4, __pyx_n_s_i, __pyx_n_s_label, __pyx_n_s_weight, __pyx_n_s_delta); if (unlikely(!__pyx_tuple__14)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__14);
+  __Pyx_GIVEREF(__pyx_tuple__14);
+  __pyx_codeobj__15 = (PyObject*)__Pyx_PyCode_New(0, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__14, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde, __pyx_n_s_lines, 63, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__15)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/lattice.pxi":72
+  /* "/usr0/home/cdyer/cdec/python/cdec/lattice.pxi":72
  *             yield '%d [shape=doublecircle]' % len(self)
  *             yield '}'
  *         return '\n'.join(lines()).encode('utf8')             # <<<<<<<<<<<<<<
  * 
  *     def as_hypergraph(self):
  */
-  __pyx_k_tuple_41 = PyTuple_Pack(1, ((PyObject *)__pyx_n_s__utf8)); if (unlikely(!__pyx_k_tuple_41)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_41);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_41));
+  __pyx_tuple__17 = PyTuple_Pack(1, __pyx_n_s_utf8); if (unlikely(!__pyx_tuple__17)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__17);
+  __Pyx_GIVEREF(__pyx_tuple__17);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":50
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":50
  *     def __getitem__(self, int index):
  *         if not 0 <= index < len(self):
  *             raise IndexError('sufficient stats vector index out of range')             # <<<<<<<<<<<<<<
  *         return self.stats[0][index]
  * 
  */
-  __pyx_k_tuple_43 = PyTuple_Pack(1, ((PyObject *)__pyx_kp_s_42)); if (unlikely(!__pyx_k_tuple_43)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_43);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_43));
+  __pyx_tuple__18 = PyTuple_Pack(1, __pyx_kp_s_sufficient_stats_vector_index_ou); if (unlikely(!__pyx_tuple__18)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__18);
+  __Pyx_GIVEREF(__pyx_tuple__18);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":84
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":84
  *     def __getitem__(self,int k):
  *         if not 0 <= k < self.cs.size():
  *             raise IndexError('candidate set index out of range')             # <<<<<<<<<<<<<<
  *         cdef Candidate candidate = Candidate()
  *         candidate.candidate = &self.cs[0][k]
  */
-  __pyx_k_tuple_45 = PyTuple_Pack(1, ((PyObject *)__pyx_kp_s_44)); if (unlikely(!__pyx_k_tuple_45)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_45);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_45));
+  __pyx_tuple__19 = PyTuple_Pack(1, __pyx_kp_s_candidate_set_index_out_of_range); if (unlikely(!__pyx_tuple__19)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__19);
+  __Pyx_GIVEREF(__pyx_tuple__19);
 
   /* "cdec/_cdec.pyx":92
  *         with open(weights) as fp:
@@ -25726,9 +27439,9 @@ static int __Pyx_InitCachedConstants(void) {
  *                 fname, value = line.split()
  *                 self.weights[fname.strip()] = float(value)
  */
-  __pyx_k_tuple_51 = PyTuple_Pack(1, ((PyObject *)__pyx_kp_s_50)); if (unlikely(!__pyx_k_tuple_51)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_51);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_51));
+  __pyx_tuple__21 = PyTuple_Pack(1, __pyx_kp_s__20); if (unlikely(!__pyx_tuple__21)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__21);
+  __Pyx_GIVEREF(__pyx_tuple__21);
 
   /* "cdec/_cdec.pyx":90
  *     def read_weights(self, weights):
@@ -25737,73 +27450,73 @@ static int __Pyx_InitCachedConstants(void) {
  *             for line in fp:
  *                 if line.strip().startswith('#'): continue
  */
-  __pyx_k_tuple_52 = PyTuple_Pack(3, Py_None, Py_None, Py_None); if (unlikely(!__pyx_k_tuple_52)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_52);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_52));
+  __pyx_tuple__22 = PyTuple_Pack(3, Py_None, Py_None, Py_None); if (unlikely(!__pyx_tuple__22)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__22);
+  __Pyx_GIVEREF(__pyx_tuple__22);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":5
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":5
  * import cdec.sa._sa as _sa
  * 
  * def _phrase(phrase):             # <<<<<<<<<<<<<<
  *     return ' '.join(w.encode('utf8') if isinstance(w, unicode) else str(w) for w in phrase)
  * 
  */
-  __pyx_k_tuple_56 = PyTuple_Pack(3, ((PyObject *)__pyx_n_s__phrase), ((PyObject *)__pyx_n_s__genexpr), ((PyObject *)__pyx_n_s__genexpr)); if (unlikely(!__pyx_k_tuple_56)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_56);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_56));
-  __pyx_k_codeobj_57 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_k_tuple_56, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_58, __pyx_n_s___phrase, 5, __pyx_empty_bytes); if (unlikely(!__pyx_k_codeobj_57)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_tuple__24 = PyTuple_Pack(3, __pyx_n_s_phrase_2, __pyx_n_s_genexpr, __pyx_n_s_genexpr); if (unlikely(!__pyx_tuple__24)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__24);
+  __Pyx_GIVEREF(__pyx_tuple__24);
+  __pyx_codeobj__25 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__24, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde_2, __pyx_n_s_phrase, 5, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__25)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":194
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":194
  *         return []
  * 
  * BLEU = Scorer('IBM_BLEU')             # <<<<<<<<<<<<<<
  * QCRI = Scorer('QCRI_BLEU')
  * TER = Scorer('TER')
  */
-  __pyx_k_tuple_59 = PyTuple_Pack(1, ((PyObject *)__pyx_n_s__IBM_BLEU)); if (unlikely(!__pyx_k_tuple_59)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_59);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_59));
+  __pyx_tuple__26 = PyTuple_Pack(1, __pyx_n_s_IBM_BLEU); if (unlikely(!__pyx_tuple__26)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__26);
+  __Pyx_GIVEREF(__pyx_tuple__26);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":195
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":195
  * 
  * BLEU = Scorer('IBM_BLEU')
  * QCRI = Scorer('QCRI_BLEU')             # <<<<<<<<<<<<<<
  * TER = Scorer('TER')
  * CER = Scorer('CER')
  */
-  __pyx_k_tuple_60 = PyTuple_Pack(1, ((PyObject *)__pyx_n_s__QCRI_BLEU)); if (unlikely(!__pyx_k_tuple_60)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 195; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_60);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_60));
+  __pyx_tuple__27 = PyTuple_Pack(1, __pyx_n_s_QCRI_BLEU); if (unlikely(!__pyx_tuple__27)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 195; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__27);
+  __Pyx_GIVEREF(__pyx_tuple__27);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":196
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":196
  * BLEU = Scorer('IBM_BLEU')
  * QCRI = Scorer('QCRI_BLEU')
  * TER = Scorer('TER')             # <<<<<<<<<<<<<<
  * CER = Scorer('CER')
  * SSK = Scorer('SSK')
  */
-  __pyx_k_tuple_61 = PyTuple_Pack(1, ((PyObject *)__pyx_n_s__TER)); if (unlikely(!__pyx_k_tuple_61)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_61);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_61));
+  __pyx_tuple__28 = PyTuple_Pack(1, __pyx_n_s_TER); if (unlikely(!__pyx_tuple__28)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__28);
+  __Pyx_GIVEREF(__pyx_tuple__28);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":197
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":197
  * QCRI = Scorer('QCRI_BLEU')
  * TER = Scorer('TER')
  * CER = Scorer('CER')             # <<<<<<<<<<<<<<
  * SSK = Scorer('SSK')
  */
-  __pyx_k_tuple_62 = PyTuple_Pack(1, ((PyObject *)__pyx_n_s__CER)); if (unlikely(!__pyx_k_tuple_62)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_62);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_62));
+  __pyx_tuple__29 = PyTuple_Pack(1, __pyx_n_s_CER); if (unlikely(!__pyx_tuple__29)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__29);
+  __Pyx_GIVEREF(__pyx_tuple__29);
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":198
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":198
  * TER = Scorer('TER')
  * CER = Scorer('CER')
  * SSK = Scorer('SSK')             # <<<<<<<<<<<<<<
  */
-  __pyx_k_tuple_63 = PyTuple_Pack(1, ((PyObject *)__pyx_n_s__SSK)); if (unlikely(!__pyx_k_tuple_63)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 198; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_63);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_63));
+  __pyx_tuple__30 = PyTuple_Pack(1, __pyx_n_s_SSK); if (unlikely(!__pyx_tuple__30)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 198; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__30);
+  __Pyx_GIVEREF(__pyx_tuple__30);
 
   /* "cdec/_cdec.pyx":28
  * class ParseFailed(Exception): pass
@@ -25812,10 +27525,10 @@ static int __Pyx_InitCachedConstants(void) {
  *     """set_silent(bool): Configure the verbosity of cdec."""
  *     SetSilent(yn)
  */
-  __pyx_k_tuple_64 = PyTuple_Pack(1, ((PyObject *)__pyx_n_s__yn)); if (unlikely(!__pyx_k_tuple_64)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_64);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_64));
-  __pyx_k_codeobj_65 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_k_tuple_64, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_66, __pyx_n_s__set_silent, 28, __pyx_empty_bytes); if (unlikely(!__pyx_k_codeobj_65)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_tuple__31 = PyTuple_Pack(1, __pyx_n_s_yn); if (unlikely(!__pyx_tuple__31)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__31);
+  __Pyx_GIVEREF(__pyx_tuple__31);
+  __pyx_codeobj__32 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__31, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde_3, __pyx_n_s_set_silent, 28, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__32)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "cdec/_cdec.pyx":32
  *     SetSilent(yn)
@@ -25824,10 +27537,10 @@ static int __Pyx_InitCachedConstants(void) {
  *     for key, value in config.items():
  *         if isinstance(value, dict):
  */
-  __pyx_k_tuple_67 = PyTuple_Pack(5, ((PyObject *)__pyx_n_s__config), ((PyObject *)__pyx_n_s__key), ((PyObject *)__pyx_n_s__value), ((PyObject *)__pyx_n_s__name), ((PyObject *)__pyx_n_s__info)); if (unlikely(!__pyx_k_tuple_67)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_k_tuple_67);
-  __Pyx_GIVEREF(((PyObject *)__pyx_k_tuple_67));
-  __pyx_k_codeobj_68 = (PyObject*)__Pyx_PyCode_New(1, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_k_tuple_67, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_66, __pyx_n_s___make_config, 32, __pyx_empty_bytes); if (unlikely(!__pyx_k_codeobj_68)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_tuple__33 = PyTuple_Pack(5, __pyx_n_s_config, __pyx_n_s_key, __pyx_n_s_value, __pyx_n_s_name, __pyx_n_s_info); if (unlikely(!__pyx_tuple__33)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_tuple__33);
+  __Pyx_GIVEREF(__pyx_tuple__33);
+  __pyx_codeobj__34 = (PyObject*)__Pyx_PyCode_New(1, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__33, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde_3, __pyx_n_s_make_config, 32, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__34)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_RefNannyFinishContext();
   return 0;
   __pyx_L1_error:;
@@ -25837,8 +27550,8 @@ static int __Pyx_InitCachedConstants(void) {
 
 static int __Pyx_InitGlobals(void) {
   if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
-  __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
-  __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+  __pyx_int_0 = PyInt_FromLong(0); if (unlikely(!__pyx_int_0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   return 0;
   __pyx_L1_error:;
   return -1;
@@ -25856,6 +27569,7 @@ PyMODINIT_FUNC PyInit__cdec(void)
   PyObject *__pyx_t_2 = NULL;
   PyObject *__pyx_t_3 = NULL;
   PyObject *__pyx_t_4 = NULL;
+  PyObject *__pyx_t_5 = NULL;
   int __pyx_lineno = 0;
   const char *__pyx_filename = NULL;
   int __pyx_clineno = 0;
@@ -25898,14 +27612,6 @@ PyMODINIT_FUNC PyInit__cdec(void)
   if (unlikely(!__pyx_m)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_d = PyModule_GetDict(__pyx_m); if (unlikely(!__pyx_d)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   Py_INCREF(__pyx_d);
-  #if PY_MAJOR_VERSION >= 3
-  {
-    PyObject *modules = PyImport_GetModuleDict(); if (unlikely(!modules)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    if (!PyDict_GetItemString(modules, "cdec._cdec")) {
-      if (unlikely(PyDict_SetItemString(modules, "cdec._cdec", __pyx_m) < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    }
-  }
-  #endif
   __pyx_b = PyImport_AddModule(__Pyx_NAMESTR(__Pyx_BUILTIN_MODULE_NAME)); if (unlikely(!__pyx_b)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   #if CYTHON_COMPILING_IN_PYPY
   Py_INCREF(__pyx_b);
@@ -25917,8 +27623,16 @@ PyMODINIT_FUNC PyInit__cdec(void)
   if (__Pyx_init_sys_getdefaultencoding_params() < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   #endif
   if (__pyx_module_is_main_cdec___cdec) {
-    if (__Pyx_SetAttrString(__pyx_m, "__name__", __pyx_n_s____main__) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+    if (__Pyx_SetAttrString(__pyx_m, "__name__", __pyx_n_s_main) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
   }
+  #if PY_MAJOR_VERSION >= 3
+  {
+    PyObject *modules = PyImport_GetModuleDict(); if (unlikely(!modules)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (!PyDict_GetItemString(modules, "cdec._cdec")) {
+      if (unlikely(PyDict_SetItemString(modules, "cdec._cdec", __pyx_m) < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    }
+  }
+  #endif
   /*--- Builtin init code ---*/
   if (unlikely(__Pyx_InitCachedBuiltins() < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   /*--- Constants init code ---*/
@@ -25927,36 +27641,8 @@ PyMODINIT_FUNC PyInit__cdec(void)
   /*--- Variable export code ---*/
   /*--- Function export code ---*/
   /*--- Type init code ---*/
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_TRule) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  #if CYTHON_COMPILING_IN_CPYTHON
-  {
-    PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&__pyx_type_4cdec_5_cdec_TRule, "__init__"); if (unlikely(!wrapper)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    if (Py_TYPE(wrapper) == &PyWrapperDescr_Type) {
-      __pyx_wrapperbase_4cdec_5_cdec_5TRule___init__ = *((PyWrapperDescrObject *)wrapper)->d_base;
-      __pyx_wrapperbase_4cdec_5_cdec_5TRule___init__.doc = __pyx_doc_4cdec_5_cdec_5TRule___init__;
-      ((PyWrapperDescrObject *)wrapper)->d_base = &__pyx_wrapperbase_4cdec_5_cdec_5TRule___init__;
-    }
-  }
-  #endif
-  if (__Pyx_SetAttrString(__pyx_m, "TRule", (PyObject *)&__pyx_type_4cdec_5_cdec_TRule) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec_TRule = &__pyx_type_4cdec_5_cdec_TRule;
-  __pyx_type_4cdec_5_cdec_MRule.tp_base = __pyx_ptype_4cdec_5_cdec_TRule;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_MRule) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  #if CYTHON_COMPILING_IN_CPYTHON
-  {
-    PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&__pyx_type_4cdec_5_cdec_MRule, "__init__"); if (unlikely(!wrapper)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    if (Py_TYPE(wrapper) == &PyWrapperDescr_Type) {
-      __pyx_wrapperbase_4cdec_5_cdec_5MRule___init__ = *((PyWrapperDescrObject *)wrapper)->d_base;
-      __pyx_wrapperbase_4cdec_5_cdec_5MRule___init__.doc = __pyx_doc_4cdec_5_cdec_5MRule___init__;
-      ((PyWrapperDescrObject *)wrapper)->d_base = &__pyx_wrapperbase_4cdec_5_cdec_5MRule___init__;
-    }
-  }
-  #endif
-  if (__Pyx_SetAttrString(__pyx_m, "MRule", (PyObject *)&__pyx_type_4cdec_5_cdec_MRule) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec_MRule = &__pyx_type_4cdec_5_cdec_MRule;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_22___iter__) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_22___iter__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_22___iter__;
   if (PyType_Ready(&__pyx_type_4cdec_5_cdec_DenseVector) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_DenseVector.tp_print = 0;
   #if CYTHON_COMPILING_IN_CPYTHON
   {
     PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&__pyx_type_4cdec_5_cdec_DenseVector, "__init__"); if (unlikely(!wrapper)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -25969,18 +27655,8 @@ PyMODINIT_FUNC PyInit__cdec(void)
   #endif
   if (__Pyx_SetAttrString(__pyx_m, "DenseVector", (PyObject *)&__pyx_type_4cdec_5_cdec_DenseVector) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_ptype_4cdec_5_cdec_DenseVector = &__pyx_type_4cdec_5_cdec_DenseVector;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_SufficientStats) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  if (__Pyx_SetAttrString(__pyx_m, "SufficientStats", (PyObject *)&__pyx_type_4cdec_5_cdec_SufficientStats) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec_SufficientStats = &__pyx_type_4cdec_5_cdec_SufficientStats;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_21___iter__) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_21___iter__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_21___iter__;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_Metric) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 176; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  if (__Pyx_SetAttrString(__pyx_m, "Metric", (PyObject *)&__pyx_type_4cdec_5_cdec_Metric) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 176; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec_Metric = &__pyx_type_4cdec_5_cdec_Metric;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_Candidate) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  if (__Pyx_SetAttrString(__pyx_m, "Candidate", (PyObject *)&__pyx_type_4cdec_5_cdec_Candidate) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec_Candidate = &__pyx_type_4cdec_5_cdec_Candidate;
   if (PyType_Ready(&__pyx_type_4cdec_5_cdec_SparseVector) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_SparseVector.tp_print = 0;
   #if CYTHON_COMPILING_IN_CPYTHON
   {
     PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&__pyx_type_4cdec_5_cdec_SparseVector, "__init__"); if (unlikely(!wrapper)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -25993,9 +27669,8 @@ PyMODINIT_FUNC PyInit__cdec(void)
   #endif
   if (__Pyx_SetAttrString(__pyx_m, "SparseVector", (PyObject *)&__pyx_type_4cdec_5_cdec_SparseVector) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_ptype_4cdec_5_cdec_SparseVector = &__pyx_type_4cdec_5_cdec_SparseVector;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_15___get__) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 216; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_15___get__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_15___get__;
   if (PyType_Ready(&__pyx_type_4cdec_5_cdec_NT) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_NT.tp_print = 0;
   #if CYTHON_COMPILING_IN_CPYTHON
   {
     PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&__pyx_type_4cdec_5_cdec_NT, "__init__"); if (unlikely(!wrapper)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -26008,109 +27683,129 @@ PyMODINIT_FUNC PyInit__cdec(void)
   #endif
   if (__Pyx_SetAttrString(__pyx_m, "NT", (PyObject *)&__pyx_type_4cdec_5_cdec_NT) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 8; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_ptype_4cdec_5_cdec_NT = &__pyx_type_4cdec_5_cdec_NT;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_Lattice) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_NTRef) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_NTRef.tp_print = 0;
   #if CYTHON_COMPILING_IN_CPYTHON
   {
-    PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&__pyx_type_4cdec_5_cdec_Lattice, "__init__"); if (unlikely(!wrapper)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&__pyx_type_4cdec_5_cdec_NTRef, "__init__"); if (unlikely(!wrapper)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     if (Py_TYPE(wrapper) == &PyWrapperDescr_Type) {
-      __pyx_wrapperbase_4cdec_5_cdec_7Lattice_2__init__ = *((PyWrapperDescrObject *)wrapper)->d_base;
-      __pyx_wrapperbase_4cdec_5_cdec_7Lattice_2__init__.doc = __pyx_doc_4cdec_5_cdec_7Lattice_2__init__;
-      ((PyWrapperDescrObject *)wrapper)->d_base = &__pyx_wrapperbase_4cdec_5_cdec_7Lattice_2__init__;
+      __pyx_wrapperbase_4cdec_5_cdec_5NTRef___init__ = *((PyWrapperDescrObject *)wrapper)->d_base;
+      __pyx_wrapperbase_4cdec_5_cdec_5NTRef___init__.doc = __pyx_doc_4cdec_5_cdec_5NTRef___init__;
+      ((PyWrapperDescrObject *)wrapper)->d_base = &__pyx_wrapperbase_4cdec_5_cdec_5NTRef___init__;
     }
   }
   #endif
-  if (__Pyx_SetAttrString(__pyx_m, "Lattice", (PyObject *)&__pyx_type_4cdec_5_cdec_Lattice) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec_Lattice = &__pyx_type_4cdec_5_cdec_Lattice;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_23__make_config) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_23__make_config = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_23__make_config;
+  if (__Pyx_SetAttrString(__pyx_m, "NTRef", (PyObject *)&__pyx_type_4cdec_5_cdec_NTRef) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_5_cdec_NTRef = &__pyx_type_4cdec_5_cdec_NTRef;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_TRule) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_TRule.tp_print = 0;
+  #if CYTHON_COMPILING_IN_CPYTHON
+  {
+    PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&__pyx_type_4cdec_5_cdec_TRule, "__init__"); if (unlikely(!wrapper)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (Py_TYPE(wrapper) == &PyWrapperDescr_Type) {
+      __pyx_wrapperbase_4cdec_5_cdec_5TRule___init__ = *((PyWrapperDescrObject *)wrapper)->d_base;
+      __pyx_wrapperbase_4cdec_5_cdec_5TRule___init__.doc = __pyx_doc_4cdec_5_cdec_5TRule___init__;
+      ((PyWrapperDescrObject *)wrapper)->d_base = &__pyx_wrapperbase_4cdec_5_cdec_5TRule___init__;
+    }
+  }
+  #endif
+  if (__Pyx_SetAttrString(__pyx_m, "TRule", (PyObject *)&__pyx_type_4cdec_5_cdec_TRule) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_5_cdec_TRule = &__pyx_type_4cdec_5_cdec_TRule;
+  __pyx_type_4cdec_5_cdec_MRule.tp_base = __pyx_ptype_4cdec_5_cdec_TRule;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_MRule) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_MRule.tp_print = 0;
+  #if CYTHON_COMPILING_IN_CPYTHON
+  {
+    PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&__pyx_type_4cdec_5_cdec_MRule, "__init__"); if (unlikely(!wrapper)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (Py_TYPE(wrapper) == &PyWrapperDescr_Type) {
+      __pyx_wrapperbase_4cdec_5_cdec_5MRule___init__ = *((PyWrapperDescrObject *)wrapper)->d_base;
+      __pyx_wrapperbase_4cdec_5_cdec_5MRule___init__.doc = __pyx_doc_4cdec_5_cdec_5MRule___init__;
+      ((PyWrapperDescrObject *)wrapper)->d_base = &__pyx_wrapperbase_4cdec_5_cdec_5MRule___init__;
+    }
+  }
+  #endif
+  if (__Pyx_SetAttrString(__pyx_m, "MRule", (PyObject *)&__pyx_type_4cdec_5_cdec_MRule) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_5_cdec_MRule = &__pyx_type_4cdec_5_cdec_MRule;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_Grammar) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 199; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_Grammar.tp_print = 0;
+  if (__Pyx_SetAttrString(__pyx_m, "Grammar", (PyObject *)&__pyx_type_4cdec_5_cdec_Grammar) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 199; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_5_cdec_Grammar = &__pyx_type_4cdec_5_cdec_Grammar;
+  __pyx_type_4cdec_5_cdec_TextGrammar.tp_base = __pyx_ptype_4cdec_5_cdec_Grammar;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_TextGrammar) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_TextGrammar.tp_print = 0;
+  #if CYTHON_COMPILING_IN_CPYTHON
+  {
+    PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&__pyx_type_4cdec_5_cdec_TextGrammar, "__init__"); if (unlikely(!wrapper)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (Py_TYPE(wrapper) == &PyWrapperDescr_Type) {
+      __pyx_wrapperbase_4cdec_5_cdec_11TextGrammar___init__ = *((PyWrapperDescrObject *)wrapper)->d_base;
+      __pyx_wrapperbase_4cdec_5_cdec_11TextGrammar___init__.doc = __pyx_doc_4cdec_5_cdec_11TextGrammar___init__;
+      ((PyWrapperDescrObject *)wrapper)->d_base = &__pyx_wrapperbase_4cdec_5_cdec_11TextGrammar___init__;
+    }
+  }
+  #endif
+  if (__Pyx_SetAttrString(__pyx_m, "TextGrammar", (PyObject *)&__pyx_type_4cdec_5_cdec_TextGrammar) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_5_cdec_TextGrammar = &__pyx_type_4cdec_5_cdec_TextGrammar;
+  __pyx_vtabptr_4cdec_5_cdec_Hypergraph = &__pyx_vtable_4cdec_5_cdec_Hypergraph;
+  __pyx_vtable_4cdec_5_cdec_Hypergraph._rng = (MT19937 *(*)(struct __pyx_obj_4cdec_5_cdec_Hypergraph *))__pyx_f_4cdec_5_cdec_10Hypergraph__rng;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_Hypergraph) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_Hypergraph.tp_print = 0;
+  if (__Pyx_SetVtable(__pyx_type_4cdec_5_cdec_Hypergraph.tp_dict, __pyx_vtabptr_4cdec_5_cdec_Hypergraph) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_SetAttrString(__pyx_m, "Hypergraph", (PyObject *)&__pyx_type_4cdec_5_cdec_Hypergraph) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_5_cdec_Hypergraph = &__pyx_type_4cdec_5_cdec_Hypergraph;
   __pyx_vtabptr_4cdec_5_cdec_HypergraphEdge = &__pyx_vtable_4cdec_5_cdec_HypergraphEdge;
   __pyx_vtable_4cdec_5_cdec_HypergraphEdge.init = (PyObject *(*)(struct __pyx_obj_4cdec_5_cdec_HypergraphEdge *, Hypergraph *, unsigned int))__pyx_f_4cdec_5_cdec_14HypergraphEdge_init;
   if (PyType_Ready(&__pyx_type_4cdec_5_cdec_HypergraphEdge) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_HypergraphEdge.tp_print = 0;
   if (__Pyx_SetVtable(__pyx_type_4cdec_5_cdec_HypergraphEdge.tp_dict, __pyx_vtabptr_4cdec_5_cdec_HypergraphEdge) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__Pyx_SetAttrString(__pyx_m, "HypergraphEdge", (PyObject *)&__pyx_type_4cdec_5_cdec_HypergraphEdge) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_ptype_4cdec_5_cdec_HypergraphEdge = &__pyx_type_4cdec_5_cdec_HypergraphEdge;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_2__phrase) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_2__phrase = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_2__phrase;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_13___get__) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_13___get__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_13___get__;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_20_lines) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_20_lines = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_20_lines;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_Scorer) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  if (__Pyx_SetAttrString(__pyx_m, "Scorer", (PyObject *)&__pyx_type_4cdec_5_cdec_Scorer) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec_Scorer = &__pyx_type_4cdec_5_cdec_Scorer;
   __pyx_vtabptr_4cdec_5_cdec_HypergraphNode = &__pyx_vtable_4cdec_5_cdec_HypergraphNode;
   __pyx_vtable_4cdec_5_cdec_HypergraphNode.init = (PyObject *(*)(struct __pyx_obj_4cdec_5_cdec_HypergraphNode *, Hypergraph *, unsigned int))__pyx_f_4cdec_5_cdec_14HypergraphNode_init;
   if (PyType_Ready(&__pyx_type_4cdec_5_cdec_HypergraphNode) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_HypergraphNode.tp_print = 0;
   if (__Pyx_SetVtable(__pyx_type_4cdec_5_cdec_HypergraphNode.tp_dict, __pyx_vtabptr_4cdec_5_cdec_HypergraphNode) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__Pyx_SetAttrString(__pyx_m, "HypergraphNode", (PyObject *)&__pyx_type_4cdec_5_cdec_HypergraphNode) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_ptype_4cdec_5_cdec_HypergraphNode = &__pyx_type_4cdec_5_cdec_HypergraphNode;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_10_kbest_features) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_10_kbest_features = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_10_kbest_features;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_NTRef) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_Lattice) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_Lattice.tp_print = 0;
   #if CYTHON_COMPILING_IN_CPYTHON
   {
-    PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&__pyx_type_4cdec_5_cdec_NTRef, "__init__"); if (unlikely(!wrapper)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&__pyx_type_4cdec_5_cdec_Lattice, "__init__"); if (unlikely(!wrapper)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     if (Py_TYPE(wrapper) == &PyWrapperDescr_Type) {
-      __pyx_wrapperbase_4cdec_5_cdec_5NTRef___init__ = *((PyWrapperDescrObject *)wrapper)->d_base;
-      __pyx_wrapperbase_4cdec_5_cdec_5NTRef___init__.doc = __pyx_doc_4cdec_5_cdec_5NTRef___init__;
-      ((PyWrapperDescrObject *)wrapper)->d_base = &__pyx_wrapperbase_4cdec_5_cdec_5NTRef___init__;
+      __pyx_wrapperbase_4cdec_5_cdec_7Lattice_2__init__ = *((PyWrapperDescrObject *)wrapper)->d_base;
+      __pyx_wrapperbase_4cdec_5_cdec_7Lattice_2__init__.doc = __pyx_doc_4cdec_5_cdec_7Lattice_2__init__;
+      ((PyWrapperDescrObject *)wrapper)->d_base = &__pyx_wrapperbase_4cdec_5_cdec_7Lattice_2__init__;
     }
   }
   #endif
-  if (__Pyx_SetAttrString(__pyx_m, "NTRef", (PyObject *)&__pyx_type_4cdec_5_cdec_NTRef) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec_NTRef = &__pyx_type_4cdec_5_cdec_NTRef;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_Grammar) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  if (__Pyx_SetAttrString(__pyx_m, "Grammar", (PyObject *)&__pyx_type_4cdec_5_cdec_Grammar) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 193; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec_Grammar = &__pyx_type_4cdec_5_cdec_Grammar;
-  __pyx_vtabptr_4cdec_5_cdec_Hypergraph = &__pyx_vtable_4cdec_5_cdec_Hypergraph;
-  __pyx_vtable_4cdec_5_cdec_Hypergraph._rng = (MT19937 *(*)(struct __pyx_obj_4cdec_5_cdec_Hypergraph *))__pyx_f_4cdec_5_cdec_10Hypergraph__rng;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_Hypergraph) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  if (__Pyx_SetVtable(__pyx_type_4cdec_5_cdec_Hypergraph.tp_dict, __pyx_vtabptr_4cdec_5_cdec_Hypergraph) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  if (__Pyx_SetAttrString(__pyx_m, "Hypergraph", (PyObject *)&__pyx_type_4cdec_5_cdec_Hypergraph) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 4; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec_Hypergraph = &__pyx_type_4cdec_5_cdec_Hypergraph;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_24___init__) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_24___init__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_24___init__;
+  if (__Pyx_SetAttrString(__pyx_m, "Lattice", (PyObject *)&__pyx_type_4cdec_5_cdec_Lattice) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_5_cdec_Lattice = &__pyx_type_4cdec_5_cdec_Lattice;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_Candidate) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_Candidate.tp_print = 0;
+  if (__Pyx_SetAttrString(__pyx_m, "Candidate", (PyObject *)&__pyx_type_4cdec_5_cdec_Candidate) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_5_cdec_Candidate = &__pyx_type_4cdec_5_cdec_Candidate;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_SufficientStats) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_SufficientStats.tp_print = 0;
+  if (__Pyx_SetAttrString(__pyx_m, "SufficientStats", (PyObject *)&__pyx_type_4cdec_5_cdec_SufficientStats) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_5_cdec_SufficientStats = &__pyx_type_4cdec_5_cdec_SufficientStats;
   if (PyType_Ready(&__pyx_type_4cdec_5_cdec_CandidateSet) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_CandidateSet.tp_print = 0;
   if (__Pyx_SetAttrString(__pyx_m, "CandidateSet", (PyObject *)&__pyx_type_4cdec_5_cdec_CandidateSet) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_ptype_4cdec_5_cdec_CandidateSet = &__pyx_type_4cdec_5_cdec_CandidateSet;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_19_todot) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_19_todot = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_19_todot;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_5___str__) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 172; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_5___str__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_5___str__;
   if (PyType_Ready(&__pyx_type_4cdec_5_cdec_SegmentEvaluator) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_SegmentEvaluator.tp_print = 0;
   if (__Pyx_SetAttrString(__pyx_m, "SegmentEvaluator", (PyObject *)&__pyx_type_4cdec_5_cdec_SegmentEvaluator) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_ptype_4cdec_5_cdec_SegmentEvaluator = &__pyx_type_4cdec_5_cdec_SegmentEvaluator;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_16___get__) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_16___get__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_16___get__;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_25_genexpr) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_25_genexpr = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_25_genexpr;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_3_genexpr) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_3_genexpr = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_3_genexpr;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_11_sample) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_11_sample = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_11_sample;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_8_kbest) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_8_kbest = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_8_kbest;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_14___get__) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_14___get__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_14___get__;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_7___iter__) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 199; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_7___iter__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_7___iter__;
-  __pyx_type_4cdec_5_cdec_TextGrammar.tp_base = __pyx_ptype_4cdec_5_cdec_Grammar;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_TextGrammar) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 217; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  #if CYTHON_COMPILING_IN_CPYTHON
-  {
-    PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&__pyx_type_4cdec_5_cdec_TextGrammar, "__init__"); if (unlikely(!wrapper)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 217; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    if (Py_TYPE(wrapper) == &PyWrapperDescr_Type) {
-      __pyx_wrapperbase_4cdec_5_cdec_11TextGrammar___init__ = *((PyWrapperDescrObject *)wrapper)->d_base;
-      __pyx_wrapperbase_4cdec_5_cdec_11TextGrammar___init__.doc = __pyx_doc_4cdec_5_cdec_11TextGrammar___init__;
-      ((PyWrapperDescrObject *)wrapper)->d_base = &__pyx_wrapperbase_4cdec_5_cdec_11TextGrammar___init__;
-    }
-  }
-  #endif
-  if (__Pyx_SetAttrString(__pyx_m, "TextGrammar", (PyObject *)&__pyx_type_4cdec_5_cdec_TextGrammar) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 217; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec_TextGrammar = &__pyx_type_4cdec_5_cdec_TextGrammar;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_Scorer) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_Scorer.tp_print = 0;
+  if (__Pyx_SetAttrString(__pyx_m, "Scorer", (PyObject *)&__pyx_type_4cdec_5_cdec_Scorer) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_5_cdec_Scorer = &__pyx_type_4cdec_5_cdec_Scorer;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec_Metric) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 176; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_Metric.tp_print = 0;
+  if (__Pyx_SetAttrString(__pyx_m, "Metric", (PyObject *)&__pyx_type_4cdec_5_cdec_Metric) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 176; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_5_cdec_Metric = &__pyx_type_4cdec_5_cdec_Metric;
   if (PyType_Ready(&__pyx_type_4cdec_5_cdec_Decoder) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec_Decoder.tp_print = 0;
   #if CYTHON_COMPILING_IN_CPYTHON
   {
     PyObject *wrapper = __Pyx_GetAttrString((PyObject *)&__pyx_type_4cdec_5_cdec_Decoder, "__init__"); if (unlikely(!wrapper)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -26124,28 +27819,92 @@ PyMODINIT_FUNC PyInit__cdec(void)
   if (__Pyx_SetAttrString(__pyx_m, "Decoder", (PyObject *)&__pyx_type_4cdec_5_cdec_Decoder) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_ptype_4cdec_5_cdec_Decoder = &__pyx_type_4cdec_5_cdec_Decoder;
   if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct____iter__) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct____iter__.tp_print = 0;
   __pyx_ptype_4cdec_5_cdec___pyx_scope_struct____iter__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct____iter__;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_1___iter__) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_1___iter__.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_1___iter__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_1___iter__;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_2__phrase) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_2__phrase.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_2__phrase = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_2__phrase;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_3_genexpr) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_3_genexpr.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_3_genexpr = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_3_genexpr;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_4___get__) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_4___get__.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_4___get__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_4___get__;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_5___str__) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_5___str__.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_5___str__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_5___str__;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_6_genexpr) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_6_genexpr.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_6_genexpr = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_6_genexpr;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_7___iter__) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_7___iter__.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_7___iter__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_7___iter__;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_8_kbest) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_8_kbest.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_8_kbest = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_8_kbest;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_9_kbest_trees;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_10_kbest_features) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_10_kbest_features.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_10_kbest_features = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_10_kbest_features;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_11_sample) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_11_sample.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_11_sample = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_11_sample;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_12_sample_trees) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_12_sample_trees.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_12_sample_trees = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_12_sample_trees;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_13___get__) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_13___get__.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_13___get__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_13___get__;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_14___get__) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_14___get__.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_14___get__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_14___get__;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_15___get__) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 216; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_15___get__.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_15___get__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_15___get__;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_16___get__) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_16___get__.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_16___get__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_16___get__;
   if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_17___get__) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_17___get__.tp_print = 0;
   __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_17___get__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_17___get__;
   if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_18___iter__) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_18___iter__.tp_print = 0;
   __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_18___iter__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_18___iter__;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_6_genexpr) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_6_genexpr = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_6_genexpr;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_12_sample_trees) < 0) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_12_sample_trees = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_12_sample_trees;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_4___get__) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_4___get__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_4___get__;
-  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_1___iter__) < 0) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_1___iter__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_1___iter__;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_19_todot) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_19_todot.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_19_todot = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_19_todot;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_20_lines) < 0) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_20_lines.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_20_lines = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_20_lines;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_21___iter__) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_21___iter__.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_21___iter__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_21___iter__;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_22___iter__) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_22___iter__.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_22___iter__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_22___iter__;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_23__make_config) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_23__make_config.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_23__make_config = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_23__make_config;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_24___init__) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_24___init__.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_24___init__ = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_24___init__;
+  if (PyType_Ready(&__pyx_type_4cdec_5_cdec___pyx_scope_struct_25_genexpr) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_type_4cdec_5_cdec___pyx_scope_struct_25_genexpr.tp_print = 0;
+  __pyx_ptype_4cdec_5_cdec___pyx_scope_struct_25_genexpr = &__pyx_type_4cdec_5_cdec___pyx_scope_struct_25_genexpr;
   /*--- Type import code ---*/
-  __pyx_ptype_4cdec_2sa_3_sa_FloatList = __Pyx_ImportType("cdec.sa._sa", "FloatList", sizeof(struct __pyx_obj_4cdec_2sa_3_sa_FloatList), 1); if (unlikely(!__pyx_ptype_4cdec_2sa_3_sa_FloatList)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_vtabptr_4cdec_2sa_3_sa_FloatList = (struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList*)__Pyx_GetVtable(__pyx_ptype_4cdec_2sa_3_sa_FloatList->tp_dict); if (unlikely(!__pyx_vtabptr_4cdec_2sa_3_sa_FloatList)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_2sa_3_sa_IntList = __Pyx_ImportType("cdec.sa._sa", "IntList", sizeof(struct __pyx_obj_4cdec_2sa_3_sa_IntList), 1); if (unlikely(!__pyx_ptype_4cdec_2sa_3_sa_IntList)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_vtabptr_4cdec_2sa_3_sa_IntList = (struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList*)__Pyx_GetVtable(__pyx_ptype_4cdec_2sa_3_sa_IntList->tp_dict); if (unlikely(!__pyx_vtabptr_4cdec_2sa_3_sa_IntList)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_2sa_3_sa_FeatureVector = __Pyx_ImportType("cdec.sa._sa", "FeatureVector", sizeof(struct __pyx_obj_4cdec_2sa_3_sa_FeatureVector), 1); if (unlikely(!__pyx_ptype_4cdec_2sa_3_sa_FeatureVector)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_2sa_3_sa_Phrase = __Pyx_ImportType("cdec.sa._sa", "Phrase", sizeof(struct __pyx_obj_4cdec_2sa_3_sa_Phrase), 1); if (unlikely(!__pyx_ptype_4cdec_2sa_3_sa_Phrase)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_vtabptr_4cdec_2sa_3_sa_Phrase = (struct __pyx_vtabstruct_4cdec_2sa_3_sa_Phrase*)__Pyx_GetVtable(__pyx_ptype_4cdec_2sa_3_sa_Phrase->tp_dict); if (unlikely(!__pyx_vtabptr_4cdec_2sa_3_sa_Phrase)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_ptype_4cdec_2sa_3_sa_Rule = __Pyx_ImportType("cdec.sa._sa", "Rule", sizeof(struct __pyx_obj_4cdec_2sa_3_sa_Rule), 1); if (unlikely(!__pyx_ptype_4cdec_2sa_3_sa_Rule)) {__pyx_filename = __pyx_f[6]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_2sa_3_sa_FloatList = __Pyx_ImportType("cdec.sa._sa", "FloatList", sizeof(struct __pyx_obj_4cdec_2sa_3_sa_FloatList), 1); if (unlikely(!__pyx_ptype_4cdec_2sa_3_sa_FloatList)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_vtabptr_4cdec_2sa_3_sa_FloatList = (struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList*)__Pyx_GetVtable(__pyx_ptype_4cdec_2sa_3_sa_FloatList->tp_dict); if (unlikely(!__pyx_vtabptr_4cdec_2sa_3_sa_FloatList)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_2sa_3_sa_IntList = __Pyx_ImportType("cdec.sa._sa", "IntList", sizeof(struct __pyx_obj_4cdec_2sa_3_sa_IntList), 1); if (unlikely(!__pyx_ptype_4cdec_2sa_3_sa_IntList)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_vtabptr_4cdec_2sa_3_sa_IntList = (struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList*)__Pyx_GetVtable(__pyx_ptype_4cdec_2sa_3_sa_IntList->tp_dict); if (unlikely(!__pyx_vtabptr_4cdec_2sa_3_sa_IntList)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_2sa_3_sa_FeatureVector = __Pyx_ImportType("cdec.sa._sa", "FeatureVector", sizeof(struct __pyx_obj_4cdec_2sa_3_sa_FeatureVector), 1); if (unlikely(!__pyx_ptype_4cdec_2sa_3_sa_FeatureVector)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_2sa_3_sa_Phrase = __Pyx_ImportType("cdec.sa._sa", "Phrase", sizeof(struct __pyx_obj_4cdec_2sa_3_sa_Phrase), 1); if (unlikely(!__pyx_ptype_4cdec_2sa_3_sa_Phrase)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_vtabptr_4cdec_2sa_3_sa_Phrase = (struct __pyx_vtabstruct_4cdec_2sa_3_sa_Phrase*)__Pyx_GetVtable(__pyx_ptype_4cdec_2sa_3_sa_Phrase->tp_dict); if (unlikely(!__pyx_vtabptr_4cdec_2sa_3_sa_Phrase)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_ptype_4cdec_2sa_3_sa_Rule = __Pyx_ImportType("cdec.sa._sa", "Rule", sizeof(struct __pyx_obj_4cdec_2sa_3_sa_Rule), 1); if (unlikely(!__pyx_ptype_4cdec_2sa_3_sa_Rule)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   /*--- Variable import code ---*/
   /*--- Function import code ---*/
   __pyx_t_1 = __Pyx_ImportModule("cdec.sa._sa"); if (!__pyx_t_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -26156,7 +27915,7 @@ PyMODINIT_FUNC PyInit__cdec(void)
   Py_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   /*--- Execution code ---*/
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":3
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":3
  * cimport grammar
  * cimport cdec.sa._sa as _sa
  * import cdec.sa._sa as _sa             # <<<<<<<<<<<<<<
@@ -26165,82 +27924,82 @@ PyMODINIT_FUNC PyInit__cdec(void)
  */
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_INCREF(((PyObject *)__pyx_n_s_55));
-  PyList_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_n_s_55));
-  __Pyx_GIVEREF(((PyObject *)__pyx_n_s_55));
-  __pyx_t_3 = __Pyx_Import(((PyObject *)__pyx_n_s_54), ((PyObject *)__pyx_t_2), -1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_INCREF(__pyx_n_s__23);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_n_s__23);
+  __Pyx_GIVEREF(__pyx_n_s__23);
+  __pyx_t_3 = __Pyx_Import(__pyx_n_s_cdec_sa__sa, __pyx_t_2, -1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s___sa, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_sa, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/grammar.pxi":5
+  /* "/usr0/home/cdyer/cdec/python/cdec/grammar.pxi":5
  * import cdec.sa._sa as _sa
  * 
  * def _phrase(phrase):             # <<<<<<<<<<<<<<
  *     return ' '.join(w.encode('utf8') if isinstance(w, unicode) else str(w) for w in phrase)
  * 
  */
-  __pyx_t_3 = PyCFunction_NewEx(&__pyx_mdef_4cdec_5_cdec_1_phrase, NULL, __pyx_n_s_39); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = PyCFunction_NewEx(&__pyx_mdef_4cdec_5_cdec_1_phrase, NULL, __pyx_n_s_cdec__cdec); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s___phrase, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_phrase, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":194
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":194
  *         return []
  * 
  * BLEU = Scorer('IBM_BLEU')             # <<<<<<<<<<<<<<
  * QCRI = Scorer('QCRI_BLEU')
  * TER = Scorer('TER')
  */
-  __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Scorer)), ((PyObject *)__pyx_k_tuple_59), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Scorer)), __pyx_tuple__26, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s__BLEU, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_BLEU, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":195
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":195
  * 
  * BLEU = Scorer('IBM_BLEU')
  * QCRI = Scorer('QCRI_BLEU')             # <<<<<<<<<<<<<<
  * TER = Scorer('TER')
  * CER = Scorer('CER')
  */
-  __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Scorer)), ((PyObject *)__pyx_k_tuple_60), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 195; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Scorer)), __pyx_tuple__27, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 195; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s__QCRI, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 195; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_QCRI, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 195; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":196
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":196
  * BLEU = Scorer('IBM_BLEU')
  * QCRI = Scorer('QCRI_BLEU')
  * TER = Scorer('TER')             # <<<<<<<<<<<<<<
  * CER = Scorer('CER')
  * SSK = Scorer('SSK')
  */
-  __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Scorer)), ((PyObject *)__pyx_k_tuple_61), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Scorer)), __pyx_tuple__28, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s__TER, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_TER, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":197
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":197
  * QCRI = Scorer('QCRI_BLEU')
  * TER = Scorer('TER')
  * CER = Scorer('CER')             # <<<<<<<<<<<<<<
  * SSK = Scorer('SSK')
  */
-  __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Scorer)), ((PyObject *)__pyx_k_tuple_62), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Scorer)), __pyx_tuple__29, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s__CER, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_CER, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/home/pks/src/cdec-dtrain/python/cdec/mteval.pxi":198
+  /* "/usr0/home/cdyer/cdec/python/cdec/mteval.pxi":198
  * TER = Scorer('TER')
  * CER = Scorer('CER')
  * SSK = Scorer('SSK')             # <<<<<<<<<<<<<<
  */
-  __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Scorer)), ((PyObject *)__pyx_k_tuple_63), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 198; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_4cdec_5_cdec_Scorer)), __pyx_tuple__30, NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 198; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s__SSK, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 198; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_SSK, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 198; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "cdec/_cdec.pyx":22
@@ -26268,19 +28027,22 @@ PyMODINIT_FUNC PyInit__cdec(void)
  * class ParseFailed(Exception): pass
  * 
  */
-  __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_3));
-  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
   __Pyx_INCREF(__pyx_builtin_Exception);
-  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_builtin_Exception);
+  PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_builtin_Exception);
   __Pyx_GIVEREF(__pyx_builtin_Exception);
-  __pyx_t_4 = __Pyx_CreateClass(((PyObject *)__pyx_t_2), ((PyObject *)__pyx_t_3), __pyx_n_s__InvalidConfig, __pyx_n_s__InvalidConfig, __pyx_n_s_39); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_CalculateMetaclass(NULL, __pyx_t_3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_t_4 = __Pyx_Py3MetaclassPrepare(__pyx_t_2, __pyx_t_3, __pyx_n_s_InvalidConfig, __pyx_n_s_InvalidConfig, (PyObject *) NULL, __pyx_n_s_cdec__cdec, (PyObject *) NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
-  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s__InvalidConfig, __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_5 = __Pyx_Py3ClassCreate(__pyx_t_2, __pyx_n_s_InvalidConfig, __pyx_t_3, __pyx_t_4, NULL, 0, 1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_5);
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_InvalidConfig, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 25; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "cdec/_cdec.pyx":26
  * 
@@ -26289,19 +28051,22 @@ PyMODINIT_FUNC PyInit__cdec(void)
  * 
  * def set_silent(yn):
  */
-  __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_3));
-  __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_4);
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
   __Pyx_INCREF(__pyx_builtin_Exception);
-  PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_builtin_Exception);
+  PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_builtin_Exception);
   __Pyx_GIVEREF(__pyx_builtin_Exception);
-  __pyx_t_2 = __Pyx_CreateClass(((PyObject *)__pyx_t_4), ((PyObject *)__pyx_t_3), __pyx_n_s__ParseFailed, __pyx_n_s__ParseFailed, __pyx_n_s_39); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_CalculateMetaclass(NULL, __pyx_t_3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s__ParseFailed, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = __Pyx_Py3MetaclassPrepare(__pyx_t_2, __pyx_t_3, __pyx_n_s_ParseFailed, __pyx_n_s_ParseFailed, (PyObject *) NULL, __pyx_n_s_cdec__cdec, (PyObject *) NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_4);
+  __pyx_t_5 = __Pyx_Py3ClassCreate(__pyx_t_2, __pyx_n_s_ParseFailed, __pyx_t_3, __pyx_t_4, NULL, 0, 1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_5);
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_ParseFailed, __pyx_t_5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "cdec/_cdec.pyx":28
  * class ParseFailed(Exception): pass
@@ -26310,9 +28075,9 @@ PyMODINIT_FUNC PyInit__cdec(void)
  *     """set_silent(bool): Configure the verbosity of cdec."""
  *     SetSilent(yn)
  */
-  __pyx_t_3 = PyCFunction_NewEx(&__pyx_mdef_4cdec_5_cdec_3set_silent, NULL, __pyx_n_s_39); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = PyCFunction_NewEx(&__pyx_mdef_4cdec_5_cdec_3set_silent, NULL, __pyx_n_s_cdec__cdec); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s__set_silent, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_set_silent, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "cdec/_cdec.pyx":32
@@ -26322,9 +28087,9 @@ PyMODINIT_FUNC PyInit__cdec(void)
  *     for key, value in config.items():
  *         if isinstance(value, dict):
  */
-  __pyx_t_3 = PyCFunction_NewEx(&__pyx_mdef_4cdec_5_cdec_5_make_config, NULL, __pyx_n_s_39); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = PyCFunction_NewEx(&__pyx_mdef_4cdec_5_cdec_5_make_config, NULL, __pyx_n_s_cdec__cdec); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s___make_config, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_make_config, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "cdec/_cdec.pyx":1
@@ -26333,9 +28098,9 @@ PyMODINIT_FUNC PyInit__cdec(void)
  * from utils cimport *
  */
   __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(((PyObject *)__pyx_t_3));
-  if (PyDict_SetItem(__pyx_d, __pyx_n_s____test__, ((PyObject *)__pyx_t_3)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __Pyx_GOTREF(__pyx_t_3);
+  if (PyDict_SetItem(__pyx_d, __pyx_n_s_test, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "string.from_py":13
  * 
@@ -26350,6 +28115,7 @@ PyMODINIT_FUNC PyInit__cdec(void)
   __Pyx_XDECREF(__pyx_t_2);
   __Pyx_XDECREF(__pyx_t_3);
   __Pyx_XDECREF(__pyx_t_4);
+  __Pyx_XDECREF(__pyx_t_5);
   if (__pyx_m) {
     __Pyx_AddTraceback("init cdec._cdec", __pyx_clineno, __pyx_lineno, __pyx_filename);
     Py_DECREF(__pyx_m); __pyx_m = 0;
@@ -26389,11 +28155,34 @@ static PyObject *__Pyx_GetBuiltinName(PyObject *name) {
 #if PY_MAJOR_VERSION >= 3
             "name '%U' is not defined", name);
 #else
-            "name '%s' is not defined", PyString_AS_STRING(name));
+            "name '%.200s' is not defined", PyString_AS_STRING(name));
+#endif
+    }
+    return result;
+}
+
+#if CYTHON_COMPILING_IN_CPYTHON
+static CYTHON_INLINE PyObject* __Pyx_PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) {
+    PyObject *result;
+    ternaryfunc call = func->ob_type->tp_call;
+    if (unlikely(!call))
+        return PyObject_Call(func, arg, kw);
+#if PY_VERSION_HEX >= 0x02060000
+    if (unlikely(Py_EnterRecursiveCall((char*)" while calling a Python object")))
+        return NULL;
+#endif
+    result = (*call)(func, arg, kw);
+#if PY_VERSION_HEX >= 0x02060000
+    Py_LeaveRecursiveCall();
 #endif
+    if (unlikely(!result) && unlikely(!PyErr_Occurred())) {
+        PyErr_SetString(
+            PyExc_SystemError,
+            "NULL result without error in PyObject_Call");
     }
     return result;
 }
+#endif
 
 static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb) {
 #if CYTHON_COMPILING_IN_CPYTHON
@@ -26512,27 +28301,40 @@ static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject
         value = type;
         type = (PyObject*) Py_TYPE(value);
     } else if (PyExceptionClass_Check(type)) {
-        PyObject *args;
-        if (!value)
-            args = PyTuple_New(0);
-        else if (PyTuple_Check(value)) {
-            Py_INCREF(value);
-            args = value;
-        } else
-            args = PyTuple_Pack(1, value);
-        if (!args)
-            goto bad;
-        owned_instance = PyEval_CallObject(type, args);
-        Py_DECREF(args);
-        if (!owned_instance)
-            goto bad;
-        value = owned_instance;
-        if (!PyExceptionInstance_Check(value)) {
-            PyErr_Format(PyExc_TypeError,
-                         "calling %R should have returned an instance of "
-                         "BaseException, not %R",
-                         type, Py_TYPE(value));
-            goto bad;
+        PyObject *instance_class = NULL;
+        if (value && PyExceptionInstance_Check(value)) {
+            instance_class = (PyObject*) Py_TYPE(value);
+            if (instance_class != type) {
+                if (PyObject_IsSubclass(instance_class, type)) {
+                    type = instance_class;
+                } else {
+                    instance_class = NULL;
+                }
+            }
+        }
+        if (!instance_class) {
+            PyObject *args;
+            if (!value)
+                args = PyTuple_New(0);
+            else if (PyTuple_Check(value)) {
+                Py_INCREF(value);
+                args = value;
+            } else
+                args = PyTuple_Pack(1, value);
+            if (!args)
+                goto bad;
+            owned_instance = PyObject_Call(type, args, NULL);
+            Py_DECREF(args);
+            if (!owned_instance)
+                goto bad;
+            value = owned_instance;
+            if (!PyExceptionInstance_Check(value)) {
+                PyErr_Format(PyExc_TypeError,
+                             "calling %R should have returned an instance of "
+                             "BaseException, not %R",
+                             type, Py_TYPE(value));
+                goto bad;
+            }
         }
     } else {
         PyErr_SetString(PyExc_TypeError,
@@ -26598,7 +28400,7 @@ static void __Pyx_RaiseArgtupleInvalid(
         more_or_less = "exactly";
     }
     PyErr_Format(PyExc_TypeError,
-                 "%s() takes %s %" CYTHON_FORMAT_SSIZE_T "d positional argument%s (%" CYTHON_FORMAT_SSIZE_T "d given)",
+                 "%.200s() takes %.8s %" CYTHON_FORMAT_SSIZE_T "d positional argument%.1s (%" CYTHON_FORMAT_SSIZE_T "d given)",
                  func_name, more_or_less, num_expected,
                  (num_expected == 1) ? "" : "s", num_found);
 }
@@ -26627,13 +28429,13 @@ static CYTHON_INLINE int __Pyx_CheckKeywordStrings(
     return 1;
 invalid_keyword_type:
     PyErr_Format(PyExc_TypeError,
-        "%s() keywords must be strings", function_name);
+        "%.200s() keywords must be strings", function_name);
     return 0;
 #endif
 invalid_keyword:
     PyErr_Format(PyExc_TypeError,
     #if PY_MAJOR_VERSION < 3
-        "%s() got an unexpected keyword argument '%s'",
+        "%.200s() got an unexpected keyword argument '%.200s'",
         function_name, PyString_AsString(key));
     #else
         "%s() got an unexpected keyword argument '%U'",
@@ -26642,29 +28444,35 @@ invalid_keyword:
     return 0;
 }
 
-static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,
+static void __Pyx_RaiseArgumentTypeInvalid(const char* name, PyObject *obj, PyTypeObject *type) {
+    PyErr_Format(PyExc_TypeError,
+        "Argument '%.200s' has incorrect type (expected %.200s, got %.200s)",
+        name, type->tp_name, Py_TYPE(obj)->tp_name);
+}
+static CYTHON_INLINE int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,
     const char *name, int exact)
 {
-    if (!type) {
-        PyErr_Format(PyExc_SystemError, "Missing type object");
+    if (unlikely(!type)) {
+        PyErr_SetString(PyExc_SystemError, "Missing type object");
         return 0;
     }
     if (none_allowed && obj == Py_None) return 1;
     else if (exact) {
-        if (Py_TYPE(obj) == type) return 1;
+        if (likely(Py_TYPE(obj) == type)) return 1;
+        #if PY_MAJOR_VERSION == 2
+        else if ((type == &PyBaseString_Type) && likely(__Pyx_PyBaseString_CheckExact(obj))) return 1;
+        #endif
     }
     else {
-        if (PyObject_TypeCheck(obj, type)) return 1;
+        if (likely(PyObject_TypeCheck(obj, type))) return 1;
     }
-    PyErr_Format(PyExc_TypeError,
-        "Argument '%s' has incorrect type (expected %s, got %s)",
-        name, type->tp_name, Py_TYPE(obj)->tp_name);
+    __Pyx_RaiseArgumentTypeInvalid(name, obj, type);
     return 0;
 }
 
 static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) {
     if (unlikely(!type)) {
-        PyErr_Format(PyExc_SystemError, "Missing type object");
+        PyErr_SetString(PyExc_SystemError, "Missing type object");
         return 0;
     }
     if (likely(PyObject_TypeCheck(obj, type)))
@@ -26674,10 +28482,123 @@ static CYTHON_INLINE int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) {
     return 0;
 }
 
+static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb) {
+    PyObject *local_type, *local_value, *local_tb;
+#if CYTHON_COMPILING_IN_CPYTHON
+    PyObject *tmp_type, *tmp_value, *tmp_tb;
+    PyThreadState *tstate = PyThreadState_GET();
+    local_type = tstate->curexc_type;
+    local_value = tstate->curexc_value;
+    local_tb = tstate->curexc_traceback;
+    tstate->curexc_type = 0;
+    tstate->curexc_value = 0;
+    tstate->curexc_traceback = 0;
+#else
+    PyErr_Fetch(&local_type, &local_value, &local_tb);
+#endif
+    PyErr_NormalizeException(&local_type, &local_value, &local_tb);
+#if CYTHON_COMPILING_IN_CPYTHON
+    if (unlikely(tstate->curexc_type))
+#else
+    if (unlikely(PyErr_Occurred()))
+#endif
+        goto bad;
+    #if PY_MAJOR_VERSION >= 3
+    if (local_tb) {
+        if (unlikely(PyException_SetTraceback(local_value, local_tb) < 0))
+            goto bad;
+    }
+    #endif
+    Py_XINCREF(local_tb);
+    Py_XINCREF(local_type);
+    Py_XINCREF(local_value);
+    *type = local_type;
+    *value = local_value;
+    *tb = local_tb;
+#if CYTHON_COMPILING_IN_CPYTHON
+    tmp_type = tstate->exc_type;
+    tmp_value = tstate->exc_value;
+    tmp_tb = tstate->exc_traceback;
+    tstate->exc_type = local_type;
+    tstate->exc_value = local_value;
+    tstate->exc_traceback = local_tb;
+    Py_XDECREF(tmp_type);
+    Py_XDECREF(tmp_value);
+    Py_XDECREF(tmp_tb);
+#else
+    PyErr_SetExcInfo(local_type, local_value, local_tb);
+#endif
+    return 0;
+bad:
+    *type = 0;
+    *value = 0;
+    *tb = 0;
+    Py_XDECREF(local_type);
+    Py_XDECREF(local_value);
+    Py_XDECREF(local_tb);
+    return -1;
+}
+
+static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value, PyObject **tb) {
+    PyObject *tmp_type, *tmp_value, *tmp_tb;
+#if CYTHON_COMPILING_IN_CPYTHON
+    PyThreadState *tstate = PyThreadState_GET();
+    tmp_type = tstate->exc_type;
+    tmp_value = tstate->exc_value;
+    tmp_tb = tstate->exc_traceback;
+    tstate->exc_type = *type;
+    tstate->exc_value = *value;
+    tstate->exc_traceback = *tb;
+#else
+    PyErr_GetExcInfo(&tmp_type, &tmp_value, &tmp_tb);
+    PyErr_SetExcInfo(*type, *value, *tb);
+#endif
+    *type = tmp_type;
+    *value = tmp_value;
+    *tb = tmp_tb;
+}
+
+static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) {
+#if CYTHON_COMPILING_IN_CPYTHON
+    PyThreadState *tstate = PyThreadState_GET();
+    *type = tstate->exc_type;
+    *value = tstate->exc_value;
+    *tb = tstate->exc_traceback;
+    Py_XINCREF(*type);
+    Py_XINCREF(*value);
+    Py_XINCREF(*tb);
+#else
+    PyErr_GetExcInfo(type, value, tb);
+#endif
+}
+static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb) {
+#if CYTHON_COMPILING_IN_CPYTHON
+    PyObject *tmp_type, *tmp_value, *tmp_tb;
+    PyThreadState *tstate = PyThreadState_GET();
+    tmp_type = tstate->exc_type;
+    tmp_value = tstate->exc_value;
+    tmp_tb = tstate->exc_traceback;
+    tstate->exc_type = type;
+    tstate->exc_value = value;
+    tstate->exc_traceback = tb;
+    Py_XDECREF(tmp_type);
+    Py_XDECREF(tmp_value);
+    Py_XDECREF(tmp_tb);
+#else
+    PyErr_SetExcInfo(type, value, tb);
+#endif
+}
+
 static CYTHON_INLINE void __Pyx_RaiseClosureNameError(const char *varname) {
     PyErr_Format(PyExc_NameError, "free variable '%s' referenced before assignment in enclosing scope", varname);
 }
 
+#if !CYTHON_COMPILING_IN_CPYTHON
+static CYTHON_INLINE PyObject* __Pyx_PyBytes_Join(PyObject* sep, PyObject* values) {
+    return PyObject_CallMethodObjArgs(sep, __pyx_n_s_join, values, NULL)
+}
+#endif
+
 static void __Pyx_RaiseDoubleKeywordsError(
     const char* func_name,
     PyObject* kw_name)
@@ -26777,12 +28698,12 @@ arg_passed_twice:
     goto bad;
 invalid_keyword_type:
     PyErr_Format(PyExc_TypeError,
-        "%s() keywords must be strings", function_name);
+        "%.200s() keywords must be strings", function_name);
     goto bad;
 invalid_keyword:
     PyErr_Format(PyExc_TypeError,
     #if PY_MAJOR_VERSION < 3
-        "%s() got an unexpected keyword argument '%s'",
+        "%.200s() got an unexpected keyword argument '%.200s'",
         function_name, PyString_AsString(key));
     #else
         "%s() got an unexpected keyword argument '%U'",
@@ -26792,14 +28713,16 @@ bad:
     return -1;
 }
 
-static CYTHON_INLINE PyObject* __Pyx_PyObject_Append(PyObject* L, PyObject* x) {
+static CYTHON_INLINE int __Pyx_PyObject_Append(PyObject* L, PyObject* x) {
     if (likely(PyList_CheckExact(L))) {
-        if (unlikely(__Pyx_PyList_Append(L, x) < 0)) return NULL;
-        Py_INCREF(Py_None);
-        return Py_None; /* this is just to have an accurate signature */
+        if (unlikely(__Pyx_PyList_Append(L, x) < 0)) return -1;
     } else {
-        return __Pyx_PyObject_CallMethod1(L, __pyx_n_s__append, x);
+        PyObject* retval = __Pyx_PyObject_CallMethod1(L, __pyx_n_s_append, x);
+        if (unlikely(!retval))
+            return -1;
+        Py_DECREF(retval);
     }
+    return 0;
 }
 
 static CYTHON_INLINE PyObject *__Pyx_GetItemInt_Generic(PyObject *o, PyObject* j) {
@@ -26887,7 +28810,7 @@ static CYTHON_INLINE void __Pyx_RaiseTooManyValuesError(Py_ssize_t expected) {
 
 static CYTHON_INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index) {
     PyErr_Format(PyExc_ValueError,
-                 "need more than %" CYTHON_FORMAT_SSIZE_T "d value%s to unpack",
+                 "need more than %" CYTHON_FORMAT_SSIZE_T "d value%.1s to unpack",
                  index, (index == 1) ? "" : "s");
 }
 
@@ -26954,10 +28877,18 @@ static CYTHON_INLINE PyObject *__Pyx_GetModuleGlobalName(PyObject *name) {
 }
 
 static void __Pyx_WriteUnraisable(const char *name, CYTHON_UNUSED int clineno,
-                                  CYTHON_UNUSED int lineno, CYTHON_UNUSED const char *filename) {
+                                  CYTHON_UNUSED int lineno, CYTHON_UNUSED const char *filename,
+                                  int full_traceback) {
     PyObject *old_exc, *old_val, *old_tb;
     PyObject *ctx;
     __Pyx_ErrFetch(&old_exc, &old_val, &old_tb);
+    if (full_traceback) {
+        Py_XINCREF(old_exc);
+        Py_XINCREF(old_val);
+        Py_XINCREF(old_tb);
+        __Pyx_ErrRestore(old_exc, old_val, old_tb);
+        PyErr_PrintEx(1);
+    }
     #if PY_MAJOR_VERSION < 3
     ctx = PyString_FromString(name);
     #else
@@ -27009,6 +28940,44 @@ static CYTHON_INLINE PyObject *__Pyx_PyIter_Next2(PyObject* iterator, PyObject*
     return NULL;
 }
 
+static PyTypeObject* __Pyx_FetchCommonType(PyTypeObject* type) {
+    PyObject* fake_module;
+    PyTypeObject* cached_type = NULL;
+    fake_module = PyImport_AddModule((char*) "_cython_" CYTHON_ABI);
+    if (!fake_module) return NULL;
+    Py_INCREF(fake_module);
+    cached_type = (PyTypeObject*) PyObject_GetAttrString(fake_module, type->tp_name);
+    if (cached_type) {
+        if (!PyType_Check((PyObject*)cached_type)) {
+            PyErr_Format(PyExc_TypeError,
+                "Shared Cython type %.200s is not a type object",
+                type->tp_name);
+            goto bad;
+        }
+        if (cached_type->tp_basicsize != type->tp_basicsize) {
+            PyErr_Format(PyExc_TypeError,
+                "Shared Cython type %.200s has the wrong size, try recompiling",
+                type->tp_name);
+            goto bad;
+        }
+    } else {
+        if (!PyErr_ExceptionMatches(PyExc_AttributeError)) goto bad;
+        PyErr_Clear();
+        if (PyType_Ready(type) < 0) goto bad;
+        if (PyObject_SetAttrString(fake_module, type->tp_name, (PyObject*) type) < 0)
+            goto bad;
+        Py_INCREF(type);
+        cached_type = type;
+    }
+done:
+    Py_DECREF(fake_module);
+    return cached_type;
+bad:
+    Py_XDECREF(cached_type);
+    cached_type = NULL;
+    goto done;
+}
+
 static PyObject *
 __Pyx_CyFunction_get_doc(__pyx_CyFunctionObject *op, CYTHON_UNUSED void *closure)
 {
@@ -27141,11 +29110,10 @@ __Pyx_CyFunction_set_dict(__pyx_CyFunctionObject *op, PyObject *value)
     return 0;
 }
 static PyObject *
-__Pyx_CyFunction_get_globals(CYTHON_UNUSED __pyx_CyFunctionObject *op)
+__Pyx_CyFunction_get_globals(__pyx_CyFunctionObject *op)
 {
-    PyObject* dict = PyModule_GetDict(__pyx_m);
-    Py_XINCREF(dict);
-    return dict;
+    Py_INCREF(op->func_globals);
+    return op->func_globals;
 }
 static PyObject *
 __Pyx_CyFunction_get_closure(CYTHON_UNUSED __pyx_CyFunctionObject *op)
@@ -27301,7 +29269,7 @@ static PyMethodDef __pyx_CyFunction_methods[] = {
     {0, 0, 0, 0}
 };
 static PyObject *__Pyx_CyFunction_New(PyTypeObject *type, PyMethodDef *ml, int flags, PyObject* qualname,
-                                      PyObject *closure, PyObject *module, PyObject* code) {
+                                      PyObject *closure, PyObject *module, PyObject* globals, PyObject* code) {
     __pyx_CyFunctionObject *op = PyObject_GC_New(__pyx_CyFunctionObject, type);
     if (op == NULL)
         return NULL;
@@ -27319,6 +29287,8 @@ static PyObject *__Pyx_CyFunction_New(PyTypeObject *type, PyMethodDef *ml, int f
     op->func_qualname = qualname;
     op->func_doc = NULL;
     op->func_classobj = NULL;
+    op->func_globals = globals;
+    Py_INCREF(op->func_globals);
     Py_XINCREF(code);
     op->func_code = code;
     op->defaults_pyobjects = 0;
@@ -27339,6 +29309,7 @@ __Pyx_CyFunction_clear(__pyx_CyFunctionObject *m)
     Py_CLEAR(m->func_name);
     Py_CLEAR(m->func_qualname);
     Py_CLEAR(m->func_doc);
+    Py_CLEAR(m->func_globals);
     Py_CLEAR(m->func_code);
     Py_CLEAR(m->func_classobj);
     Py_CLEAR(m->defaults_tuple);
@@ -27370,6 +29341,7 @@ static int __Pyx_CyFunction_traverse(__pyx_CyFunctionObject *m, visitproc visit,
     Py_VISIT(m->func_name);
     Py_VISIT(m->func_qualname);
     Py_VISIT(m->func_doc);
+    Py_VISIT(m->func_globals);
     Py_VISIT(m->func_code);
     Py_VISIT(m->func_classobj);
     Py_VISIT(m->defaults_tuple);
@@ -27514,14 +29486,18 @@ static PyTypeObject __pyx_CyFunctionType_type = {
 #if PY_VERSION_HEX >= 0x02060000
     0,                                  /*tp_version_tag*/
 #endif
+#if PY_VERSION_HEX >= 0x030400a1
+    0,                                  /*tp_finalize*/
+#endif
 };
 static int __Pyx_CyFunction_init(void) {
 #if !CYTHON_COMPILING_IN_PYPY
     __pyx_CyFunctionType_type.tp_call = PyCFunction_Call;
 #endif
-    if (PyType_Ready(&__pyx_CyFunctionType_type) < 0)
+    __pyx_CyFunctionType = __Pyx_FetchCommonType(&__pyx_CyFunctionType_type);
+    if (__pyx_CyFunctionType == NULL) {
         return -1;
-    __pyx_CyFunctionType = &__pyx_CyFunctionType_type;
+    }
     return 0;
 }
 static CYTHON_INLINE void *__Pyx_CyFunction_InitDefaults(PyObject *func, size_t size, int pyobjects) {
@@ -27570,12 +29546,134 @@ static PyObject* __Pyx_PyDict_GetItemDefault(PyObject* d, PyObject* key, PyObjec
         if (default_value == Py_None)
             default_value = NULL;
         value = PyObject_CallMethodObjArgs(
-            d, __pyx_n_s__get, key, default_value, NULL);
+            d, __pyx_n_s_get, key, default_value, NULL);
     }
 #endif
     return value;
 }
 
+static CYTHON_INLINE int __Pyx_PyBytes_Equals(PyObject* s1, PyObject* s2, int equals) {
+#if CYTHON_COMPILING_IN_PYPY
+    return PyObject_RichCompareBool(s1, s2, equals);
+#else
+    if (s1 == s2) {
+        return (equals == Py_EQ);
+    } else if (PyBytes_CheckExact(s1) & PyBytes_CheckExact(s2)) {
+        const char *ps1, *ps2;
+        Py_ssize_t length = PyBytes_GET_SIZE(s1);
+        if (length != PyBytes_GET_SIZE(s2))
+            return (equals == Py_NE);
+        ps1 = PyBytes_AS_STRING(s1);
+        ps2 = PyBytes_AS_STRING(s2);
+        if (ps1[0] != ps2[0]) {
+            return (equals == Py_NE);
+        } else if (length == 1) {
+            return (equals == Py_EQ);
+        } else {
+            int result = memcmp(ps1, ps2, (size_t)length);
+            return (equals == Py_EQ) ? (result == 0) : (result != 0);
+        }
+    } else if ((s1 == Py_None) & PyBytes_CheckExact(s2)) {
+        return (equals == Py_NE);
+    } else if ((s2 == Py_None) & PyBytes_CheckExact(s1)) {
+        return (equals == Py_NE);
+    } else {
+        int result;
+        PyObject* py_result = PyObject_RichCompare(s1, s2, equals);
+        if (!py_result)
+            return -1;
+        result = __Pyx_PyObject_IsTrue(py_result);
+        Py_DECREF(py_result);
+        return result;
+    }
+#endif
+}
+
+static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int equals) {
+#if CYTHON_COMPILING_IN_PYPY
+    return PyObject_RichCompareBool(s1, s2, equals);
+#else
+#if PY_MAJOR_VERSION < 3
+    PyObject* owned_ref = NULL;
+#endif
+    int s1_is_unicode, s2_is_unicode;
+    if (s1 == s2) {
+        goto return_eq;
+    }
+    s1_is_unicode = PyUnicode_CheckExact(s1);
+    s2_is_unicode = PyUnicode_CheckExact(s2);
+#if PY_MAJOR_VERSION < 3
+    if ((s1_is_unicode & (!s2_is_unicode)) && PyString_CheckExact(s2)) {
+        owned_ref = PyUnicode_FromObject(s2);
+        if (unlikely(!owned_ref))
+            return -1;
+        s2 = owned_ref;
+        s2_is_unicode = 1;
+    } else if ((s2_is_unicode & (!s1_is_unicode)) && PyString_CheckExact(s1)) {
+        owned_ref = PyUnicode_FromObject(s1);
+        if (unlikely(!owned_ref))
+            return -1;
+        s1 = owned_ref;
+        s1_is_unicode = 1;
+    } else if (((!s2_is_unicode) & (!s1_is_unicode))) {
+        return __Pyx_PyBytes_Equals(s1, s2, equals);
+    }
+#endif
+    if (s1_is_unicode & s2_is_unicode) {
+        Py_ssize_t length;
+        int kind;
+        void *data1, *data2;
+        #if CYTHON_PEP393_ENABLED
+        if (unlikely(PyUnicode_READY(s1) < 0) || unlikely(PyUnicode_READY(s2) < 0))
+            return -1;
+        #endif
+        length = __Pyx_PyUnicode_GET_LENGTH(s1);
+        if (length != __Pyx_PyUnicode_GET_LENGTH(s2)) {
+            goto return_ne;
+        }
+        kind = __Pyx_PyUnicode_KIND(s1);
+        if (kind != __Pyx_PyUnicode_KIND(s2)) {
+            goto return_ne;
+        }
+        data1 = __Pyx_PyUnicode_DATA(s1);
+        data2 = __Pyx_PyUnicode_DATA(s2);
+        if (__Pyx_PyUnicode_READ(kind, data1, 0) != __Pyx_PyUnicode_READ(kind, data2, 0)) {
+            goto return_ne;
+        } else if (length == 1) {
+            goto return_eq;
+        } else {
+            int result = memcmp(data1, data2, length * kind);
+            #if PY_MAJOR_VERSION < 3
+            Py_XDECREF(owned_ref);
+            #endif
+            return (equals == Py_EQ) ? (result == 0) : (result != 0);
+        }
+    } else if ((s1 == Py_None) & s2_is_unicode) {
+        goto return_ne;
+    } else if ((s2 == Py_None) & s1_is_unicode) {
+        goto return_ne;
+    } else {
+        int result;
+        PyObject* py_result = PyObject_RichCompare(s1, s2, equals);
+        if (!py_result)
+            return -1;
+        result = __Pyx_PyObject_IsTrue(py_result);
+        Py_DECREF(py_result);
+        return result;
+    }
+return_eq:
+    #if PY_MAJOR_VERSION < 3
+    Py_XDECREF(owned_ref);
+    #endif
+    return (equals == Py_EQ);
+return_ne:
+    #if PY_MAJOR_VERSION < 3
+    Py_XDECREF(owned_ref);
+    #endif
+    return (equals == Py_NE);
+#endif
+}
+
 static double __Pyx__PyObject_AsDouble(PyObject* obj) {
     PyObject* float_value;
 #if CYTHON_COMPILING_IN_PYPY
@@ -27615,63 +29713,6 @@ bad:
     return (double)-1;
 }
 
-static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb) {
-    PyObject *local_type, *local_value, *local_tb;
-#if CYTHON_COMPILING_IN_CPYTHON
-    PyObject *tmp_type, *tmp_value, *tmp_tb;
-    PyThreadState *tstate = PyThreadState_GET();
-    local_type = tstate->curexc_type;
-    local_value = tstate->curexc_value;
-    local_tb = tstate->curexc_traceback;
-    tstate->curexc_type = 0;
-    tstate->curexc_value = 0;
-    tstate->curexc_traceback = 0;
-#else
-    PyErr_Fetch(&local_type, &local_value, &local_tb);
-#endif
-    PyErr_NormalizeException(&local_type, &local_value, &local_tb);
-#if CYTHON_COMPILING_IN_CPYTHON
-    if (unlikely(tstate->curexc_type))
-#else
-    if (unlikely(PyErr_Occurred()))
-#endif
-        goto bad;
-    #if PY_MAJOR_VERSION >= 3
-    if (unlikely(PyException_SetTraceback(local_value, local_tb) < 0))
-        goto bad;
-    #endif
-    Py_INCREF(local_type);
-    Py_INCREF(local_value);
-    Py_INCREF(local_tb);
-    *type = local_type;
-    *value = local_value;
-    *tb = local_tb;
-#if CYTHON_COMPILING_IN_CPYTHON
-    tmp_type = tstate->exc_type;
-    tmp_value = tstate->exc_value;
-    tmp_tb = tstate->exc_traceback;
-    tstate->exc_type = local_type;
-    tstate->exc_value = local_value;
-    tstate->exc_traceback = local_tb;
-    /* Make sure tstate is in a consistent state when we XDECREF
-       these objects (DECREF may run arbitrary code). */
-    Py_XDECREF(tmp_type);
-    Py_XDECREF(tmp_value);
-    Py_XDECREF(tmp_tb);
-#else
-    PyErr_SetExcInfo(local_type, local_value, local_tb);
-#endif
-    return 0;
-bad:
-    *type = 0;
-    *value = 0;
-    *tb = 0;
-    Py_XDECREF(local_type);
-    Py_XDECREF(local_value);
-    Py_XDECREF(local_tb);
-    return -1;
-}
-
 static int __Pyx_SetVtable(PyObject *dict, void *vtable) {
 #if PY_VERSION_HEX >= 0x02070000 && !(PY_MAJOR_VERSION==3&&PY_MINOR_VERSION==0)
     PyObject *ob = PyCapsule_New(vtable, 0, 0);
@@ -27680,7 +29721,7 @@ static int __Pyx_SetVtable(PyObject *dict, void *vtable) {
 #endif
     if (!ob)
         goto bad;
-    if (PyDict_SetItem(dict, __pyx_n_s____pyx_vtable__, ob) < 0)
+    if (PyDict_SetItem(dict, __pyx_n_s_pyx_vtable, ob) < 0)
         goto bad;
     Py_DECREF(ob);
     return 0;
@@ -27691,7 +29732,7 @@ bad:
 
 static void* __Pyx_GetVtable(PyObject *dict) {
     void* ptr;
-    PyObject *ob = PyObject_GetItem(dict, __pyx_n_s____pyx_vtable__);
+    PyObject *ob = PyObject_GetItem(dict, __pyx_n_s_pyx_vtable);
     if (!ob)
         goto bad;
 #if PY_VERSION_HEX >= 0x02070000 && !(PY_MAJOR_VERSION==3&&PY_MINOR_VERSION==0)
@@ -27708,35 +29749,350 @@ bad:
     return NULL;
 }
 
-static CYTHON_INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) {
-#if CYTHON_COMPILING_IN_CPYTHON
-    PyThreadState *tstate = PyThreadState_GET();
-    *type = tstate->exc_type;
-    *value = tstate->exc_value;
-    *tb = tstate->exc_traceback;
-    Py_XINCREF(*type);
-    Py_XINCREF(*value);
-    Py_XINCREF(*tb);
+static PyObject *__Pyx_CalculateMetaclass(PyTypeObject *metaclass, PyObject *bases) {
+    Py_ssize_t i, nbases = PyTuple_GET_SIZE(bases);
+    for (i=0; i < nbases; i++) {
+        PyTypeObject *tmptype;
+        PyObject *tmp = PyTuple_GET_ITEM(bases, i);
+        tmptype = Py_TYPE(tmp);
+#if PY_MAJOR_VERSION < 3
+        if (tmptype == &PyClass_Type)
+            continue;
+#endif
+        if (!metaclass) {
+            metaclass = tmptype;
+            continue;
+        }
+        if (PyType_IsSubtype(metaclass, tmptype))
+            continue;
+        if (PyType_IsSubtype(tmptype, metaclass)) {
+            metaclass = tmptype;
+            continue;
+        }
+        PyErr_SetString(PyExc_TypeError,
+                        "metaclass conflict: "
+                        "the metaclass of a derived class "
+                        "must be a (non-strict) subclass "
+                        "of the metaclasses of all its bases");
+        return NULL;
+    }
+    if (!metaclass) {
+#if PY_MAJOR_VERSION < 3
+        metaclass = &PyClass_Type;
 #else
-    PyErr_GetExcInfo(type, value, tb);
+        metaclass = &PyType_Type;
 #endif
+    }
+    Py_INCREF((PyObject*) metaclass);
+    return (PyObject*) metaclass;
 }
-static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb) {
-#if CYTHON_COMPILING_IN_CPYTHON
-    PyObject *tmp_type, *tmp_value, *tmp_tb;
-    PyThreadState *tstate = PyThreadState_GET();
-    tmp_type = tstate->exc_type;
-    tmp_value = tstate->exc_value;
-    tmp_tb = tstate->exc_traceback;
-    tstate->exc_type = type;
-    tstate->exc_value = value;
-    tstate->exc_traceback = tb;
-    Py_XDECREF(tmp_type);
-    Py_XDECREF(tmp_value);
-    Py_XDECREF(tmp_tb);
+
+static PyObject *__Pyx_Py3MetaclassPrepare(PyObject *metaclass, PyObject *bases, PyObject *name,
+                                           PyObject *qualname, PyObject *mkw, PyObject *modname, PyObject *doc) {
+    PyObject *ns;
+    if (metaclass) {
+        PyObject *prep = __Pyx_PyObject_GetAttrStr(metaclass, __pyx_n_s_prepare);
+        if (prep) {
+            PyObject *pargs = PyTuple_Pack(2, name, bases);
+            if (unlikely(!pargs)) {
+                Py_DECREF(prep);
+                return NULL;
+            }
+            ns = PyObject_Call(prep, pargs, mkw);
+            Py_DECREF(prep);
+            Py_DECREF(pargs);
+        } else {
+            if (unlikely(!PyErr_ExceptionMatches(PyExc_AttributeError)))
+                return NULL;
+            PyErr_Clear();
+            ns = PyDict_New();
+        }
+    } else {
+        ns = PyDict_New();
+    }
+    if (unlikely(!ns))
+        return NULL;
+    if (unlikely(PyObject_SetItem(ns, __pyx_n_s_module, modname) < 0)) goto bad;
+    if (unlikely(PyObject_SetItem(ns, __pyx_n_s_qualname, qualname) < 0)) goto bad;
+    if (unlikely(doc && PyObject_SetItem(ns, __pyx_n_s_doc, doc) < 0)) goto bad;
+    return ns;
+bad:
+    Py_DECREF(ns);
+    return NULL;
+}
+static PyObject *__Pyx_Py3ClassCreate(PyObject *metaclass, PyObject *name, PyObject *bases,
+                                      PyObject *dict, PyObject *mkw,
+                                      int calculate_metaclass, int allow_py2_metaclass) {
+    PyObject *result, *margs;
+    PyObject *owned_metaclass = NULL;
+    if (allow_py2_metaclass) {
+        owned_metaclass = PyObject_GetItem(dict, __pyx_n_s_metaclass);
+        if (owned_metaclass) {
+            metaclass = owned_metaclass;
+        } else if (likely(PyErr_ExceptionMatches(PyExc_KeyError))) {
+            PyErr_Clear();
+        } else {
+            return NULL;
+        }
+    }
+    if (calculate_metaclass && (!metaclass || PyType_Check(metaclass))) {
+        metaclass = __Pyx_CalculateMetaclass((PyTypeObject*) metaclass, bases);
+        Py_XDECREF(owned_metaclass);
+        if (unlikely(!metaclass))
+            return NULL;
+        owned_metaclass = metaclass;
+    }
+    margs = PyTuple_Pack(3, name, bases, dict);
+    if (unlikely(!margs)) {
+        result = NULL;
+    } else {
+        result = PyObject_Call(metaclass, margs, mkw);
+        Py_DECREF(margs);
+    }
+    Py_XDECREF(owned_metaclass);
+    return result;
+}
+
+static CYTHON_INLINE PyObject* __Pyx_PyInt_From_unsigned_int(unsigned int value) {
+    const unsigned int neg_one = (unsigned int) -1, const_zero = 0;
+    const int is_unsigned = neg_one > const_zero;
+    if (is_unsigned) {
+        if (sizeof(unsigned int) < sizeof(long)) {
+            return PyInt_FromLong((long) value);
+        } else if (sizeof(unsigned int) <= sizeof(unsigned long)) {
+            return PyLong_FromUnsignedLong((unsigned long) value);
+        } else if (sizeof(unsigned int) <= sizeof(unsigned long long)) {
+            return PyLong_FromUnsignedLongLong((unsigned long long) value);
+        }
+    } else {
+        if (sizeof(unsigned int) <= sizeof(long)) {
+            return PyInt_FromLong((long) value);
+        } else if (sizeof(unsigned int) <= sizeof(long long)) {
+            return PyLong_FromLongLong((long long) value);
+        }
+    }
+    {
+        int one = 1; int little = (int)*(unsigned char *)&one;
+        unsigned char *bytes = (unsigned char *)&value;
+        return _PyLong_FromByteArray(bytes, sizeof(unsigned int),
+                                     little, !is_unsigned);
+    }
+}
+
+#define __PYX_VERIFY_RETURN_INT(target_type, func_type, func)             \
+    {                                                                     \
+        func_type value = func(x);                                        \
+        if (sizeof(target_type) < sizeof(func_type)) {                    \
+            if (unlikely(value != (func_type) (target_type) value)) {     \
+                func_type zero = 0;                                       \
+                PyErr_SetString(PyExc_OverflowError,                      \
+                    (is_unsigned && unlikely(value < zero)) ?             \
+                    "can't convert negative value to " #target_type :     \
+                    "value too large to convert to " #target_type);       \
+                return (target_type) -1;                                  \
+            }                                                             \
+        }                                                                 \
+        return (target_type) value;                                       \
+    }
+
+#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
+ #if CYTHON_USE_PYLONG_INTERNALS
+  #include "longintrepr.h"
+ #endif
+#endif
+static CYTHON_INLINE unsigned int __Pyx_PyInt_As_unsigned_int(PyObject *x) {
+    const unsigned int neg_one = (unsigned int) -1, const_zero = 0;
+    const int is_unsigned = neg_one > const_zero;
+#if PY_MAJOR_VERSION < 3
+    if (likely(PyInt_Check(x))) {
+        if (sizeof(unsigned int) < sizeof(long)) {
+            __PYX_VERIFY_RETURN_INT(unsigned int, long, PyInt_AS_LONG)
+        } else {
+            long val = PyInt_AS_LONG(x);
+            if (is_unsigned && unlikely(val < 0)) {
+                PyErr_SetString(PyExc_OverflowError,
+                                "can't convert negative value to unsigned int");
+                return (unsigned int) -1;
+            }
+            return (unsigned int) val;
+        }
+    } else
+#endif
+    if (likely(PyLong_Check(x))) {
+        if (is_unsigned) {
+#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
+ #if CYTHON_USE_PYLONG_INTERNALS
+            if (sizeof(digit) <= sizeof(unsigned int)) {
+                switch (Py_SIZE(x)) {
+                    case  0: return 0;
+                    case  1: return (unsigned int) ((PyLongObject*)x)->ob_digit[0];
+                }
+            }
+ #endif
+#endif
+            if (unlikely(Py_SIZE(x) < 0)) {
+                PyErr_SetString(PyExc_OverflowError,
+                                "can't convert negative value to unsigned int");
+                return (unsigned int) -1;
+            }
+            if (sizeof(unsigned int) <= sizeof(unsigned long)) {
+                __PYX_VERIFY_RETURN_INT(unsigned int, unsigned long, PyLong_AsUnsignedLong)
+            } else if (sizeof(unsigned int) <= sizeof(unsigned long long)) {
+                __PYX_VERIFY_RETURN_INT(unsigned int, unsigned long long, PyLong_AsUnsignedLongLong)
+            }
+        } else {
+#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
+ #if CYTHON_USE_PYLONG_INTERNALS
+            if (sizeof(digit) <= sizeof(unsigned int)) {
+                switch (Py_SIZE(x)) {
+                    case  0: return 0;
+                    case  1: return +(unsigned int) ((PyLongObject*)x)->ob_digit[0];
+                    case -1: return -(unsigned int) ((PyLongObject*)x)->ob_digit[0];
+                }
+            }
+ #endif
+#endif
+            if (sizeof(unsigned int) <= sizeof(long)) {
+                __PYX_VERIFY_RETURN_INT(unsigned int, long, PyLong_AsLong)
+            } else if (sizeof(unsigned int) <= sizeof(long long)) {
+                __PYX_VERIFY_RETURN_INT(unsigned int, long long, PyLong_AsLongLong)
+            }
+        }
+        {
+#if CYTHON_COMPILING_IN_PYPY && !defined(_PyLong_AsByteArray)
+            PyErr_SetString(PyExc_RuntimeError,
+                            "_PyLong_AsByteArray() not available in PyPy, cannot convert large numbers");
 #else
-    PyErr_SetExcInfo(type, value, tb);
+            unsigned int val;
+            PyObject *v = __Pyx_PyNumber_Int(x);
+ #if PY_MAJOR_VERSION < 3
+            if (likely(v) && !PyLong_Check(v)) {
+                PyObject *tmp = v;
+                v = PyNumber_Long(tmp);
+                Py_DECREF(tmp);
+            }
+ #endif
+            if (likely(v)) {
+                int one = 1; int is_little = (int)*(unsigned char *)&one;
+                unsigned char *bytes = (unsigned char *)&val;
+                int ret = _PyLong_AsByteArray((PyLongObject *)v,
+                                              bytes, sizeof(val),
+                                              is_little, !is_unsigned);
+                Py_DECREF(v);
+                if (likely(!ret))
+                    return val;
+            }
+#endif
+            return (unsigned int) -1;
+        }
+    } else {
+        unsigned int val;
+        PyObject *tmp = __Pyx_PyNumber_Int(x);
+        if (!tmp) return (unsigned int) -1;
+        val = __Pyx_PyInt_As_unsigned_int(tmp);
+        Py_DECREF(tmp);
+        return val;
+    }
+}
+
+#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
+ #if CYTHON_USE_PYLONG_INTERNALS
+  #include "longintrepr.h"
+ #endif
+#endif
+static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *x) {
+    const int neg_one = (int) -1, const_zero = 0;
+    const int is_unsigned = neg_one > const_zero;
+#if PY_MAJOR_VERSION < 3
+    if (likely(PyInt_Check(x))) {
+        if (sizeof(int) < sizeof(long)) {
+            __PYX_VERIFY_RETURN_INT(int, long, PyInt_AS_LONG)
+        } else {
+            long val = PyInt_AS_LONG(x);
+            if (is_unsigned && unlikely(val < 0)) {
+                PyErr_SetString(PyExc_OverflowError,
+                                "can't convert negative value to int");
+                return (int) -1;
+            }
+            return (int) val;
+        }
+    } else
+#endif
+    if (likely(PyLong_Check(x))) {
+        if (is_unsigned) {
+#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
+ #if CYTHON_USE_PYLONG_INTERNALS
+            if (sizeof(digit) <= sizeof(int)) {
+                switch (Py_SIZE(x)) {
+                    case  0: return 0;
+                    case  1: return (int) ((PyLongObject*)x)->ob_digit[0];
+                }
+            }
+ #endif
+#endif
+            if (unlikely(Py_SIZE(x) < 0)) {
+                PyErr_SetString(PyExc_OverflowError,
+                                "can't convert negative value to int");
+                return (int) -1;
+            }
+            if (sizeof(int) <= sizeof(unsigned long)) {
+                __PYX_VERIFY_RETURN_INT(int, unsigned long, PyLong_AsUnsignedLong)
+            } else if (sizeof(int) <= sizeof(unsigned long long)) {
+                __PYX_VERIFY_RETURN_INT(int, unsigned long long, PyLong_AsUnsignedLongLong)
+            }
+        } else {
+#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
+ #if CYTHON_USE_PYLONG_INTERNALS
+            if (sizeof(digit) <= sizeof(int)) {
+                switch (Py_SIZE(x)) {
+                    case  0: return 0;
+                    case  1: return +(int) ((PyLongObject*)x)->ob_digit[0];
+                    case -1: return -(int) ((PyLongObject*)x)->ob_digit[0];
+                }
+            }
+ #endif
+#endif
+            if (sizeof(int) <= sizeof(long)) {
+                __PYX_VERIFY_RETURN_INT(int, long, PyLong_AsLong)
+            } else if (sizeof(int) <= sizeof(long long)) {
+                __PYX_VERIFY_RETURN_INT(int, long long, PyLong_AsLongLong)
+            }
+        }
+        {
+#if CYTHON_COMPILING_IN_PYPY && !defined(_PyLong_AsByteArray)
+            PyErr_SetString(PyExc_RuntimeError,
+                            "_PyLong_AsByteArray() not available in PyPy, cannot convert large numbers");
+#else
+            int val;
+            PyObject *v = __Pyx_PyNumber_Int(x);
+ #if PY_MAJOR_VERSION < 3
+            if (likely(v) && !PyLong_Check(v)) {
+                PyObject *tmp = v;
+                v = PyNumber_Long(tmp);
+                Py_DECREF(tmp);
+            }
+ #endif
+            if (likely(v)) {
+                int one = 1; int is_little = (int)*(unsigned char *)&one;
+                unsigned char *bytes = (unsigned char *)&val;
+                int ret = _PyLong_AsByteArray((PyLongObject *)v,
+                                              bytes, sizeof(val),
+                                              is_little, !is_unsigned);
+                Py_DECREF(v);
+                if (likely(!ret))
+                    return val;
+            }
 #endif
+            return (int) -1;
+        }
+    } else {
+        int val;
+        PyObject *tmp = __Pyx_PyNumber_Int(x);
+        if (!tmp) return (int) -1;
+        val = __Pyx_PyInt_As_int(tmp);
+        Py_DECREF(tmp);
+        return val;
+    }
 }
 
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level) {
@@ -27747,7 +30103,7 @@ static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level) {
     PyObject *list;
     #if PY_VERSION_HEX < 0x03030000
     PyObject *py_import;
-    py_import = __Pyx_PyObject_GetAttrStr(__pyx_b, __pyx_n_s____import__);
+    py_import = __Pyx_PyObject_GetAttrStr(__pyx_b, __pyx_n_s_import);
     if (!py_import)
         goto bad;
     #endif
@@ -27821,111 +30177,200 @@ bad:
     return module;
 }
 
-static PyObject *__Pyx_FindPy2Metaclass(PyObject *bases) {
-    PyObject *metaclass;
-#if PY_MAJOR_VERSION < 3
-    if (PyTuple_Check(bases) && PyTuple_GET_SIZE(bases) > 0) {
-        PyObject *base = PyTuple_GET_ITEM(bases, 0);
-        metaclass = __Pyx_PyObject_GetAttrStr(base, __pyx_n_s____class__);
-        if (!metaclass) {
-            PyErr_Clear();
-            metaclass = (PyObject*) Py_TYPE(base);
+static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value) {
+    const int neg_one = (int) -1, const_zero = 0;
+    const int is_unsigned = neg_one > const_zero;
+    if (is_unsigned) {
+        if (sizeof(int) < sizeof(long)) {
+            return PyInt_FromLong((long) value);
+        } else if (sizeof(int) <= sizeof(unsigned long)) {
+            return PyLong_FromUnsignedLong((unsigned long) value);
+        } else if (sizeof(int) <= sizeof(unsigned long long)) {
+            return PyLong_FromUnsignedLongLong((unsigned long long) value);
         }
     } else {
-        metaclass = (PyObject *) &PyClass_Type;
+        if (sizeof(int) <= sizeof(long)) {
+            return PyInt_FromLong((long) value);
+        } else if (sizeof(int) <= sizeof(long long)) {
+            return PyLong_FromLongLong((long long) value);
+        }
     }
-#else
-    if (PyTuple_Check(bases) && PyTuple_GET_SIZE(bases) > 0) {
-        PyObject *base = PyTuple_GET_ITEM(bases, 0);
-        metaclass = (PyObject*) Py_TYPE(base);
-    } else {
-        metaclass = (PyObject *) &PyType_Type;
+    {
+        int one = 1; int little = (int)*(unsigned char *)&one;
+        unsigned char *bytes = (unsigned char *)&value;
+        return _PyLong_FromByteArray(bytes, sizeof(int),
+                                     little, !is_unsigned);
     }
-#endif
-    Py_INCREF(metaclass);
-    return metaclass;
 }
 
-static PyObject *__Pyx_CreateClass(PyObject *bases, PyObject *dict, PyObject *name,
-                                   PyObject *qualname, PyObject *modname) {
-    PyObject *result;
-    PyObject *metaclass;
-    if (PyDict_SetItem(dict, __pyx_n_s____module__, modname) < 0)
-        return NULL;
-    if (PyDict_SetItem(dict, __pyx_n_s____qualname__, qualname) < 0)
-        return NULL;
-    metaclass = PyDict_GetItem(dict, __pyx_n_s____metaclass__);
-    if (metaclass) {
-        Py_INCREF(metaclass);
+static CYTHON_INLINE PyObject* __Pyx_PyInt_From_long(long value) {
+    const long neg_one = (long) -1, const_zero = 0;
+    const int is_unsigned = neg_one > const_zero;
+    if (is_unsigned) {
+        if (sizeof(long) < sizeof(long)) {
+            return PyInt_FromLong((long) value);
+        } else if (sizeof(long) <= sizeof(unsigned long)) {
+            return PyLong_FromUnsignedLong((unsigned long) value);
+        } else if (sizeof(long) <= sizeof(unsigned long long)) {
+            return PyLong_FromUnsignedLongLong((unsigned long long) value);
+        }
     } else {
-        metaclass = __Pyx_FindPy2Metaclass(bases);
+        if (sizeof(long) <= sizeof(long)) {
+            return PyInt_FromLong((long) value);
+        } else if (sizeof(long) <= sizeof(long long)) {
+            return PyLong_FromLongLong((long long) value);
+        }
+    }
+    {
+        int one = 1; int little = (int)*(unsigned char *)&one;
+        unsigned char *bytes = (unsigned char *)&value;
+        return _PyLong_FromByteArray(bytes, sizeof(long),
+                                     little, !is_unsigned);
     }
-    result = PyObject_CallFunctionObjArgs(metaclass, name, bases, dict, NULL);
-    Py_DECREF(metaclass);
-    return result;
 }
 
-static CYTHON_INLINE WordID __Pyx_PyInt_from_py_WordID(PyObject* x) {
-    const WordID neg_one = (WordID)-1, const_zero = (WordID)0;
-    const int is_unsigned = const_zero < neg_one;
-    if (sizeof(WordID) == sizeof(char)) {
-        if (is_unsigned)
-            return (WordID)__Pyx_PyInt_AsUnsignedChar(x);
-        else
-            return (WordID)__Pyx_PyInt_AsSignedChar(x);
-    } else if (sizeof(WordID) == sizeof(short)) {
-        if (is_unsigned)
-            return (WordID)__Pyx_PyInt_AsUnsignedShort(x);
-        else
-            return (WordID)__Pyx_PyInt_AsSignedShort(x);
-    } else if (sizeof(WordID) == sizeof(int)) {
-        if (is_unsigned)
-            return (WordID)__Pyx_PyInt_AsUnsignedInt(x);
-        else
-            return (WordID)__Pyx_PyInt_AsSignedInt(x);
-    } else if (sizeof(WordID) == sizeof(long)) {
-        if (is_unsigned)
-            return (WordID)__Pyx_PyInt_AsUnsignedLong(x);
-        else
-            return (WordID)__Pyx_PyInt_AsSignedLong(x);
-    } else if (sizeof(WordID) == sizeof(PY_LONG_LONG)) {
-        if (is_unsigned)
-            return (WordID)__Pyx_PyInt_AsUnsignedLongLong(x);
-        else
-            return (WordID)__Pyx_PyInt_AsSignedLongLong(x);
-    }  else {
-        #if CYTHON_COMPILING_IN_PYPY && !defined(_PyLong_AsByteArray)
-        PyErr_SetString(PyExc_RuntimeError,
-                        "_PyLong_AsByteArray() not available in PyPy, cannot convert large numbers");
-        #else
+#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
+ #if CYTHON_USE_PYLONG_INTERNALS
+  #include "longintrepr.h"
+ #endif
+#endif
+static CYTHON_INLINE WordID __Pyx_PyInt_As_WordID(PyObject *x) {
+    const WordID neg_one = (WordID) -1, const_zero = 0;
+    const int is_unsigned = neg_one > const_zero;
+#if PY_MAJOR_VERSION < 3
+    if (likely(PyInt_Check(x))) {
+        if (sizeof(WordID) < sizeof(long)) {
+            __PYX_VERIFY_RETURN_INT(WordID, long, PyInt_AS_LONG)
+        } else {
+            long val = PyInt_AS_LONG(x);
+            if (is_unsigned && unlikely(val < 0)) {
+                PyErr_SetString(PyExc_OverflowError,
+                                "can't convert negative value to WordID");
+                return (WordID) -1;
+            }
+            return (WordID) val;
+        }
+    } else
+#endif
+    if (likely(PyLong_Check(x))) {
+        if (is_unsigned) {
+#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
+ #if CYTHON_USE_PYLONG_INTERNALS
+            if (sizeof(digit) <= sizeof(WordID)) {
+                switch (Py_SIZE(x)) {
+                    case  0: return 0;
+                    case  1: return (WordID) ((PyLongObject*)x)->ob_digit[0];
+                }
+            }
+ #endif
+#endif
+            if (unlikely(Py_SIZE(x) < 0)) {
+                PyErr_SetString(PyExc_OverflowError,
+                                "can't convert negative value to WordID");
+                return (WordID) -1;
+            }
+            if (sizeof(WordID) <= sizeof(unsigned long)) {
+                __PYX_VERIFY_RETURN_INT(WordID, unsigned long, PyLong_AsUnsignedLong)
+            } else if (sizeof(WordID) <= sizeof(unsigned long long)) {
+                __PYX_VERIFY_RETURN_INT(WordID, unsigned long long, PyLong_AsUnsignedLongLong)
+            }
+        } else {
+#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
+ #if CYTHON_USE_PYLONG_INTERNALS
+            if (sizeof(digit) <= sizeof(WordID)) {
+                switch (Py_SIZE(x)) {
+                    case  0: return 0;
+                    case  1: return +(WordID) ((PyLongObject*)x)->ob_digit[0];
+                    case -1: return -(WordID) ((PyLongObject*)x)->ob_digit[0];
+                }
+            }
+ #endif
+#endif
+            if (sizeof(WordID) <= sizeof(long)) {
+                __PYX_VERIFY_RETURN_INT(WordID, long, PyLong_AsLong)
+            } else if (sizeof(WordID) <= sizeof(long long)) {
+                __PYX_VERIFY_RETURN_INT(WordID, long long, PyLong_AsLongLong)
+            }
+        }
+        {
+#if CYTHON_COMPILING_IN_PYPY && !defined(_PyLong_AsByteArray)
+            PyErr_SetString(PyExc_RuntimeError,
+                            "_PyLong_AsByteArray() not available in PyPy, cannot convert large numbers");
+#else
+            WordID val;
+            PyObject *v = __Pyx_PyNumber_Int(x);
+ #if PY_MAJOR_VERSION < 3
+            if (likely(v) && !PyLong_Check(v)) {
+                PyObject *tmp = v;
+                v = PyNumber_Long(tmp);
+                Py_DECREF(tmp);
+            }
+ #endif
+            if (likely(v)) {
+                int one = 1; int is_little = (int)*(unsigned char *)&one;
+                unsigned char *bytes = (unsigned char *)&val;
+                int ret = _PyLong_AsByteArray((PyLongObject *)v,
+                                              bytes, sizeof(val),
+                                              is_little, !is_unsigned);
+                Py_DECREF(v);
+                if (likely(!ret))
+                    return val;
+            }
+#endif
+            return (WordID) -1;
+        }
+    } else {
         WordID val;
-        PyObject *v = __Pyx_PyNumber_Int(x);
-        #if PY_MAJOR_VERSION < 3
-        if (likely(v) && !PyLong_Check(v)) {
-            PyObject *tmp = v;
-            v = PyNumber_Long(tmp);
-            Py_DECREF(tmp);
+        PyObject *tmp = __Pyx_PyNumber_Int(x);
+        if (!tmp) return (WordID) -1;
+        val = __Pyx_PyInt_As_WordID(tmp);
+        Py_DECREF(tmp);
+        return val;
+    }
+}
+
+static CYTHON_INLINE PyObject* __Pyx_PyInt_From_short(short value) {
+    const short neg_one = (short) -1, const_zero = 0;
+    const int is_unsigned = neg_one > const_zero;
+    if (is_unsigned) {
+        if (sizeof(short) < sizeof(long)) {
+            return PyInt_FromLong((long) value);
+        } else if (sizeof(short) <= sizeof(unsigned long)) {
+            return PyLong_FromUnsignedLong((unsigned long) value);
+        } else if (sizeof(short) <= sizeof(unsigned long long)) {
+            return PyLong_FromUnsignedLongLong((unsigned long long) value);
         }
-        #endif
-        if (likely(v)) {
-            int one = 1; int is_little = (int)*(unsigned char *)&one;
-            unsigned char *bytes = (unsigned char *)&val;
-            int ret = _PyLong_AsByteArray((PyLongObject *)v,
-                                          bytes, sizeof(val),
-                                          is_little, !is_unsigned);
-            Py_DECREF(v);
-            if (likely(!ret))
-                return val;
+    } else {
+        if (sizeof(short) <= sizeof(long)) {
+            return PyInt_FromLong((long) value);
+        } else if (sizeof(short) <= sizeof(long long)) {
+            return PyLong_FromLongLong((long long) value);
         }
-        #endif
-        return (WordID)-1;
     }
+    {
+        int one = 1; int little = (int)*(unsigned char *)&one;
+        unsigned char *bytes = (unsigned char *)&value;
+        return _PyLong_FromByteArray(bytes, sizeof(short),
+                                     little, !is_unsigned);
+    }
+}
+
+static CYTHON_INLINE PyObject *__Pyx_GetAttr(PyObject *o, PyObject *n) {
+#if CYTHON_COMPILING_IN_CPYTHON
+#if PY_MAJOR_VERSION >= 3
+    if (likely(PyUnicode_Check(n)))
+#else
+    if (likely(PyString_Check(n)))
+#endif
+        return __Pyx_PyObject_GetAttrStr(o, n);
+#endif
+    return PyObject_GetAttr(o, n);
 }
 
 static PyObject* __Pyx_Globals(void) {
     Py_ssize_t i;
     PyObject *names = NULL;
-    PyObject *globals = PyObject_GetAttr(__pyx_m, __pyx_n_s____dict__);
+    PyObject *globals = PyObject_GetAttr(__pyx_m, __pyx_n_s_dict);
     if (!globals) {
         PyErr_SetString(PyExc_TypeError,
             "current module must have __dict__ attribute");
@@ -27943,7 +30388,7 @@ static PyObject* __Pyx_Globals(void) {
         PyObject* name = PyList_GET_ITEM(names, i);
 #endif
         if (!PyDict_Contains(globals, name)) {
-            PyObject* value = PyObject_GetAttr(__pyx_m, name);
+            PyObject* value = __Pyx_GetAttr(__pyx_m, name);
             if (!value) {
 #if CYTHON_COMPILING_IN_PYPY
                 Py_DECREF(name);
@@ -27970,358 +30415,54 @@ bad:
     return NULL;
 }
 
-static CYTHON_INLINE unsigned char __Pyx_PyInt_AsUnsignedChar(PyObject* x) {
-    const unsigned char neg_one = (unsigned char)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-    if (sizeof(unsigned char) < sizeof(long)) {
-        long val = __Pyx_PyInt_AsLong(x);
-        if (unlikely(val != (long)(unsigned char)val)) {
-            if (!unlikely(val == -1 && PyErr_Occurred())) {
-                PyErr_SetString(PyExc_OverflowError,
-                    (is_unsigned && unlikely(val < 0)) ?
-                    "can't convert negative value to unsigned char" :
-                    "value too large to convert to unsigned char");
-            }
-            return (unsigned char)-1;
-        }
-        return (unsigned char)val;
-    }
-    return (unsigned char)__Pyx_PyInt_AsUnsignedLong(x);
-}
-
-static CYTHON_INLINE unsigned short __Pyx_PyInt_AsUnsignedShort(PyObject* x) {
-    const unsigned short neg_one = (unsigned short)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-    if (sizeof(unsigned short) < sizeof(long)) {
-        long val = __Pyx_PyInt_AsLong(x);
-        if (unlikely(val != (long)(unsigned short)val)) {
-            if (!unlikely(val == -1 && PyErr_Occurred())) {
-                PyErr_SetString(PyExc_OverflowError,
-                    (is_unsigned && unlikely(val < 0)) ?
-                    "can't convert negative value to unsigned short" :
-                    "value too large to convert to unsigned short");
-            }
-            return (unsigned short)-1;
-        }
-        return (unsigned short)val;
-    }
-    return (unsigned short)__Pyx_PyInt_AsUnsignedLong(x);
-}
-
-static CYTHON_INLINE unsigned int __Pyx_PyInt_AsUnsignedInt(PyObject* x) {
-    const unsigned int neg_one = (unsigned int)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-    if (sizeof(unsigned int) < sizeof(long)) {
-        long val = __Pyx_PyInt_AsLong(x);
-        if (unlikely(val != (long)(unsigned int)val)) {
-            if (!unlikely(val == -1 && PyErr_Occurred())) {
-                PyErr_SetString(PyExc_OverflowError,
-                    (is_unsigned && unlikely(val < 0)) ?
-                    "can't convert negative value to unsigned int" :
-                    "value too large to convert to unsigned int");
-            }
-            return (unsigned int)-1;
-        }
-        return (unsigned int)val;
-    }
-    return (unsigned int)__Pyx_PyInt_AsUnsignedLong(x);
-}
-
-static CYTHON_INLINE char __Pyx_PyInt_AsChar(PyObject* x) {
-    const char neg_one = (char)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-    if (sizeof(char) < sizeof(long)) {
-        long val = __Pyx_PyInt_AsLong(x);
-        if (unlikely(val != (long)(char)val)) {
-            if (!unlikely(val == -1 && PyErr_Occurred())) {
-                PyErr_SetString(PyExc_OverflowError,
-                    (is_unsigned && unlikely(val < 0)) ?
-                    "can't convert negative value to char" :
-                    "value too large to convert to char");
-            }
-            return (char)-1;
-        }
-        return (char)val;
-    }
-    return (char)__Pyx_PyInt_AsLong(x);
-}
-
-static CYTHON_INLINE short __Pyx_PyInt_AsShort(PyObject* x) {
-    const short neg_one = (short)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-    if (sizeof(short) < sizeof(long)) {
-        long val = __Pyx_PyInt_AsLong(x);
-        if (unlikely(val != (long)(short)val)) {
-            if (!unlikely(val == -1 && PyErr_Occurred())) {
-                PyErr_SetString(PyExc_OverflowError,
-                    (is_unsigned && unlikely(val < 0)) ?
-                    "can't convert negative value to short" :
-                    "value too large to convert to short");
-            }
-            return (short)-1;
-        }
-        return (short)val;
-    }
-    return (short)__Pyx_PyInt_AsLong(x);
-}
-
-static CYTHON_INLINE int __Pyx_PyInt_AsInt(PyObject* x) {
-    const int neg_one = (int)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-    if (sizeof(int) < sizeof(long)) {
-        long val = __Pyx_PyInt_AsLong(x);
-        if (unlikely(val != (long)(int)val)) {
-            if (!unlikely(val == -1 && PyErr_Occurred())) {
-                PyErr_SetString(PyExc_OverflowError,
-                    (is_unsigned && unlikely(val < 0)) ?
-                    "can't convert negative value to int" :
-                    "value too large to convert to int");
-            }
-            return (int)-1;
-        }
-        return (int)val;
-    }
-    return (int)__Pyx_PyInt_AsLong(x);
-}
-
-static CYTHON_INLINE signed char __Pyx_PyInt_AsSignedChar(PyObject* x) {
-    const signed char neg_one = (signed char)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-    if (sizeof(signed char) < sizeof(long)) {
-        long val = __Pyx_PyInt_AsLong(x);
-        if (unlikely(val != (long)(signed char)val)) {
-            if (!unlikely(val == -1 && PyErr_Occurred())) {
-                PyErr_SetString(PyExc_OverflowError,
-                    (is_unsigned && unlikely(val < 0)) ?
-                    "can't convert negative value to signed char" :
-                    "value too large to convert to signed char");
-            }
-            return (signed char)-1;
-        }
-        return (signed char)val;
-    }
-    return (signed char)__Pyx_PyInt_AsSignedLong(x);
-}
-
-static CYTHON_INLINE signed short __Pyx_PyInt_AsSignedShort(PyObject* x) {
-    const signed short neg_one = (signed short)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-    if (sizeof(signed short) < sizeof(long)) {
-        long val = __Pyx_PyInt_AsLong(x);
-        if (unlikely(val != (long)(signed short)val)) {
-            if (!unlikely(val == -1 && PyErr_Occurred())) {
-                PyErr_SetString(PyExc_OverflowError,
-                    (is_unsigned && unlikely(val < 0)) ?
-                    "can't convert negative value to signed short" :
-                    "value too large to convert to signed short");
-            }
-            return (signed short)-1;
-        }
-        return (signed short)val;
-    }
-    return (signed short)__Pyx_PyInt_AsSignedLong(x);
-}
-
-static CYTHON_INLINE signed int __Pyx_PyInt_AsSignedInt(PyObject* x) {
-    const signed int neg_one = (signed int)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-    if (sizeof(signed int) < sizeof(long)) {
-        long val = __Pyx_PyInt_AsLong(x);
-        if (unlikely(val != (long)(signed int)val)) {
-            if (!unlikely(val == -1 && PyErr_Occurred())) {
-                PyErr_SetString(PyExc_OverflowError,
-                    (is_unsigned && unlikely(val < 0)) ?
-                    "can't convert negative value to signed int" :
-                    "value too large to convert to signed int");
-            }
-            return (signed int)-1;
-        }
-        return (signed int)val;
-    }
-    return (signed int)__Pyx_PyInt_AsSignedLong(x);
-}
-
-static CYTHON_INLINE int __Pyx_PyInt_AsLongDouble(PyObject* x) {
-    const int neg_one = (int)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-    if (sizeof(int) < sizeof(long)) {
-        long val = __Pyx_PyInt_AsLong(x);
-        if (unlikely(val != (long)(int)val)) {
-            if (!unlikely(val == -1 && PyErr_Occurred())) {
-                PyErr_SetString(PyExc_OverflowError,
-                    (is_unsigned && unlikely(val < 0)) ?
-                    "can't convert negative value to int" :
-                    "value too large to convert to int");
-            }
-            return (int)-1;
-        }
-        return (int)val;
-    }
-    return (int)__Pyx_PyInt_AsLong(x);
-}
-
 #if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-#include "longintrepr.h"
-#endif
+ #if CYTHON_USE_PYLONG_INTERNALS
+  #include "longintrepr.h"
+ #endif
 #endif
-static CYTHON_INLINE unsigned long __Pyx_PyInt_AsUnsignedLong(PyObject* x) {
-    const unsigned long neg_one = (unsigned long)-1, const_zero = 0;
+static CYTHON_INLINE long __Pyx_PyInt_As_long(PyObject *x) {
+    const long neg_one = (long) -1, const_zero = 0;
     const int is_unsigned = neg_one > const_zero;
 #if PY_MAJOR_VERSION < 3
     if (likely(PyInt_Check(x))) {
-        long val = PyInt_AS_LONG(x);
-        if (is_unsigned && unlikely(val < 0)) {
-            PyErr_SetString(PyExc_OverflowError,
-                            "can't convert negative value to unsigned long");
-            return (unsigned long)-1;
-        }
-        return (unsigned long)val;
-    } else
-#endif
-    if (likely(PyLong_Check(x))) {
-        if (is_unsigned) {
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (sizeof(digit) <= sizeof(unsigned long)) {
-                switch (Py_SIZE(x)) {
-                    case  0: return 0;
-                    case  1: return (unsigned long) ((PyLongObject*)x)->ob_digit[0];
-                }
-            }
-#endif
-#endif
-            if (unlikely(Py_SIZE(x) < 0)) {
-                PyErr_SetString(PyExc_OverflowError,
-                                "can't convert negative value to unsigned long");
-                return (unsigned long)-1;
-            }
-            return (unsigned long)PyLong_AsUnsignedLong(x);
+        if (sizeof(long) < sizeof(long)) {
+            __PYX_VERIFY_RETURN_INT(long, long, PyInt_AS_LONG)
         } else {
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (sizeof(digit) <= sizeof(unsigned long)) {
-                switch (Py_SIZE(x)) {
-                    case  0: return 0;
-                    case  1: return +(unsigned long) ((PyLongObject*)x)->ob_digit[0];
-                    case -1: return -(unsigned long) ((PyLongObject*)x)->ob_digit[0];
-                }
-            }
-#endif
-#endif
-            return (unsigned long)PyLong_AsLong(x);
-        }
-    } else {
-        unsigned long val;
-        PyObject *tmp = __Pyx_PyNumber_Int(x);
-        if (!tmp) return (unsigned long)-1;
-        val = __Pyx_PyInt_AsUnsignedLong(tmp);
-        Py_DECREF(tmp);
-        return val;
-    }
-}
-
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-#include "longintrepr.h"
-#endif
-#endif
-static CYTHON_INLINE unsigned PY_LONG_LONG __Pyx_PyInt_AsUnsignedLongLong(PyObject* x) {
-    const unsigned PY_LONG_LONG neg_one = (unsigned PY_LONG_LONG)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-#if PY_MAJOR_VERSION < 3
-    if (likely(PyInt_Check(x))) {
-        long val = PyInt_AS_LONG(x);
-        if (is_unsigned && unlikely(val < 0)) {
-            PyErr_SetString(PyExc_OverflowError,
-                            "can't convert negative value to unsigned PY_LONG_LONG");
-            return (unsigned PY_LONG_LONG)-1;
-        }
-        return (unsigned PY_LONG_LONG)val;
-    } else
-#endif
-    if (likely(PyLong_Check(x))) {
-        if (is_unsigned) {
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (sizeof(digit) <= sizeof(unsigned PY_LONG_LONG)) {
-                switch (Py_SIZE(x)) {
-                    case  0: return 0;
-                    case  1: return (unsigned PY_LONG_LONG) ((PyLongObject*)x)->ob_digit[0];
-                }
-            }
-#endif
-#endif
-            if (unlikely(Py_SIZE(x) < 0)) {
+            long val = PyInt_AS_LONG(x);
+            if (is_unsigned && unlikely(val < 0)) {
                 PyErr_SetString(PyExc_OverflowError,
-                                "can't convert negative value to unsigned PY_LONG_LONG");
-                return (unsigned PY_LONG_LONG)-1;
-            }
-            return (unsigned PY_LONG_LONG)PyLong_AsUnsignedLongLong(x);
-        } else {
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (sizeof(digit) <= sizeof(unsigned PY_LONG_LONG)) {
-                switch (Py_SIZE(x)) {
-                    case  0: return 0;
-                    case  1: return +(unsigned PY_LONG_LONG) ((PyLongObject*)x)->ob_digit[0];
-                    case -1: return -(unsigned PY_LONG_LONG) ((PyLongObject*)x)->ob_digit[0];
-                }
+                                "can't convert negative value to long");
+                return (long) -1;
             }
-#endif
-#endif
-            return (unsigned PY_LONG_LONG)PyLong_AsLongLong(x);
+            return (long) val;
         }
-    } else {
-        unsigned PY_LONG_LONG val;
-        PyObject *tmp = __Pyx_PyNumber_Int(x);
-        if (!tmp) return (unsigned PY_LONG_LONG)-1;
-        val = __Pyx_PyInt_AsUnsignedLongLong(tmp);
-        Py_DECREF(tmp);
-        return val;
-    }
-}
-
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-#include "longintrepr.h"
-#endif
-#endif
-static CYTHON_INLINE long __Pyx_PyInt_AsLong(PyObject* x) {
-    const long neg_one = (long)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-#if PY_MAJOR_VERSION < 3
-    if (likely(PyInt_Check(x))) {
-        long val = PyInt_AS_LONG(x);
-        if (is_unsigned && unlikely(val < 0)) {
-            PyErr_SetString(PyExc_OverflowError,
-                            "can't convert negative value to long");
-            return (long)-1;
-        }
-        return (long)val;
     } else
 #endif
     if (likely(PyLong_Check(x))) {
         if (is_unsigned) {
 #if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
+ #if CYTHON_USE_PYLONG_INTERNALS
             if (sizeof(digit) <= sizeof(long)) {
                 switch (Py_SIZE(x)) {
                     case  0: return 0;
                     case  1: return (long) ((PyLongObject*)x)->ob_digit[0];
                 }
             }
-#endif
+ #endif
 #endif
             if (unlikely(Py_SIZE(x) < 0)) {
                 PyErr_SetString(PyExc_OverflowError,
                                 "can't convert negative value to long");
-                return (long)-1;
+                return (long) -1;
+            }
+            if (sizeof(long) <= sizeof(unsigned long)) {
+                __PYX_VERIFY_RETURN_INT(long, unsigned long, PyLong_AsUnsignedLong)
+            } else if (sizeof(long) <= sizeof(unsigned long long)) {
+                __PYX_VERIFY_RETURN_INT(long, unsigned long long, PyLong_AsUnsignedLongLong)
             }
-            return (long)PyLong_AsUnsignedLong(x);
         } else {
 #if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
+ #if CYTHON_USE_PYLONG_INTERNALS
             if (sizeof(digit) <= sizeof(long)) {
                 switch (Py_SIZE(x)) {
                     case  0: return 0;
@@ -28329,222 +30470,51 @@ static CYTHON_INLINE long __Pyx_PyInt_AsLong(PyObject* x) {
                     case -1: return -(long) ((PyLongObject*)x)->ob_digit[0];
                 }
             }
+ #endif
 #endif
-#endif
-            return (long)PyLong_AsLong(x);
-        }
-    } else {
-        long val;
-        PyObject *tmp = __Pyx_PyNumber_Int(x);
-        if (!tmp) return (long)-1;
-        val = __Pyx_PyInt_AsLong(tmp);
-        Py_DECREF(tmp);
-        return val;
-    }
-}
-
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-#include "longintrepr.h"
-#endif
-#endif
-static CYTHON_INLINE PY_LONG_LONG __Pyx_PyInt_AsLongLong(PyObject* x) {
-    const PY_LONG_LONG neg_one = (PY_LONG_LONG)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-#if PY_MAJOR_VERSION < 3
-    if (likely(PyInt_Check(x))) {
-        long val = PyInt_AS_LONG(x);
-        if (is_unsigned && unlikely(val < 0)) {
-            PyErr_SetString(PyExc_OverflowError,
-                            "can't convert negative value to PY_LONG_LONG");
-            return (PY_LONG_LONG)-1;
-        }
-        return (PY_LONG_LONG)val;
-    } else
-#endif
-    if (likely(PyLong_Check(x))) {
-        if (is_unsigned) {
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (sizeof(digit) <= sizeof(PY_LONG_LONG)) {
-                switch (Py_SIZE(x)) {
-                    case  0: return 0;
-                    case  1: return (PY_LONG_LONG) ((PyLongObject*)x)->ob_digit[0];
-                }
-            }
-#endif
-#endif
-            if (unlikely(Py_SIZE(x) < 0)) {
-                PyErr_SetString(PyExc_OverflowError,
-                                "can't convert negative value to PY_LONG_LONG");
-                return (PY_LONG_LONG)-1;
-            }
-            return (PY_LONG_LONG)PyLong_AsUnsignedLongLong(x);
-        } else {
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (sizeof(digit) <= sizeof(PY_LONG_LONG)) {
-                switch (Py_SIZE(x)) {
-                    case  0: return 0;
-                    case  1: return +(PY_LONG_LONG) ((PyLongObject*)x)->ob_digit[0];
-                    case -1: return -(PY_LONG_LONG) ((PyLongObject*)x)->ob_digit[0];
-                }
-            }
-#endif
-#endif
-            return (PY_LONG_LONG)PyLong_AsLongLong(x);
-        }
-    } else {
-        PY_LONG_LONG val;
-        PyObject *tmp = __Pyx_PyNumber_Int(x);
-        if (!tmp) return (PY_LONG_LONG)-1;
-        val = __Pyx_PyInt_AsLongLong(tmp);
-        Py_DECREF(tmp);
-        return val;
-    }
-}
-
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-#include "longintrepr.h"
-#endif
-#endif
-static CYTHON_INLINE signed long __Pyx_PyInt_AsSignedLong(PyObject* x) {
-    const signed long neg_one = (signed long)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-#if PY_MAJOR_VERSION < 3
-    if (likely(PyInt_Check(x))) {
-        long val = PyInt_AS_LONG(x);
-        if (is_unsigned && unlikely(val < 0)) {
-            PyErr_SetString(PyExc_OverflowError,
-                            "can't convert negative value to signed long");
-            return (signed long)-1;
-        }
-        return (signed long)val;
-    } else
-#endif
-    if (likely(PyLong_Check(x))) {
-        if (is_unsigned) {
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (sizeof(digit) <= sizeof(signed long)) {
-                switch (Py_SIZE(x)) {
-                    case  0: return 0;
-                    case  1: return (signed long) ((PyLongObject*)x)->ob_digit[0];
-                }
-            }
-#endif
-#endif
-            if (unlikely(Py_SIZE(x) < 0)) {
-                PyErr_SetString(PyExc_OverflowError,
-                                "can't convert negative value to signed long");
-                return (signed long)-1;
+            if (sizeof(long) <= sizeof(long)) {
+                __PYX_VERIFY_RETURN_INT(long, long, PyLong_AsLong)
+            } else if (sizeof(long) <= sizeof(long long)) {
+                __PYX_VERIFY_RETURN_INT(long, long long, PyLong_AsLongLong)
             }
-            return (signed long)PyLong_AsUnsignedLong(x);
-        } else {
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (sizeof(digit) <= sizeof(signed long)) {
-                switch (Py_SIZE(x)) {
-                    case  0: return 0;
-                    case  1: return +(signed long) ((PyLongObject*)x)->ob_digit[0];
-                    case -1: return -(signed long) ((PyLongObject*)x)->ob_digit[0];
-                }
-            }
-#endif
-#endif
-            return (signed long)PyLong_AsLong(x);
         }
-    } else {
-        signed long val;
-        PyObject *tmp = __Pyx_PyNumber_Int(x);
-        if (!tmp) return (signed long)-1;
-        val = __Pyx_PyInt_AsSignedLong(tmp);
-        Py_DECREF(tmp);
-        return val;
-    }
-}
-
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-#include "longintrepr.h"
-#endif
-#endif
-static CYTHON_INLINE signed PY_LONG_LONG __Pyx_PyInt_AsSignedLongLong(PyObject* x) {
-    const signed PY_LONG_LONG neg_one = (signed PY_LONG_LONG)-1, const_zero = 0;
-    const int is_unsigned = neg_one > const_zero;
-#if PY_MAJOR_VERSION < 3
-    if (likely(PyInt_Check(x))) {
-        long val = PyInt_AS_LONG(x);
-        if (is_unsigned && unlikely(val < 0)) {
-            PyErr_SetString(PyExc_OverflowError,
-                            "can't convert negative value to signed PY_LONG_LONG");
-            return (signed PY_LONG_LONG)-1;
-        }
-        return (signed PY_LONG_LONG)val;
-    } else
-#endif
-    if (likely(PyLong_Check(x))) {
-        if (is_unsigned) {
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (sizeof(digit) <= sizeof(signed PY_LONG_LONG)) {
-                switch (Py_SIZE(x)) {
-                    case  0: return 0;
-                    case  1: return (signed PY_LONG_LONG) ((PyLongObject*)x)->ob_digit[0];
-                }
+        {
+#if CYTHON_COMPILING_IN_PYPY && !defined(_PyLong_AsByteArray)
+            PyErr_SetString(PyExc_RuntimeError,
+                            "_PyLong_AsByteArray() not available in PyPy, cannot convert large numbers");
+#else
+            long val;
+            PyObject *v = __Pyx_PyNumber_Int(x);
+ #if PY_MAJOR_VERSION < 3
+            if (likely(v) && !PyLong_Check(v)) {
+                PyObject *tmp = v;
+                v = PyNumber_Long(tmp);
+                Py_DECREF(tmp);
             }
-#endif
-#endif
-            if (unlikely(Py_SIZE(x) < 0)) {
-                PyErr_SetString(PyExc_OverflowError,
-                                "can't convert negative value to signed PY_LONG_LONG");
-                return (signed PY_LONG_LONG)-1;
+ #endif
+            if (likely(v)) {
+                int one = 1; int is_little = (int)*(unsigned char *)&one;
+                unsigned char *bytes = (unsigned char *)&val;
+                int ret = _PyLong_AsByteArray((PyLongObject *)v,
+                                              bytes, sizeof(val),
+                                              is_little, !is_unsigned);
+                Py_DECREF(v);
+                if (likely(!ret))
+                    return val;
             }
-            return (signed PY_LONG_LONG)PyLong_AsUnsignedLongLong(x);
-        } else {
-#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
-#if CYTHON_USE_PYLONG_INTERNALS
-            if (sizeof(digit) <= sizeof(signed PY_LONG_LONG)) {
-                switch (Py_SIZE(x)) {
-                    case  0: return 0;
-                    case  1: return +(signed PY_LONG_LONG) ((PyLongObject*)x)->ob_digit[0];
-                    case -1: return -(signed PY_LONG_LONG) ((PyLongObject*)x)->ob_digit[0];
-                }
-            }
-#endif
 #endif
-            return (signed PY_LONG_LONG)PyLong_AsLongLong(x);
+            return (long) -1;
         }
     } else {
-        signed PY_LONG_LONG val;
+        long val;
         PyObject *tmp = __Pyx_PyNumber_Int(x);
-        if (!tmp) return (signed PY_LONG_LONG)-1;
-        val = __Pyx_PyInt_AsSignedLongLong(tmp);
+        if (!tmp) return (long) -1;
+        val = __Pyx_PyInt_As_long(tmp);
         Py_DECREF(tmp);
         return val;
     }
 }
 
-static CYTHON_INLINE void __Pyx_ExceptionSwap(PyObject **type, PyObject **value, PyObject **tb) {
-    PyObject *tmp_type, *tmp_value, *tmp_tb;
-#if CYTHON_COMPILING_IN_CPYTHON
-    PyThreadState *tstate = PyThreadState_GET();
-    tmp_type = tstate->exc_type;
-    tmp_value = tstate->exc_value;
-    tmp_tb = tstate->exc_traceback;
-    tstate->exc_type = *type;
-    tstate->exc_value = *value;
-    tstate->exc_traceback = *tb;
-#else
-    PyErr_GetExcInfo(&tmp_type, &tmp_value, &tmp_tb);
-    PyErr_SetExcInfo(*type, *value, *tb);
-#endif
-    *type = tmp_type;
-    *value = tmp_value;
-    *tb = tmp_tb;
-}
-
 static PyObject *__Pyx_Generator_Next(PyObject *self);
 static PyObject *__Pyx_Generator_Send(PyObject *self, PyObject *value);
 static PyObject *__Pyx_Generator_Close(PyObject *self);
@@ -28594,7 +30564,7 @@ static int __Pyx_PyGen_FetchStopIterationValue(PyObject **pvalue) {
     Py_DECREF(ev);
 #else
     {
-        PyObject* args = PyObject_GetAttr(ev, __pyx_n_s__args);
+        PyObject* args = PyObject_GetAttr(ev, __pyx_n_s_args);
         Py_DECREF(ev);
         if (likely(args)) {
             value = PyObject_GetItem(args, 0);
@@ -28730,7 +30700,7 @@ static PyObject *__Pyx_Generator_Send(PyObject *self, PyObject *value) {
             if (value == Py_None)
                 ret = PyIter_Next(yf);
             else
-                ret = __Pyx_PyObject_CallMethod1(yf, __pyx_n_s__send, value);
+                ret = __Pyx_PyObject_CallMethod1(yf, __pyx_n_s_send, value);
         }
         gen->is_running = 0;
         if (likely(ret)) {
@@ -28750,7 +30720,7 @@ static int __Pyx_Generator_CloseIter(__pyx_GeneratorObject *gen, PyObject *yf) {
     } else {
         PyObject *meth;
         gen->is_running = 1;
-        meth = PyObject_GetAttr(yf, __pyx_n_s__close);
+        meth = PyObject_GetAttr(yf, __pyx_n_s_close);
         if (unlikely(!meth)) {
             if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
                 PyErr_WriteUnraisable(yf);
@@ -28835,7 +30805,7 @@ static PyObject *__Pyx_Generator_Throw(PyObject *self, PyObject *args) {
         if (__Pyx_Generator_CheckExact(yf)) {
             ret = __Pyx_Generator_Throw(yf, args);
         } else {
-            PyObject *meth = PyObject_GetAttr(yf, __pyx_n_s__throw);
+            PyObject *meth = PyObject_GetAttr(yf, __pyx_n_s_throw);
             if (unlikely(!meth)) {
                 Py_DECREF(yf);
                 if (!PyErr_ExceptionMatches(PyExc_AttributeError)) {
@@ -28886,13 +30856,17 @@ static void __Pyx_Generator_dealloc(PyObject *self) {
     PyObject_GC_UnTrack(gen);
     if (gen->gi_weakreflist != NULL)
         PyObject_ClearWeakRefs(self);
-    PyObject_GC_Track(self);
     if (gen->resume_label > 0) {
+        PyObject_GC_Track(self);
+#if PY_VERSION_HEX >= 0x030400a1
+        if (PyObject_CallFinalizerFromDealloc(self))
+#else
         Py_TYPE(gen)->tp_del(self);
         if (self->ob_refcnt > 0)
+#endif
             return;                     /* resurrected.  :( */
+        PyObject_GC_UnTrack(self);
     }
-    PyObject_GC_UnTrack(self);
     __Pyx_Generator_clear(self);
     PyObject_GC_Del(gen);
 }
@@ -28902,8 +30876,10 @@ static void __Pyx_Generator_del(PyObject *self) {
     __pyx_GeneratorObject *gen = (__pyx_GeneratorObject *) self;
     if (gen->resume_label <= 0)
         return ;
+#if PY_VERSION_HEX < 0x030400a1
     assert(self->ob_refcnt == 0);
     self->ob_refcnt = 1;
+#endif
     __Pyx_ErrFetch(&error_type, &error_value, &error_traceback);
     res = __Pyx_Generator_Close(self);
     if (res == NULL)
@@ -28911,6 +30887,7 @@ static void __Pyx_Generator_del(PyObject *self) {
     else
         Py_DECREF(res);
     __Pyx_ErrRestore(error_type, error_value, error_traceback);
+#if PY_VERSION_HEX < 0x030400a1
     /* Undo the temporary resurrection; can't use DECREF here, it would
      * cause a recursive call.
      */
@@ -28942,6 +30919,7 @@ static void __Pyx_Generator_del(PyObject *self) {
     --Py_TYPE(self)->tp_frees;
     --Py_TYPE(self)->tp_allocs;
 #endif
+#endif
 }
 static PyMemberDef __pyx_Generator_memberlist[] = {
     {(char *) "gi_running",
@@ -28985,7 +30963,7 @@ static PyTypeObject __pyx_GeneratorType_type = {
     0,                                  /*tp_getattro*/
     0,                                  /*tp_setattro*/
     0,                                  /*tp_as_buffer*/
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /* tp_flags*/
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_HAVE_FINALIZE, /* tp_flags*/
     0,                                  /*tp_doc*/
     (traverseproc) __Pyx_Generator_traverse,   /*tp_traverse*/
     0,                                  /*tp_clear*/
@@ -29011,10 +30989,17 @@ static PyTypeObject __pyx_GeneratorType_type = {
     0,                                  /*tp_cache*/
     0,                                  /*tp_subclasses*/
     0,                                  /*tp_weaklist*/
+#if PY_VERSION_HEX >= 0x030400a1
+    0,                                  /*tp_del*/
+#else
     __Pyx_Generator_del,                /*tp_del*/
+#endif
 #if PY_VERSION_HEX >= 0x02060000
     0,                                  /*tp_version_tag*/
 #endif
+#if PY_VERSION_HEX >= 0x030400a1
+    __Pyx_Generator_del,                /*tp_finalize*/
+#endif
 };
 static __pyx_GeneratorObject *__Pyx_Generator_New(__pyx_generator_body_t body,
                                                   PyObject *closure) {
@@ -29039,10 +31024,10 @@ static __pyx_GeneratorObject *__Pyx_Generator_New(__pyx_generator_body_t body,
 static int __pyx_Generator_init(void) {
     __pyx_GeneratorType_type.tp_getattro = PyObject_GenericGetAttr;
     __pyx_GeneratorType_type.tp_iter = PyObject_SelfIter;
-    if (PyType_Ready(&__pyx_GeneratorType_type)) {
+    __pyx_GeneratorType = __Pyx_FetchCommonType(&__pyx_GeneratorType_type);
+    if (__pyx_GeneratorType == NULL) {
         return -1;
     }
-    __pyx_GeneratorType = &__pyx_GeneratorType_type;
     return 0;
 }
 
@@ -29110,7 +31095,7 @@ static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class
         goto bad;
     if (!PyType_Check(result)) {
         PyErr_Format(PyExc_TypeError,
-            "%s.%s is not a type object",
+            "%.200s.%.200s is not a type object",
             module_name, class_name);
         goto bad;
     }
@@ -29138,7 +31123,7 @@ static PyTypeObject *__Pyx_ImportType(const char *module_name, const char *class
     }
     else if ((size_t)basicsize != size) {
         PyErr_Format(PyExc_ValueError,
-            "%s.%s has the wrong size, try recompiling",
+            "%.200s.%.200s has the wrong size, try recompiling",
             module_name, class_name);
         goto bad;
     }
@@ -29165,14 +31150,14 @@ static int __Pyx_ImportFunction(PyObject *module, const char *funcname, void (**
     cobj = PyDict_GetItemString(d, funcname);
     if (!cobj) {
         PyErr_Format(PyExc_ImportError,
-            "%s does not export expected C function %s",
+            "%.200s does not export expected C function %.200s",
                 PyModule_GetName(module), funcname);
         goto bad;
     }
 #if PY_VERSION_HEX >= 0x02070000 && !(PY_MAJOR_VERSION==3 && PY_MINOR_VERSION==0)
     if (!PyCapsule_IsValid(cobj, sig)) {
         PyErr_Format(PyExc_TypeError,
-            "C function %s.%s has wrong signature (expected %s, got %s)",
+            "C function %.200s.%.200s has wrong signature (expected %.500s, got %.500s)",
              PyModule_GetName(module), funcname, sig, PyCapsule_GetName(cobj));
         goto bad;
     }
@@ -29186,7 +31171,7 @@ static int __Pyx_ImportFunction(PyObject *module, const char *funcname, void (**
     while (*s1 != '\0' && *s1 == *s2) { s1++; s2++; }
     if (*s1 != *s2) {
         PyErr_Format(PyExc_TypeError,
-            "C function %s.%s has wrong signature (expected %s, got %s)",
+            "C function %.200s.%.200s has wrong signature (expected %.500s, got %.500s)",
              PyModule_GetName(module), funcname, sig, desc);
         goto bad;
     }
@@ -29444,10 +31429,18 @@ static CYTHON_INLINE char* __Pyx_PyObject_AsStringAndSize(PyObject* o, Py_ssize_
 #endif /* PY_VERSION_HEX < 0x03030000 */
     } else
 #endif /* __PYX_DEFAULT_STRING_ENCODING_IS_ASCII  || __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT */
+#if !CYTHON_COMPILING_IN_PYPY
+#if PY_VERSION_HEX >= 0x02060000
+    if (PyByteArray_Check(o)) {
+        *length = PyByteArray_GET_SIZE(o);
+        return PyByteArray_AS_STRING(o);
+    } else
+#endif
+#endif
     {
         char* result;
         int r = PyBytes_AsStringAndSize(o, &result, length);
-        if (r < 0) {
+        if (unlikely(r < 0)) {
             return NULL;
         } else {
             return result;
@@ -29492,7 +31485,7 @@ static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x) {
     if (!PyLong_Check(res)) {
 #endif
       PyErr_Format(PyExc_TypeError,
-                   "__%s__ returned non-%s (type %.200s)",
+                   "__%.4s__ returned non-%.4s (type %.200s)",
                    name, name, Py_TYPE(res)->tp_name);
       Py_DECREF(res);
       return NULL;
@@ -29504,9 +31497,35 @@ static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x) {
   }
   return res;
 }
+#if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
+ #if CYTHON_USE_PYLONG_INTERNALS
+  #include "longintrepr.h"
+ #endif
+#endif
 static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject* b) {
   Py_ssize_t ival;
-  PyObject* x = PyNumber_Index(b);
+  PyObject *x;
+#if PY_MAJOR_VERSION < 3
+  if (likely(PyInt_CheckExact(b)))
+      return PyInt_AS_LONG(b);
+#endif
+  if (likely(PyLong_CheckExact(b))) {
+    #if CYTHON_COMPILING_IN_CPYTHON && PY_MAJOR_VERSION >= 3
+     #if CYTHON_USE_PYLONG_INTERNALS
+       switch (Py_SIZE(b)) {
+       case -1: return -(sdigit)((PyLongObject*)b)->ob_digit[0];
+       case  0: return 0;
+       case  1: return ((PyLongObject*)b)->ob_digit[0];
+       }
+     #endif
+    #endif
+  #if PY_VERSION_HEX < 0x02060000
+    return PyInt_AsSsize_t(b);
+  #else
+    return PyLong_AsSsize_t(b);
+  #endif
+  }
+  x = PyNumber_Index(b);
   if (!x) return -1;
   ival = PyInt_AsSsize_t(x);
   Py_DECREF(x);
@@ -29525,16 +31544,6 @@ static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t ival) {
    return PyInt_FromSize_t(ival);
 #endif
 }
-static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject* x) {
-   unsigned PY_LONG_LONG val = __Pyx_PyInt_AsUnsignedLongLong(x);
-   if (unlikely(val != (unsigned PY_LONG_LONG)(size_t)val)) {
-       if ((val != (unsigned PY_LONG_LONG)-1) || !PyErr_Occurred())
-           PyErr_SetString(PyExc_OverflowError,
-                           "value too large to convert to size_t");
-       return (size_t)-1;
-   }
-   return (size_t)val;
-}
 
 
 #endif /* Py_PYTHON_H */
diff --git a/python/cdec/grammar.pxd b/python/cdec/grammar.pxd
index 0ffe80fa..3607a544 100644
--- a/python/cdec/grammar.pxd
+++ b/python/cdec/grammar.pxd
@@ -16,6 +16,7 @@ cdef extern from "decoder/trule.h":
         FastSparseVector[weight_t] scores_
         WordID lhs_
         int arity_
+        bint ReadFromString(string& line, bint monolingual)
         bint IsUnary()
         bint IsGoal()
         void ComputeArity()
diff --git a/python/cdec/grammar.pxi b/python/cdec/grammar.pxi
index d523e4d2..b78c86ff 100644
--- a/python/cdec/grammar.pxi
+++ b/python/cdec/grammar.pxi
@@ -49,7 +49,7 @@ cdef TRule convert_rule(_sa.Rule rule):
 cdef class TRule:
     cdef shared_ptr[grammar.TRule]* rule
 
-    def __init__(self, lhs, f, e, scores, a=None):
+    def __init__(self, lhs, f, e, scores, a=None, text=None):
         """TRule(lhs, f, e, scores, a=None) -> Translation rule.
         lhs: left hand side non-terminal
         f: source phrase (list of words/NT)
@@ -57,12 +57,18 @@ cdef class TRule:
         scores: dictionary of feature scores
         a: optional list of alignment points"""
         self.rule = new shared_ptr[grammar.TRule](new grammar.TRule())
-        self.lhs = lhs
-        self.e = e
-        self.f = f
-        self.scores = scores
+        if lhs:
+          self.lhs = lhs
+        if e:
+          self.e = e
+        if f:
+          self.f = f
+        if scores:
+          self.scores = scores
         if a:
-            self.a = a
+          self.a = a
+        if text:
+          self.rule.get().ReadFromString(text, 0)
         self.rule.get().ComputeArity()
 
     def __dealloc__(self):
diff --git a/python/cdec/sa/_sa.cpp b/python/cdec/sa/_sa.cpp
index 4c01ee79..d02eed3d 100644
--- a/python/cdec/sa/_sa.cpp
+++ b/python/cdec/sa/_sa.cpp
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.20.1 on Tue Mar 11 15:39:27 2014 */
+/* Generated by Cython 0.20.1 on Mon Apr  7 01:29:27 2014 */
 
 #define PY_SSIZE_T_CLEAN
 #ifndef CYTHON_USE_PYLONG_INTERNALS
@@ -612,7 +612,7 @@ struct __pyx_t_4cdec_2sa_3_sa__Trie_Node;
 struct __pyx_t_4cdec_2sa_3_sa_match_node;
 struct __pyx_t_4cdec_2sa_3_sa_Matching;
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":9
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":9
  * from libc.string cimport memset, strcpy
  * 
  * cdef struct _node:             # <<<<<<<<<<<<<<
@@ -626,7 +626,7 @@ struct __pyx_t_4cdec_2sa_3_sa__node {
   int val;
 };
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":30
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":30
  * _init_lower_mask()
  * 
  * cdef struct _BitSet:             # <<<<<<<<<<<<<<
@@ -640,7 +640,7 @@ struct __pyx_t_4cdec_2sa_3_sa__BitSet {
   int size;
 };
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":168
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":168
  *     return result
  * 
  * cdef struct _VEB:             # <<<<<<<<<<<<<<
@@ -657,7 +657,7 @@ struct __pyx_t_4cdec_2sa_3_sa__VEB {
   void **bottom;
 };
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":10
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":10
  * cdef struct _Trie_Node    # forward decl
  * 
  * cdef struct _Trie_Edge:             # <<<<<<<<<<<<<<
@@ -671,7 +671,7 @@ struct __pyx_t_4cdec_2sa_3_sa__Trie_Edge {
   struct __pyx_t_4cdec_2sa_3_sa__Trie_Edge *smaller;
 };
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":8
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":8
  * from libc.string cimport memset, memcpy
  * 
  * cdef struct _Trie_Node    # forward decl             # <<<<<<<<<<<<<<
@@ -684,7 +684,7 @@ struct __pyx_t_4cdec_2sa_3_sa__Trie_Node {
   int arr_len;
 };
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":90
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":90
  * 
  * # linked list structure for storing matches in BaselineRuleFactory
  * cdef struct match_node:             # <<<<<<<<<<<<<<
@@ -696,7 +696,7 @@ struct __pyx_t_4cdec_2sa_3_sa_match_node {
   struct __pyx_t_4cdec_2sa_3_sa_match_node *next;
 };
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":186
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":186
  * 
  * # struct used to encapsulate a single matching
  * cdef struct Matching:             # <<<<<<<<<<<<<<
@@ -794,7 +794,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_Rule {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/str_map.pxi":8
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/str_map.pxi":8
  *     char* stringmap_word(StrMap *vocab, int i)
  * 
  * cdef class StringMap:             # <<<<<<<<<<<<<<
@@ -808,7 +808,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_StringMap {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":9
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":9
  * from libc.string cimport memset, strcpy
  * 
  * cdef class DataArray:             # <<<<<<<<<<<<<<
@@ -827,7 +827,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_DataArray {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":10
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":10
  * cdef int ALIGNMENT_CODE = 1 << 16
  * 
  * cdef class Alignment:             # <<<<<<<<<<<<<<
@@ -842,7 +842,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_Alignment {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":47
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":47
  * 
  * 
  * cdef class BiLex:             # <<<<<<<<<<<<<<
@@ -863,7 +863,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_BiLex {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":100
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":100
  * 
  * 
  * cdef class BitSetIterator:             # <<<<<<<<<<<<<<
@@ -877,7 +877,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_BitSetIterator {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":118
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":118
  * # (entirely C-implemented) _BitSet struct.
  * # Very slow; use only for debugging
  * cdef class BitSet:             # <<<<<<<<<<<<<<
@@ -890,7 +890,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_BitSet {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":340
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":340
  * 
  * 
  * cdef class VEBIterator:             # <<<<<<<<<<<<<<
@@ -904,7 +904,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_VEBIterator {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":354
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":354
  * 
  * 
  * cdef class VEB:             # <<<<<<<<<<<<<<
@@ -918,7 +918,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_VEB {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":5
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":5
  * as k most frequent n-grams"""
  * 
  * cdef class LCP:             # <<<<<<<<<<<<<<
@@ -932,7 +932,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_LCP {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":7
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":7
  * cdef int INDEX_MASK = (1<<INDEX_SHIFT)-1
  * 
  * cdef class Alphabet:             # <<<<<<<<<<<<<<
@@ -950,7 +950,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_Alphabet {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":109
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":109
  *         trie_node_to_map(edge.node, result, prefix, include_zeros)
  * 
  * cdef class TrieMap:             # <<<<<<<<<<<<<<
@@ -965,7 +965,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_TrieMap {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":188
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":188
  * 
  * 
  * cdef class Precomputation:             # <<<<<<<<<<<<<<
@@ -986,7 +986,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_Precomputation {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":6
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":6
  * from libc.stdio cimport FILE, fclose, fopen
  * 
  * cdef class SuffixArray:             # <<<<<<<<<<<<<<
@@ -1002,7 +1002,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_SuffixArray {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":36
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":36
  *     ])
  * 
  * cdef class OnlineStats:             # <<<<<<<<<<<<<<
@@ -1019,7 +1019,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_OnlineStats {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":60
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":60
  * cdef int EPSILON = sym_fromstring('*EPS*', True)
  * 
  * cdef class TrieNode:             # <<<<<<<<<<<<<<
@@ -1032,7 +1032,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_TrieNode {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":66
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":66
  *         self.children = {}
  * 
  * cdef class ExtendedTrieNode(TrieNode):             # <<<<<<<<<<<<<<
@@ -1047,7 +1047,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_ExtendedTrieNode {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":77
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":77
  * 
  * 
  * cdef class TrieTable:             # <<<<<<<<<<<<<<
@@ -1062,7 +1062,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_TrieTable {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":98
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":98
  * # in the suffix array; if discontiguous, it is the set of
  * # actual locations (packed into an array)
  * cdef class PhraseLocation:             # <<<<<<<<<<<<<<
@@ -1081,7 +1081,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":120
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":120
  * 
  * 
  * cdef class Sampler:             # <<<<<<<<<<<<<<
@@ -1095,7 +1095,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_Sampler {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":242
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":242
  * 
  * 
  * cdef class HieroCachingRuleFactory:             # <<<<<<<<<<<<<<
@@ -1148,7 +1148,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_HieroCachingRuleFactory {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":23
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":23
  *         return ' '.join('%s=%s' % feat for feat in self)
  * 
  * cdef class Scorer:             # <<<<<<<<<<<<<<
@@ -1162,7 +1162,7 @@ struct __pyx_obj_4cdec_2sa_3_sa_Scorer {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":81
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":81
  *         free(self.arr)
  * 
  *     def __iter__(self):             # <<<<<<<<<<<<<<
@@ -1178,7 +1178,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct____iter__ {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":72
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":72
  *             self.read_text_data(fp)
  * 
  *     def read_bitext(self, char* filename, int side):             # <<<<<<<<<<<<<<
@@ -1192,7 +1192,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_1_read_bitext {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":74
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":74
  *     def read_bitext(self, char* filename, int side):
  *         with gzip_or_text(filename) as fp:
  *             data = (line.split(' ||| ')[side] for line in fp)             # <<<<<<<<<<<<<<
@@ -1209,7 +1209,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_2_genexpr {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":36
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":36
  *         logger.info("LCP array completed")
  * 
  *     def compute_stats(self, int max_n):             # <<<<<<<<<<<<<<
@@ -1240,7 +1240,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_3_compute_stats {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":110
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":110
  *     return sym_isvar(sym)
  * 
  * def make_lattice(words):             # <<<<<<<<<<<<<<
@@ -1254,7 +1254,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_4_make_lattice {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":111
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":111
  * 
  * def make_lattice(words):
  *     word_ids = (sym_fromstring(word, True) for word in words)             # <<<<<<<<<<<<<<
@@ -1271,7 +1271,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_5_genexpr {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":112
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":112
  * def make_lattice(words):
  *     word_ids = (sym_fromstring(word, True) for word in words)
  *     return tuple(((word, None, 1), ) for word in word_ids)             # <<<<<<<<<<<<<<
@@ -1288,7 +1288,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_6_genexpr {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":114
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":114
  *     return tuple(((word, None, 1), ) for word in word_ids)
  * 
  * def decode_lattice(lattice):             # <<<<<<<<<<<<<<
@@ -1301,7 +1301,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_7_decode_lattice {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":115
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":115
  * 
  * def decode_lattice(lattice):
  *     return tuple((sym_tostring(sym), weight, dist) for (sym, weight, dist) in arc             # <<<<<<<<<<<<<<
@@ -1328,7 +1328,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_8_genexpr {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":118
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":118
  *             for arc in node for node in lattice)
  * 
  * def decode_sentence(lattice):             # <<<<<<<<<<<<<<
@@ -1341,7 +1341,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_9_decode_sentence {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":119
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":119
  * 
  * def decode_sentence(lattice):
  *     return tuple(sym_tostring(sym) for ((sym, _, _),) in lattice)             # <<<<<<<<<<<<<<
@@ -1359,7 +1359,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_10_genexpr {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":121
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":121
  *     return tuple(sym_tostring(sym) for ((sym, _, _),) in lattice)
  * 
  * def encode_words(words):             # <<<<<<<<<<<<<<
@@ -1372,7 +1372,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_11_encode_words {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":122
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":122
  * 
  * def encode_words(words):
  *     return tuple(sym_fromstring(word, True) for word in words)             # <<<<<<<<<<<<<<
@@ -1389,7 +1389,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_12_genexpr {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":124
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":124
  *     return tuple(sym_fromstring(word, True) for word in words)
  * 
  * def decode_words(syms):             # <<<<<<<<<<<<<<
@@ -1401,7 +1401,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_13_decode_words {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":125
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":125
  * 
  * def decode_words(syms):
  *     return tuple(sym_tostring(sym) for sym in syms)             # <<<<<<<<<<<<<<
@@ -1416,7 +1416,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_14_genexpr {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":140
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":140
  *         return self.syms[i]
  * 
  *     def __iter__(self):             # <<<<<<<<<<<<<<
@@ -1431,7 +1431,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_15___iter__ {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":182
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":182
  *         return self.f.arity()
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -1444,7 +1444,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_16___str__ {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":186
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":186
  *         fields = [sym_tostring(self.lhs), str(self.f), str(self.e), str(self.scores)]
  *         if self.word_alignments is not None:
  *             fields.append(' '.join('%d-%d' % a for a in self.alignments()))             # <<<<<<<<<<<<<<
@@ -1461,7 +1461,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_17_genexpr {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":189
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":189
  *         return ' ||| '.join(fields)
  * 
  *     def alignments(self):             # <<<<<<<<<<<<<<
@@ -1478,7 +1478,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_18_alignments {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":973
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":973
  *         return sorted(result);
  * 
  *     def input(self, fwords, meta, ctx_name=None):             # <<<<<<<<<<<<<<
@@ -1575,7 +1575,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_19_input {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1188
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1188
  *         if self.online:
  *             stats = self.online_stats[ctx_name]
  *             f_syms = tuple(word[0][0] for word in fwords)             # <<<<<<<<<<<<<<
@@ -1592,7 +1592,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_20_genexpr {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1886
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1886
  *     # Aggregate stats from a training instance
  *     # (Extract rules, update counts)
  *     def add_instance(self, f_words, e_words, alignment, ctx_name=None):             # <<<<<<<<<<<<<<
@@ -1615,7 +1615,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_21_add_instance {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2056
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2056
  * 
  *     # Create a rule from source, target, non-terminals, and alignments
  *     def form_rule(self, f_i, e_i, f_span, e_span, nt, al):             # <<<<<<<<<<<<<<
@@ -1629,7 +1629,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_22_form_rule {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2117
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2117
  *         f = Phrase(f_sym)
  *         e = Phrase(e_sym)
  *         a = tuple(self.alignment.link(i, j) for i, j in links)             # <<<<<<<<<<<<<<
@@ -1646,7 +1646,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_23_genexpr {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2121
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2121
  * 
  *     # Rule string from rule
  *     def fmt_rule(self, f, e, a):             # <<<<<<<<<<<<<<
@@ -1660,7 +1660,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_24_fmt_rule {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2122
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2122
  *     # Rule string from rule
  *     def fmt_rule(self, f, e, a):
  *         a_str = ' '.join('{0}-{1}'.format(*self.alignment.unlink(packed)) for packed in a)             # <<<<<<<<<<<<<<
@@ -1677,7 +1677,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_25_genexpr {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2140
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2140
  *     # (Used for EGivenFCoherent)
  *     # Return set of (fphrase, lex_i, lex_j)
  *     def get_f_phrases(self, f_words):             # <<<<<<<<<<<<<<
@@ -1694,7 +1694,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_26_get_f_phrases {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":15
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":15
  *         self.values.append(value)
  * 
  *     def __iter__(self):             # <<<<<<<<<<<<<<
@@ -1710,7 +1710,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_27___iter__ {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":20
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":20
  *             yield (FD.word(self.names[i]), self.values[i])
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -1723,7 +1723,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_28___str__ {
 };
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":21
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":21
  * 
  *     def __str__(self):
  *         return ' '.join('%s=%s' % feat for feat in self)             # <<<<<<<<<<<<<<
@@ -1741,7 +1741,7 @@ struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_29_genexpr {
 
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":9
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":9
  * from libc.string cimport memset, strcpy, strlen
  * 
  * cdef class FloatList:             # <<<<<<<<<<<<<<
@@ -1769,7 +1769,7 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *__pyx_vtabptr_4cdec_2sa_3_sa_IntList;
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":4
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":4
  * from libc.string cimport strsep, strcpy, strlen
  * 
  * cdef class Phrase:             # <<<<<<<<<<<<<<
@@ -1784,7 +1784,7 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_Phrase {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_Phrase *__pyx_vtabptr_4cdec_2sa_3_sa_Phrase;
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/str_map.pxi":8
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/str_map.pxi":8
  *     char* stringmap_word(StrMap *vocab, int i)
  * 
  * cdef class StringMap:             # <<<<<<<<<<<<<<
@@ -1799,7 +1799,7 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_StringMap {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_StringMap *__pyx_vtabptr_4cdec_2sa_3_sa_StringMap;
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":9
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":9
  * from libc.string cimport memset, strcpy
  * 
  * cdef class DataArray:             # <<<<<<<<<<<<<<
@@ -1814,7 +1814,7 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_DataArray {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_DataArray *__pyx_vtabptr_4cdec_2sa_3_sa_DataArray;
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":10
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":10
  * cdef int ALIGNMENT_CODE = 1 << 16
  * 
  * cdef class Alignment:             # <<<<<<<<<<<<<<
@@ -1830,7 +1830,7 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alignment {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alignment *__pyx_vtabptr_4cdec_2sa_3_sa_Alignment;
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":47
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":47
  * 
  * 
  * cdef class BiLex:             # <<<<<<<<<<<<<<
@@ -1849,7 +1849,7 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_BiLex {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_BiLex *__pyx_vtabptr_4cdec_2sa_3_sa_BiLex;
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":354
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":354
  * 
  * 
  * cdef class VEB:             # <<<<<<<<<<<<<<
@@ -1865,7 +1865,7 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_VEB {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_VEB *__pyx_vtabptr_4cdec_2sa_3_sa_VEB;
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":7
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":7
  * cdef int INDEX_MASK = (1<<INDEX_SHIFT)-1
  * 
  * cdef class Alphabet:             # <<<<<<<<<<<<<<
@@ -1888,7 +1888,7 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alphabet {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alphabet *__pyx_vtabptr_4cdec_2sa_3_sa_Alphabet;
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":109
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":109
  *         trie_node_to_map(edge.node, result, prefix, include_zeros)
  * 
  * cdef class TrieMap:             # <<<<<<<<<<<<<<
@@ -1903,7 +1903,7 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_TrieMap {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_TrieMap *__pyx_vtabptr_4cdec_2sa_3_sa_TrieMap;
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":188
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":188
  * 
  * 
  * cdef class Precomputation:             # <<<<<<<<<<<<<<
@@ -1918,7 +1918,7 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_Precomputation {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_Precomputation *__pyx_vtabptr_4cdec_2sa_3_sa_Precomputation;
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":6
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":6
  * from libc.stdio cimport FILE, fclose, fopen
  * 
  * cdef class SuffixArray:             # <<<<<<<<<<<<<<
@@ -1935,7 +1935,7 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_SuffixArray {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_SuffixArray *__pyx_vtabptr_4cdec_2sa_3_sa_SuffixArray;
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":98
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":98
  * # in the suffix array; if discontiguous, it is the set of
  * # actual locations (packed into an array)
  * cdef class PhraseLocation:             # <<<<<<<<<<<<<<
@@ -1949,7 +1949,7 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_PhraseLocation {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_PhraseLocation *__pyx_vtabptr_4cdec_2sa_3_sa_PhraseLocation;
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":242
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":242
  * 
  * 
  * cdef class HieroCachingRuleFactory:             # <<<<<<<<<<<<<<
@@ -1977,7 +1977,7 @@ struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory {
 static struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *__pyx_vtabptr_4cdec_2sa_3_sa_HieroCachingRuleFactory;
 
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":23
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":23
  *         return ' '.join('%s=%s' % feat for feat in self)
  * 
  * cdef class Scorer:             # <<<<<<<<<<<<<<
@@ -3355,7 +3355,7 @@ static char __pyx_k_Processing_precomputations_took[] = "Processing precomputati
 static char __pyx_k_RANK_d_COUNT_COST_d_d_CUMUL_d_d[] = "RANK %d\tCOUNT, COST: %d    %d\tCUMUL: %d, %d";
 static char __pyx_k_Requested_index_d_d_of_d_length[] = "Requested index %d:%d of %d-length IntList";
 static char __pyx_k_d_d_out_of_bounds_I_d_J_d_in_li[] = "%d-%d out of bounds (I=%d,J=%d) in line %d\n";
-static char __pyx_k_usr0_home_mdenkows_cdec_git_pyt[] = "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi";
+static char __pyx_k_usr0_home_cdyer_cdec_python_cde[] = "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi";
 static char __pyx_k_Converting_d_hash_keys_on_precom[] = "Converting %d hash keys on precomputed inverted index... ";
 static char __pyx_k_Didn_t_extract_anything_from_d_d[] = "Didn't extract anything from [%d, %d] -> [%d, %d]";
 static char __pyx_k_ERROR_unexpected_pattern_s_in_se[] = "ERROR: unexpected pattern %s in set of precomputed collocations";
@@ -3379,8 +3379,8 @@ static char __pyx_k_Suffix_array_construction_took_f[] = "Suffix array construct
 static char __pyx_k_Total_time_for_rule_lookup_extra[] = "Total time for rule lookup, extraction, and scoring = %f seconds";
 static char __pyx_k_Unexpected_condition_found_in_q3[] = "Unexpected condition found in q3sort: sort from %d to %d";
 static char __pyx_k_input_locals_lambda_locals_lambd[] = "input.<locals>.<lambda>.<locals>.<lambda>";
-static char __pyx_k_usr0_home_mdenkows_cdec_git_pyt_2[] = "/usr0/home/mdenkows/cdec-git/python/cdec/sa/_sa.pyx";
-static char __pyx_k_usr0_home_mdenkows_cdec_git_pyt_3[] = "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi";
+static char __pyx_k_usr0_home_cdyer_cdec_python_cde_2[] = "/usr0/home/cdyer/cdec/python/cdec/sa/_sa.pyx";
+static char __pyx_k_usr0_home_cdyer_cdec_python_cde_3[] = "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi";
 static char __pyx_k_Converting_d_hash_keys_on_precom_2[] = "Converting %d hash keys on precomputed collocations... ";
 static PyObject *__pyx_kp_s_;
 static PyObject *__pyx_kp_s_0;
@@ -3723,9 +3723,9 @@ static PyObject *__pyx_n_s_use_baeza_yates;
 static PyObject *__pyx_n_s_use_collocations;
 static PyObject *__pyx_n_s_use_index;
 static PyObject *__pyx_n_s_use_sent_id;
-static PyObject *__pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt;
-static PyObject *__pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt_2;
-static PyObject *__pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt_3;
+static PyObject *__pyx_kp_s_usr0_home_cdyer_cdec_python_cde;
+static PyObject *__pyx_kp_s_usr0_home_cdyer_cdec_python_cde_2;
+static PyObject *__pyx_kp_s_usr0_home_cdyer_cdec_python_cde_3;
 static PyObject *__pyx_n_s_value;
 static PyObject *__pyx_n_s_vec;
 static PyObject *__pyx_n_s_w;
@@ -4102,7 +4102,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_2gzip_or_text(CYTHON_UNUSED PyObject *_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":11
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":11
  * cdef class FloatList:
  * 
  *     def __cinit__(self, int size=0, int increment=1, int initial_len=0):             # <<<<<<<<<<<<<<
@@ -4202,7 +4202,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9FloatList___cinit__(struct __pyx_obj_4cdec_2
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":12
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":12
  * 
  *     def __cinit__(self, int size=0, int increment=1, int initial_len=0):
  *         if initial_len > size:             # <<<<<<<<<<<<<<
@@ -4212,7 +4212,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9FloatList___cinit__(struct __pyx_obj_4cdec_2
   __pyx_t_1 = ((__pyx_v_initial_len > __pyx_v_size) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":13
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":13
  *     def __cinit__(self, int size=0, int increment=1, int initial_len=0):
  *         if initial_len > size:
  *             size = initial_len             # <<<<<<<<<<<<<<
@@ -4224,7 +4224,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9FloatList___cinit__(struct __pyx_obj_4cdec_2
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":14
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":14
  *         if initial_len > size:
  *             size = initial_len
  *         self.size = size             # <<<<<<<<<<<<<<
@@ -4233,7 +4233,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9FloatList___cinit__(struct __pyx_obj_4cdec_2
  */
   __pyx_v_self->size = __pyx_v_size;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":15
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":15
  *             size = initial_len
  *         self.size = size
  *         self.increment = increment             # <<<<<<<<<<<<<<
@@ -4242,7 +4242,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9FloatList___cinit__(struct __pyx_obj_4cdec_2
  */
   __pyx_v_self->increment = __pyx_v_increment;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":16
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":16
  *         self.size = size
  *         self.increment = increment
  *         self.len = initial_len             # <<<<<<<<<<<<<<
@@ -4251,7 +4251,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9FloatList___cinit__(struct __pyx_obj_4cdec_2
  */
   __pyx_v_self->len = __pyx_v_initial_len;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":17
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":17
  *         self.increment = increment
  *         self.len = initial_len
  *         self.arr = <float*> malloc(size*sizeof(float))             # <<<<<<<<<<<<<<
@@ -4260,7 +4260,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9FloatList___cinit__(struct __pyx_obj_4cdec_2
  */
   __pyx_v_self->arr = ((float *)malloc((__pyx_v_size * (sizeof(float)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":18
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":18
  *         self.len = initial_len
  *         self.arr = <float*> malloc(size*sizeof(float))
  *         memset(self.arr, 0, initial_len*sizeof(float))             # <<<<<<<<<<<<<<
@@ -4269,7 +4269,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9FloatList___cinit__(struct __pyx_obj_4cdec_2
  */
   memset(__pyx_v_self->arr, 0, (__pyx_v_initial_len * (sizeof(float))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":11
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":11
  * cdef class FloatList:
  * 
  *     def __cinit__(self, int size=0, int increment=1, int initial_len=0):             # <<<<<<<<<<<<<<
@@ -4283,7 +4283,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9FloatList___cinit__(struct __pyx_obj_4cdec_2
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":20
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":20
  *         memset(self.arr, 0, initial_len*sizeof(float))
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -4306,7 +4306,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_9FloatList_2__dealloc__(struct __pyx_obj_4cd
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":21
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":21
  * 
  *     def __dealloc__(self):
  *         free(self.arr)             # <<<<<<<<<<<<<<
@@ -4315,7 +4315,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_9FloatList_2__dealloc__(struct __pyx_obj_4cd
  */
   free(__pyx_v_self->arr);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":20
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":20
  *         memset(self.arr, 0, initial_len*sizeof(float))
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -4327,7 +4327,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_9FloatList_2__dealloc__(struct __pyx_obj_4cd
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":23
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":23
  *         free(self.arr)
  * 
  *     def __getitem__(self, i):             # <<<<<<<<<<<<<<
@@ -4363,7 +4363,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_4__getitem__(struct __pyx_ob
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__getitem__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":24
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":24
  * 
  *     def __getitem__(self, i):
  *         j = i             # <<<<<<<<<<<<<<
@@ -4373,7 +4373,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_4__getitem__(struct __pyx_ob
   __Pyx_INCREF(__pyx_v_i);
   __pyx_v_j = __pyx_v_i;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":25
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":25
  *     def __getitem__(self, i):
  *         j = i
  *         if i<0:             # <<<<<<<<<<<<<<
@@ -4385,7 +4385,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_4__getitem__(struct __pyx_ob
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":26
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":26
  *         j = i
  *         if i<0:
  *             j = self.len + i             # <<<<<<<<<<<<<<
@@ -4403,7 +4403,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_4__getitem__(struct __pyx_ob
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":27
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":27
  *         if i<0:
  *             j = self.len + i
  *         if j<0 or j>=self.len:             # <<<<<<<<<<<<<<
@@ -4426,7 +4426,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_4__getitem__(struct __pyx_ob
   }
   if (__pyx_t_5) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":28
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":28
  *             j = self.len + i
  *         if j<0 or j>=self.len:
  *             raise IndexError("Requested index %d of %d-length FloatList" % (i, self.len))             # <<<<<<<<<<<<<<
@@ -4459,7 +4459,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_4__getitem__(struct __pyx_ob
     {__pyx_filename = __pyx_f[1]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":29
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":29
  *         if j<0 or j>=self.len:
  *             raise IndexError("Requested index %d of %d-length FloatList" % (i, self.len))
  *         return self.arr[j]             # <<<<<<<<<<<<<<
@@ -4474,7 +4474,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_4__getitem__(struct __pyx_ob
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":23
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":23
  *         free(self.arr)
  * 
  *     def __getitem__(self, i):             # <<<<<<<<<<<<<<
@@ -4495,7 +4495,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_4__getitem__(struct __pyx_ob
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":31
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":31
  *         return self.arr[j]
  * 
  *     cdef void set(self, int i, float v):             # <<<<<<<<<<<<<<
@@ -4517,7 +4517,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_set(struct __pyx_obj_4cdec_2sa_3_s
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("set", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":32
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":32
  * 
  *     cdef void set(self, int i, float v):
  *         j = i             # <<<<<<<<<<<<<<
@@ -4526,7 +4526,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_set(struct __pyx_obj_4cdec_2sa_3_s
  */
   __pyx_v_j = __pyx_v_i;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":33
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":33
  *     cdef void set(self, int i, float v):
  *         j = i
  *         if i<0:             # <<<<<<<<<<<<<<
@@ -4536,7 +4536,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_set(struct __pyx_obj_4cdec_2sa_3_s
   __pyx_t_1 = ((__pyx_v_i < 0) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":34
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":34
  *         j = i
  *         if i<0:
  *             j = self.len + i             # <<<<<<<<<<<<<<
@@ -4548,7 +4548,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_set(struct __pyx_obj_4cdec_2sa_3_s
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":35
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":35
  *         if i<0:
  *             j = self.len + i
  *         if j<0 or j>=self.len:             # <<<<<<<<<<<<<<
@@ -4564,7 +4564,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_set(struct __pyx_obj_4cdec_2sa_3_s
   }
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":36
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":36
  *             j = self.len + i
  *         if j<0 or j>=self.len:
  *             raise IndexError("Requested index %d of %d-length FloatList" % (i, self.len))             # <<<<<<<<<<<<<<
@@ -4599,7 +4599,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_set(struct __pyx_obj_4cdec_2sa_3_s
     {__pyx_filename = __pyx_f[1]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":37
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":37
  *         if j<0 or j>=self.len:
  *             raise IndexError("Requested index %d of %d-length FloatList" % (i, self.len))
  *         self.arr[j] = v             # <<<<<<<<<<<<<<
@@ -4608,7 +4608,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_set(struct __pyx_obj_4cdec_2sa_3_s
  */
   (__pyx_v_self->arr[__pyx_v_j]) = __pyx_v_v;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":31
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":31
  *         return self.arr[j]
  * 
  *     cdef void set(self, int i, float v):             # <<<<<<<<<<<<<<
@@ -4627,7 +4627,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_set(struct __pyx_obj_4cdec_2sa_3_s
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":39
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":39
  *         self.arr[j] = v
  * 
  *     def __setitem__(self, i, val):             # <<<<<<<<<<<<<<
@@ -4658,7 +4658,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9FloatList_6__setitem__(struct __pyx_obj_4cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__setitem__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":40
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":40
  * 
  *     def __setitem__(self, i, val):
  *         self.set(i, val)             # <<<<<<<<<<<<<<
@@ -4669,7 +4669,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9FloatList_6__setitem__(struct __pyx_obj_4cde
   __pyx_t_2 = __pyx_PyFloat_AsFloat(__pyx_v_val); if (unlikely((__pyx_t_2 == (float)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList *)__pyx_v_self->__pyx_vtab)->set(__pyx_v_self, __pyx_t_1, __pyx_t_2);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":39
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":39
  *         self.arr[j] = v
  * 
  *     def __setitem__(self, i, val):             # <<<<<<<<<<<<<<
@@ -4688,7 +4688,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9FloatList_6__setitem__(struct __pyx_obj_4cde
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":42
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":42
  *         self.set(i, val)
  * 
  *     def __len__(self):             # <<<<<<<<<<<<<<
@@ -4714,7 +4714,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_9FloatList_8__len__(struct __pyx_obj_4
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":43
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":43
  * 
  *     def __len__(self):
  *         return self.len             # <<<<<<<<<<<<<<
@@ -4724,7 +4724,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_9FloatList_8__len__(struct __pyx_obj_4
   __pyx_r = __pyx_v_self->len;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":42
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":42
  *         self.set(i, val)
  * 
  *     def __len__(self):             # <<<<<<<<<<<<<<
@@ -4738,7 +4738,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_9FloatList_8__len__(struct __pyx_obj_4
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":45
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":45
  *         return self.len
  * 
  *     def append(self, float val):             # <<<<<<<<<<<<<<
@@ -4778,7 +4778,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_10append(struct __pyx_obj_4c
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("append", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":46
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":46
  * 
  *     def append(self, float val):
  *         if self.len == self.size:             # <<<<<<<<<<<<<<
@@ -4788,7 +4788,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_10append(struct __pyx_obj_4c
   __pyx_t_1 = ((__pyx_v_self->len == __pyx_v_self->size) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":47
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":47
  *     def append(self, float val):
  *         if self.len == self.size:
  *             self.size = self.size + self.increment             # <<<<<<<<<<<<<<
@@ -4797,7 +4797,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_10append(struct __pyx_obj_4c
  */
     __pyx_v_self->size = (__pyx_v_self->size + __pyx_v_self->increment);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":48
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":48
  *         if self.len == self.size:
  *             self.size = self.size + self.increment
  *             self.arr = <float*> realloc(self.arr, self.size*sizeof(float))             # <<<<<<<<<<<<<<
@@ -4809,7 +4809,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_10append(struct __pyx_obj_4c
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":49
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":49
  *             self.size = self.size + self.increment
  *             self.arr = <float*> realloc(self.arr, self.size*sizeof(float))
  *         self.arr[self.len] = val             # <<<<<<<<<<<<<<
@@ -4818,7 +4818,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_10append(struct __pyx_obj_4c
  */
   (__pyx_v_self->arr[__pyx_v_self->len]) = __pyx_v_val;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":50
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":50
  *             self.arr = <float*> realloc(self.arr, self.size*sizeof(float))
  *         self.arr[self.len] = val
  *         self.len = self.len + 1             # <<<<<<<<<<<<<<
@@ -4827,7 +4827,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_10append(struct __pyx_obj_4c
  */
   __pyx_v_self->len = (__pyx_v_self->len + 1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":45
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":45
  *         return self.len
  * 
  *     def append(self, float val):             # <<<<<<<<<<<<<<
@@ -4842,7 +4842,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_10append(struct __pyx_obj_4c
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":52
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":52
  *         self.len = self.len + 1
  * 
  *     cdef void write_handle(self, FILE* f):             # <<<<<<<<<<<<<<
@@ -4854,7 +4854,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_write_handle(struct __pyx_obj_4cde
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("write_handle", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":53
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":53
  * 
  *     cdef void write_handle(self, FILE* f):
  *         fwrite(&(self.len), sizeof(float), 1, f)             # <<<<<<<<<<<<<<
@@ -4863,7 +4863,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_write_handle(struct __pyx_obj_4cde
  */
   fwrite((&__pyx_v_self->len), (sizeof(float)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":54
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":54
  *     cdef void write_handle(self, FILE* f):
  *         fwrite(&(self.len), sizeof(float), 1, f)
  *         fwrite(self.arr, sizeof(float), self.len, f)             # <<<<<<<<<<<<<<
@@ -4872,7 +4872,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_write_handle(struct __pyx_obj_4cde
  */
   fwrite(__pyx_v_self->arr, (sizeof(float)), __pyx_v_self->len, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":52
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":52
  *         self.len = self.len + 1
  * 
  *     cdef void write_handle(self, FILE* f):             # <<<<<<<<<<<<<<
@@ -4884,7 +4884,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_write_handle(struct __pyx_obj_4cde
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":56
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":56
  *         fwrite(self.arr, sizeof(float), self.len, f)
  * 
  *     def write(self, char* filename):             # <<<<<<<<<<<<<<
@@ -4924,7 +4924,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_12write(struct __pyx_obj_4cd
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("write", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":58
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":58
  *     def write(self, char* filename):
  *         cdef FILE* f
  *         f = fopen(filename, "w")             # <<<<<<<<<<<<<<
@@ -4933,7 +4933,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_12write(struct __pyx_obj_4cd
  */
   __pyx_v_f = fopen(__pyx_v_filename, __pyx_k_w);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":59
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":59
  *         cdef FILE* f
  *         f = fopen(filename, "w")
  *         self.write_handle(f)             # <<<<<<<<<<<<<<
@@ -4942,7 +4942,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_12write(struct __pyx_obj_4cd
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList *)__pyx_v_self->__pyx_vtab)->write_handle(__pyx_v_self, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":60
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":60
  *         f = fopen(filename, "w")
  *         self.write_handle(f)
  *         fclose(f)             # <<<<<<<<<<<<<<
@@ -4951,7 +4951,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_12write(struct __pyx_obj_4cd
  */
   fclose(__pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":56
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":56
  *         fwrite(self.arr, sizeof(float), self.len, f)
  * 
  *     def write(self, char* filename):             # <<<<<<<<<<<<<<
@@ -4966,7 +4966,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_12write(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":62
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":62
  *         fclose(f)
  * 
  *     cdef void read_handle(self, FILE* f):             # <<<<<<<<<<<<<<
@@ -4979,7 +4979,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_read_handle(struct __pyx_obj_4cdec
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("read_handle", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":63
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":63
  * 
  *     cdef void read_handle(self, FILE* f):
  *         free(self.arr)             # <<<<<<<<<<<<<<
@@ -4988,7 +4988,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_read_handle(struct __pyx_obj_4cdec
  */
   free(__pyx_v_self->arr);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":64
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":64
  *     cdef void read_handle(self, FILE* f):
  *         free(self.arr)
  *         fread(&(self.len), sizeof(float), 1, f)             # <<<<<<<<<<<<<<
@@ -4997,7 +4997,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_read_handle(struct __pyx_obj_4cdec
  */
   fread((&__pyx_v_self->len), (sizeof(float)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":65
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":65
  *         free(self.arr)
  *         fread(&(self.len), sizeof(float), 1, f)
  *         self.arr = <float*> malloc(self.len * sizeof(float))             # <<<<<<<<<<<<<<
@@ -5006,7 +5006,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_read_handle(struct __pyx_obj_4cdec
  */
   __pyx_v_self->arr = ((float *)malloc((__pyx_v_self->len * (sizeof(float)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":66
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":66
  *         fread(&(self.len), sizeof(float), 1, f)
  *         self.arr = <float*> malloc(self.len * sizeof(float))
  *         self.size = self.len             # <<<<<<<<<<<<<<
@@ -5016,7 +5016,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_read_handle(struct __pyx_obj_4cdec
   __pyx_t_1 = __pyx_v_self->len;
   __pyx_v_self->size = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":67
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":67
  *         self.arr = <float*> malloc(self.len * sizeof(float))
  *         self.size = self.len
  *         fread(self.arr, sizeof(float), self.len, f)             # <<<<<<<<<<<<<<
@@ -5025,7 +5025,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_read_handle(struct __pyx_obj_4cdec
  */
   fread(__pyx_v_self->arr, (sizeof(float)), __pyx_v_self->len, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":62
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":62
  *         fclose(f)
  * 
  *     cdef void read_handle(self, FILE* f):             # <<<<<<<<<<<<<<
@@ -5037,7 +5037,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9FloatList_read_handle(struct __pyx_obj_4cdec
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":69
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":69
  *         fread(self.arr, sizeof(float), self.len, f)
  * 
  *     def read(self, char* filename):             # <<<<<<<<<<<<<<
@@ -5077,7 +5077,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_14read(struct __pyx_obj_4cde
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("read", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":71
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":71
  *     def read(self, char* filename):
  *         cdef FILE* f
  *         f = fopen(filename, "r")             # <<<<<<<<<<<<<<
@@ -5086,7 +5086,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_14read(struct __pyx_obj_4cde
  */
   __pyx_v_f = fopen(__pyx_v_filename, __pyx_k_r);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":72
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":72
  *         cdef FILE* f
  *         f = fopen(filename, "r")
  *         self.read_handle(f)             # <<<<<<<<<<<<<<
@@ -5094,14 +5094,14 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_14read(struct __pyx_obj_4cde
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList *)__pyx_v_self->__pyx_vtab)->read_handle(__pyx_v_self, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":73
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":73
  *         f = fopen(filename, "r")
  *         self.read_handle(f)
  *         fclose(f)             # <<<<<<<<<<<<<<
  */
   fclose(__pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/float_list.pxi":69
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/float_list.pxi":69
  *         fread(self.arr, sizeof(float), self.len, f)
  * 
  *     def read(self, char* filename):             # <<<<<<<<<<<<<<
@@ -5116,7 +5116,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9FloatList_14read(struct __pyx_obj_4cde
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":11
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":11
  * cdef class IntList:
  * 
  *     def __cinit__(self, int size=0, int increment=1, int initial_len=0):             # <<<<<<<<<<<<<<
@@ -5216,7 +5216,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7IntList___cinit__(struct __pyx_obj_4cdec_2sa
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":12
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":12
  * 
  *     def __cinit__(self, int size=0, int increment=1, int initial_len=0):
  *         if initial_len > size:             # <<<<<<<<<<<<<<
@@ -5226,7 +5226,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7IntList___cinit__(struct __pyx_obj_4cdec_2sa
   __pyx_t_1 = ((__pyx_v_initial_len > __pyx_v_size) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":13
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":13
  *     def __cinit__(self, int size=0, int increment=1, int initial_len=0):
  *         if initial_len > size:
  *             size = initial_len             # <<<<<<<<<<<<<<
@@ -5238,7 +5238,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7IntList___cinit__(struct __pyx_obj_4cdec_2sa
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":14
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":14
  *         if initial_len > size:
  *             size = initial_len
  *         self.size = size             # <<<<<<<<<<<<<<
@@ -5247,7 +5247,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7IntList___cinit__(struct __pyx_obj_4cdec_2sa
  */
   __pyx_v_self->size = __pyx_v_size;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":15
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":15
  *             size = initial_len
  *         self.size = size
  *         self.increment = increment             # <<<<<<<<<<<<<<
@@ -5256,7 +5256,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7IntList___cinit__(struct __pyx_obj_4cdec_2sa
  */
   __pyx_v_self->increment = __pyx_v_increment;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":16
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":16
  *         self.size = size
  *         self.increment = increment
  *         self.len = initial_len             # <<<<<<<<<<<<<<
@@ -5265,7 +5265,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7IntList___cinit__(struct __pyx_obj_4cdec_2sa
  */
   __pyx_v_self->len = __pyx_v_initial_len;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":17
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":17
  *         self.increment = increment
  *         self.len = initial_len
  *         self.arr = <int*> malloc(size*sizeof(int))             # <<<<<<<<<<<<<<
@@ -5274,7 +5274,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7IntList___cinit__(struct __pyx_obj_4cdec_2sa
  */
   __pyx_v_self->arr = ((int *)malloc((__pyx_v_size * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":18
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":18
  *         self.len = initial_len
  *         self.arr = <int*> malloc(size*sizeof(int))
  *         memset(self.arr, 0, initial_len*sizeof(int))             # <<<<<<<<<<<<<<
@@ -5283,7 +5283,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7IntList___cinit__(struct __pyx_obj_4cdec_2sa
  */
   memset(__pyx_v_self->arr, 0, (__pyx_v_initial_len * (sizeof(int))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":11
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":11
  * cdef class IntList:
  * 
  *     def __cinit__(self, int size=0, int increment=1, int initial_len=0):             # <<<<<<<<<<<<<<
@@ -5297,7 +5297,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7IntList___cinit__(struct __pyx_obj_4cdec_2sa
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":20
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":20
  *         memset(self.arr, 0, initial_len*sizeof(int))
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -5333,7 +5333,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_2__str__(struct __pyx_obj_4cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__str__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":22
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":22
  *     def __str__(self):
  *         cdef unsigned i
  *         ret = "IntList["             # <<<<<<<<<<<<<<
@@ -5343,7 +5343,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_2__str__(struct __pyx_obj_4cde
   __Pyx_INCREF(__pyx_kp_s_IntList);
   __pyx_v_ret = __pyx_kp_s_IntList;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":23
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":23
  *         cdef unsigned i
  *         ret = "IntList["
  *         for idx in range(self.size):             # <<<<<<<<<<<<<<
@@ -5354,7 +5354,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_2__str__(struct __pyx_obj_4cde
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_v_idx = __pyx_t_2;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":24
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":24
  *         ret = "IntList["
  *         for idx in range(self.size):
  *             if idx>0:             # <<<<<<<<<<<<<<
@@ -5364,7 +5364,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_2__str__(struct __pyx_obj_4cde
     __pyx_t_3 = ((__pyx_v_idx > 0) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":25
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":25
  *         for idx in range(self.size):
  *             if idx>0:
  *                 ret += ","             # <<<<<<<<<<<<<<
@@ -5379,7 +5379,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_2__str__(struct __pyx_obj_4cde
     }
     __pyx_L5:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":26
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":26
  *             if idx>0:
  *                 ret += ","
  *             ret += str(self.arr[idx])             # <<<<<<<<<<<<<<
@@ -5403,7 +5403,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_2__str__(struct __pyx_obj_4cde
     __pyx_t_5 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":27
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":27
  *                 ret += ","
  *             ret += str(self.arr[idx])
  *         ret += "]"             # <<<<<<<<<<<<<<
@@ -5415,7 +5415,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_2__str__(struct __pyx_obj_4cde
   __Pyx_DECREF_SET(__pyx_v_ret, __pyx_t_5);
   __pyx_t_5 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":28
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":28
  *             ret += str(self.arr[idx])
  *         ret += "]"
  *         ret += "len="             # <<<<<<<<<<<<<<
@@ -5427,7 +5427,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_2__str__(struct __pyx_obj_4cde
   __Pyx_DECREF_SET(__pyx_v_ret, __pyx_t_5);
   __pyx_t_5 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":29
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":29
  *         ret += "]"
  *         ret += "len="
  *         ret += str(self.len)             # <<<<<<<<<<<<<<
@@ -5450,7 +5450,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_2__str__(struct __pyx_obj_4cde
   __Pyx_DECREF_SET(__pyx_v_ret, __pyx_t_4);
   __pyx_t_4 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":30
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":30
  *         ret += "len="
  *         ret += str(self.len)
  *         return ret             # <<<<<<<<<<<<<<
@@ -5462,7 +5462,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_2__str__(struct __pyx_obj_4cde
   __pyx_r = __pyx_v_ret;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":20
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":20
  *         memset(self.arr, 0, initial_len*sizeof(int))
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -5483,7 +5483,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_2__str__(struct __pyx_obj_4cde
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":32
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":32
  *         return ret
  * 
  *     def index(self, int val):             # <<<<<<<<<<<<<<
@@ -5531,7 +5531,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_4index(struct __pyx_obj_4cdec_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("index", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":34
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":34
  *     def index(self, int val):
  *         cdef unsigned i
  *         for i in range(self.len):             # <<<<<<<<<<<<<<
@@ -5542,7 +5542,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_4index(struct __pyx_obj_4cdec_
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_v_i = __pyx_t_2;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":35
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":35
  *         cdef unsigned i
  *         for i in range(self.len):
  *             if self.arr[i] == val:             # <<<<<<<<<<<<<<
@@ -5552,7 +5552,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_4index(struct __pyx_obj_4cdec_
     __pyx_t_3 = (((__pyx_v_self->arr[__pyx_v_i]) == __pyx_v_val) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":36
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":36
  *         for i in range(self.len):
  *             if self.arr[i] == val:
  *                 return i             # <<<<<<<<<<<<<<
@@ -5568,7 +5568,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_4index(struct __pyx_obj_4cdec_
     }
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":37
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":37
  *             if self.arr[i] == val:
  *                 return i
  *         raise ValueError('%s not in IntList' % val)             # <<<<<<<<<<<<<<
@@ -5592,7 +5592,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_4index(struct __pyx_obj_4cdec_
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   {__pyx_filename = __pyx_f[2]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":32
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":32
  *         return ret
  * 
  *     def index(self, int val):             # <<<<<<<<<<<<<<
@@ -5612,7 +5612,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_4index(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":39
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":39
  *         raise ValueError('%s not in IntList' % val)
  * 
  *     def partition(self,start,end):             # <<<<<<<<<<<<<<
@@ -5699,7 +5699,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("partition", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":40
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":40
  * 
  *     def partition(self,start,end):
  *         pivot = self.arr[end]             # <<<<<<<<<<<<<<
@@ -5712,7 +5712,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
   __pyx_v_pivot = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":41
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":41
  *     def partition(self,start,end):
  *         pivot = self.arr[end]
  *         bottom = start-1             # <<<<<<<<<<<<<<
@@ -5724,7 +5724,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
   __pyx_v_bottom = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":42
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":42
  *         pivot = self.arr[end]
  *         bottom = start-1
  *         top = end             # <<<<<<<<<<<<<<
@@ -5734,7 +5734,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
   __Pyx_INCREF(__pyx_v_end);
   __pyx_v_top = __pyx_v_end;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":43
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":43
  *         bottom = start-1
  *         top = end
  *         done = 0             # <<<<<<<<<<<<<<
@@ -5743,7 +5743,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
  */
   __pyx_v_done = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":44
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":44
  *         top = end
  *         done = 0
  *         while not done:             # <<<<<<<<<<<<<<
@@ -5754,7 +5754,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
     __pyx_t_3 = ((!(__pyx_v_done != 0)) != 0);
     if (!__pyx_t_3) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":45
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":45
  *         done = 0
  *         while not done:
  *             while not done:             # <<<<<<<<<<<<<<
@@ -5765,7 +5765,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
       __pyx_t_3 = ((!(__pyx_v_done != 0)) != 0);
       if (!__pyx_t_3) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":46
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":46
  *         while not done:
  *             while not done:
  *                 bottom += 1             # <<<<<<<<<<<<<<
@@ -5777,7 +5777,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
       __Pyx_DECREF_SET(__pyx_v_bottom, __pyx_t_2);
       __pyx_t_2 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":47
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":47
  *             while not done:
  *                 bottom += 1
  *                 if bottom == top:             # <<<<<<<<<<<<<<
@@ -5789,7 +5789,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":48
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":48
  *                 bottom += 1
  *                 if bottom == top:
  *                     done = 1             # <<<<<<<<<<<<<<
@@ -5798,7 +5798,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
  */
         __pyx_v_done = 1;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":49
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":49
  *                 if bottom == top:
  *                     done = 1
  *                     break             # <<<<<<<<<<<<<<
@@ -5808,7 +5808,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
         goto __pyx_L6_break;
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":50
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":50
  *                     done = 1
  *                     break
  *                 if self.arr[bottom] > pivot:             # <<<<<<<<<<<<<<
@@ -5824,7 +5824,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":51
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":51
  *                     break
  *                 if self.arr[bottom] > pivot:
  *                     self.arr[top] = self.arr[bottom]             # <<<<<<<<<<<<<<
@@ -5835,7 +5835,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
         __pyx_t_5 = __Pyx_PyIndex_AsSsize_t(__pyx_v_top); if (unlikely((__pyx_t_5 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         (__pyx_v_self->arr[__pyx_t_5]) = (__pyx_v_self->arr[__pyx_t_1]);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":52
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":52
  *                 if self.arr[bottom] > pivot:
  *                     self.arr[top] = self.arr[bottom]
  *                     break             # <<<<<<<<<<<<<<
@@ -5847,7 +5847,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
     }
     __pyx_L6_break:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":53
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":53
  *                     self.arr[top] = self.arr[bottom]
  *                     break
  *             while not done:             # <<<<<<<<<<<<<<
@@ -5858,7 +5858,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
       __pyx_t_3 = ((!(__pyx_v_done != 0)) != 0);
       if (!__pyx_t_3) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":54
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":54
  *                     break
  *             while not done:
  *                 top -= 1             # <<<<<<<<<<<<<<
@@ -5870,7 +5870,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
       __Pyx_DECREF_SET(__pyx_v_top, __pyx_t_4);
       __pyx_t_4 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":55
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":55
  *             while not done:
  *                 top -= 1
  *                 if top == bottom:             # <<<<<<<<<<<<<<
@@ -5882,7 +5882,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":56
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":56
  *                 top -= 1
  *                 if top == bottom:
  *                     done = 1             # <<<<<<<<<<<<<<
@@ -5891,7 +5891,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
  */
         __pyx_v_done = 1;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":57
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":57
  *                 if top == bottom:
  *                     done = 1
  *                     break             # <<<<<<<<<<<<<<
@@ -5901,7 +5901,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
         goto __pyx_L10_break;
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":58
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":58
  *                     done = 1
  *                     break
  *                 if self.arr[top] < pivot:             # <<<<<<<<<<<<<<
@@ -5917,7 +5917,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":59
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":59
  *                     break
  *                 if self.arr[top] < pivot:
  *                     self.arr[bottom] = self.arr[top]             # <<<<<<<<<<<<<<
@@ -5928,7 +5928,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
         __pyx_t_5 = __Pyx_PyIndex_AsSsize_t(__pyx_v_bottom); if (unlikely((__pyx_t_5 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         (__pyx_v_self->arr[__pyx_t_5]) = (__pyx_v_self->arr[__pyx_t_1]);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":60
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":60
  *                 if self.arr[top] < pivot:
  *                     self.arr[bottom] = self.arr[top]
  *                     break             # <<<<<<<<<<<<<<
@@ -5941,7 +5941,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
     __pyx_L10_break:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":61
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":61
  *                     self.arr[bottom] = self.arr[top]
  *                     break
  *         self.arr[top] = pivot             # <<<<<<<<<<<<<<
@@ -5952,7 +5952,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
   __pyx_t_1 = __Pyx_PyIndex_AsSsize_t(__pyx_v_top); if (unlikely((__pyx_t_1 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   (__pyx_v_self->arr[__pyx_t_1]) = __pyx_t_6;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":62
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":62
  *                     break
  *         self.arr[top] = pivot
  *         return top             # <<<<<<<<<<<<<<
@@ -5964,7 +5964,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
   __pyx_r = __pyx_v_top;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":39
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":39
  *         raise ValueError('%s not in IntList' % val)
  * 
  *     def partition(self,start,end):             # <<<<<<<<<<<<<<
@@ -5987,7 +5987,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_6partition(struct __pyx_obj_4c
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":64
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":64
  *         return top
  * 
  *     def _doquicksort(self,start,end):             # <<<<<<<<<<<<<<
@@ -6069,7 +6069,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_8_doquicksort(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_doquicksort", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":65
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":65
  * 
  *     def _doquicksort(self,start,end):
  *         if start < end:             # <<<<<<<<<<<<<<
@@ -6081,7 +6081,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_8_doquicksort(struct __pyx_obj
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":66
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":66
  *     def _doquicksort(self,start,end):
  *         if start < end:
  *             split = self.partition(start,end)             # <<<<<<<<<<<<<<
@@ -6105,7 +6105,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_8_doquicksort(struct __pyx_obj
     __pyx_v_split = __pyx_t_4;
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":67
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":67
  *         if start < end:
  *             split = self.partition(start,end)
  *             self._doquicksort(start,split-1)             # <<<<<<<<<<<<<<
@@ -6130,7 +6130,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_8_doquicksort(struct __pyx_obj
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":68
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":68
  *             split = self.partition(start,end)
  *             self._doquicksort(start,split-1)
  *             self._doquicksort(split+1,end)             # <<<<<<<<<<<<<<
@@ -6158,7 +6158,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_8_doquicksort(struct __pyx_obj
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":70
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":70
  *             self._doquicksort(split+1,end)
  *         else:
  *             return             # <<<<<<<<<<<<<<
@@ -6171,7 +6171,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_8_doquicksort(struct __pyx_obj
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":64
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":64
  *         return top
  * 
  *     def _doquicksort(self,start,end):             # <<<<<<<<<<<<<<
@@ -6195,7 +6195,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_8_doquicksort(struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":72
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":72
  *             return
  * 
  *     def sort(self):             # <<<<<<<<<<<<<<
@@ -6227,7 +6227,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_10sort(struct __pyx_obj_4cdec_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("sort", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":73
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":73
  * 
  *     def sort(self):
  *         self._doquicksort(0,self.len-1)             # <<<<<<<<<<<<<<
@@ -6252,7 +6252,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_10sort(struct __pyx_obj_4cdec_
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":72
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":72
  *             return
  * 
  *     def sort(self):             # <<<<<<<<<<<<<<
@@ -6275,7 +6275,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_10sort(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":75
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":75
  *         self._doquicksort(0,self.len-1)
  * 
  *     def reset(self):             # <<<<<<<<<<<<<<
@@ -6301,7 +6301,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_12reset(struct __pyx_obj_4cdec
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("reset", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":76
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":76
  * 
  *     def reset(self):
  *         self.len = 0             # <<<<<<<<<<<<<<
@@ -6310,7 +6310,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_12reset(struct __pyx_obj_4cdec
  */
   __pyx_v_self->len = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":75
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":75
  *         self._doquicksort(0,self.len-1)
  * 
  *     def reset(self):             # <<<<<<<<<<<<<<
@@ -6325,7 +6325,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_12reset(struct __pyx_obj_4cdec
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":78
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":78
  *         self.len = 0
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -6348,7 +6348,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_7IntList_14__dealloc__(struct __pyx_obj_4cde
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":79
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":79
  * 
  *     def __dealloc__(self):
  *         free(self.arr)             # <<<<<<<<<<<<<<
@@ -6357,7 +6357,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_7IntList_14__dealloc__(struct __pyx_obj_4cde
  */
   free(__pyx_v_self->arr);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":78
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":78
  *         self.len = 0
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -6370,7 +6370,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_7IntList_14__dealloc__(struct __pyx_obj_4cde
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_7IntList_18generator(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":81
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":81
  *         free(self.arr)
  * 
  *     def __iter__(self):             # <<<<<<<<<<<<<<
@@ -6450,7 +6450,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_7IntList_18generator(__pyx_GeneratorObj
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":83
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":83
  *     def __iter__(self):
  *         cdef int i
  *         for i in range(self.len):             # <<<<<<<<<<<<<<
@@ -6461,7 +6461,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_7IntList_18generator(__pyx_GeneratorObj
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_2;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":84
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":84
  *         cdef int i
  *         for i in range(self.len):
  *             yield self.arr[i]             # <<<<<<<<<<<<<<
@@ -6485,7 +6485,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_7IntList_18generator(__pyx_GeneratorObj
     if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":81
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":81
  *         free(self.arr)
  * 
  *     def __iter__(self):             # <<<<<<<<<<<<<<
@@ -6507,7 +6507,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_7IntList_18generator(__pyx_GeneratorObj
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":86
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":86
  *             yield self.arr[i]
  * 
  *     def __getitem__(self, index):             # <<<<<<<<<<<<<<
@@ -6550,7 +6550,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__getitem__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":88
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":88
  *     def __getitem__(self, index):
  *         cdef int i, j, k
  *         if isinstance(index, int):             # <<<<<<<<<<<<<<
@@ -6561,7 +6561,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":89
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":89
  *         cdef int i, j, k
  *         if isinstance(index, int):
  *             j = index             # <<<<<<<<<<<<<<
@@ -6571,7 +6571,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     __pyx_t_3 = __Pyx_PyInt_As_int(__pyx_v_index); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __pyx_v_j = __pyx_t_3;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":90
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":90
  *         if isinstance(index, int):
  *             j = index
  *             if j < 0:             # <<<<<<<<<<<<<<
@@ -6581,7 +6581,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     __pyx_t_2 = ((__pyx_v_j < 0) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":91
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":91
  *             j = index
  *             if j < 0:
  *                 j = self.len + j             # <<<<<<<<<<<<<<
@@ -6593,7 +6593,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     }
     __pyx_L4:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":92
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":92
  *             if j < 0:
  *                 j = self.len + j
  *             if j<0 or j>=self.len:             # <<<<<<<<<<<<<<
@@ -6609,7 +6609,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     }
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":93
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":93
  *                 j = self.len + j
  *             if j<0 or j>=self.len:
  *                 raise IndexError("Requested index %d of %d-length IntList" % (index, self.len))             # <<<<<<<<<<<<<<
@@ -6642,7 +6642,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
       {__pyx_filename = __pyx_f[2]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":94
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":94
  *             if j<0 or j>=self.len:
  *                 raise IndexError("Requested index %d of %d-length IntList" % (index, self.len))
  *             return self.arr[j]             # <<<<<<<<<<<<<<
@@ -6657,7 +6657,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":95
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":95
  *                 raise IndexError("Requested index %d of %d-length IntList" % (index, self.len))
  *             return self.arr[j]
  *         elif isinstance(index, slice):             # <<<<<<<<<<<<<<
@@ -6668,7 +6668,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
   __pyx_t_2 = (__pyx_t_4 != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":96
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":96
  *             return self.arr[j]
  *         elif isinstance(index, slice):
  *             i = index.start             # <<<<<<<<<<<<<<
@@ -6681,7 +6681,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __pyx_v_i = __pyx_t_3;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":97
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":97
  *         elif isinstance(index, slice):
  *             i = index.start
  *             j = index.stop             # <<<<<<<<<<<<<<
@@ -6694,7 +6694,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __pyx_v_j = __pyx_t_3;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":98
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":98
  *             i = index.start
  *             j = index.stop
  *             if i < 0:             # <<<<<<<<<<<<<<
@@ -6704,7 +6704,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     __pyx_t_2 = ((__pyx_v_i < 0) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":99
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":99
  *             j = index.stop
  *             if i < 0:
  *                 i = self.len + i             # <<<<<<<<<<<<<<
@@ -6716,7 +6716,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     }
     __pyx_L6:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":100
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":100
  *             if i < 0:
  *                 i = self.len + i
  *             if j < 0:             # <<<<<<<<<<<<<<
@@ -6726,7 +6726,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     __pyx_t_2 = ((__pyx_v_j < 0) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":101
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":101
  *                 i = self.len + i
  *             if j < 0:
  *                 j = self.len + j             # <<<<<<<<<<<<<<
@@ -6738,7 +6738,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     }
     __pyx_L7:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":102
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":102
  *             if j < 0:
  *                 j = self.len + j
  *             if i < 0 or i >= self.len or j < 0 or j > self.len:             # <<<<<<<<<<<<<<
@@ -6766,7 +6766,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     }
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":103
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":103
  *                 j = self.len + j
  *             if i < 0 or i >= self.len or j < 0 or j > self.len:
  *                 raise IndexError("Requested index %d:%d of %d-length IntList" % (index.start, index.stop, self.len))             # <<<<<<<<<<<<<<
@@ -6806,7 +6806,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
       {__pyx_filename = __pyx_f[2]; __pyx_lineno = 103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":104
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":104
  *             if i < 0 or i >= self.len or j < 0 or j > self.len:
  *                 raise IndexError("Requested index %d:%d of %d-length IntList" % (index.start, index.stop, self.len))
  *             result = ()             # <<<<<<<<<<<<<<
@@ -6816,7 +6816,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     __Pyx_INCREF(__pyx_empty_tuple);
     __pyx_v_result = __pyx_empty_tuple;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":105
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":105
  *                 raise IndexError("Requested index %d:%d of %d-length IntList" % (index.start, index.stop, self.len))
  *             result = ()
  *             for k from i <= k < j:             # <<<<<<<<<<<<<<
@@ -6826,7 +6826,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     __pyx_t_3 = __pyx_v_j;
     for (__pyx_v_k = __pyx_v_i; __pyx_v_k < __pyx_t_3; __pyx_v_k++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":106
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":106
  *             result = ()
  *             for k from i <= k < j:
  *                 result = result + (self.arr[k],)             # <<<<<<<<<<<<<<
@@ -6847,7 +6847,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
       __pyx_t_9 = 0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":107
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":107
  *             for k from i <= k < j:
  *                 result = result + (self.arr[k],)
  *             return result             # <<<<<<<<<<<<<<
@@ -6861,7 +6861,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":109
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":109
  *             return result
  *         else:
  *             raise TypeError("Illegal key type %s for IntList" % type(index))             # <<<<<<<<<<<<<<
@@ -6883,7 +6883,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
     {__pyx_filename = __pyx_f[2]; __pyx_lineno = 109; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":86
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":86
  *             yield self.arr[i]
  * 
  *     def __getitem__(self, index):             # <<<<<<<<<<<<<<
@@ -6906,7 +6906,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_19__getitem__(struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":111
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":111
  *             raise TypeError("Illegal key type %s for IntList" % type(index))
  * 
  *     cdef void set(self, int i, int val):             # <<<<<<<<<<<<<<
@@ -6928,7 +6928,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_set(struct __pyx_obj_4cdec_2sa_3_sa_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("set", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":112
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":112
  * 
  *     cdef void set(self, int i, int val):
  *         j = i             # <<<<<<<<<<<<<<
@@ -6937,7 +6937,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_set(struct __pyx_obj_4cdec_2sa_3_sa_
  */
   __pyx_v_j = __pyx_v_i;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":113
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":113
  *     cdef void set(self, int i, int val):
  *         j = i
  *         if i<0:             # <<<<<<<<<<<<<<
@@ -6947,7 +6947,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_set(struct __pyx_obj_4cdec_2sa_3_sa_
   __pyx_t_1 = ((__pyx_v_i < 0) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":114
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":114
  *         j = i
  *         if i<0:
  *             j = self.len + i             # <<<<<<<<<<<<<<
@@ -6959,7 +6959,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_set(struct __pyx_obj_4cdec_2sa_3_sa_
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":115
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":115
  *         if i<0:
  *             j = self.len + i
  *         if j<0 or j>=self.len:             # <<<<<<<<<<<<<<
@@ -6975,7 +6975,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_set(struct __pyx_obj_4cdec_2sa_3_sa_
   }
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":116
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":116
  *             j = self.len + i
  *         if j<0 or j>=self.len:
  *             raise IndexError("Requested index %d of %d-length IntList" % (i, self.len))             # <<<<<<<<<<<<<<
@@ -7010,7 +7010,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_set(struct __pyx_obj_4cdec_2sa_3_sa_
     {__pyx_filename = __pyx_f[2]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":117
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":117
  *         if j<0 or j>=self.len:
  *             raise IndexError("Requested index %d of %d-length IntList" % (i, self.len))
  *         self.arr[j] = val             # <<<<<<<<<<<<<<
@@ -7019,7 +7019,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_set(struct __pyx_obj_4cdec_2sa_3_sa_
  */
   (__pyx_v_self->arr[__pyx_v_j]) = __pyx_v_val;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":111
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":111
  *             raise TypeError("Illegal key type %s for IntList" % type(index))
  * 
  *     cdef void set(self, int i, int val):             # <<<<<<<<<<<<<<
@@ -7038,7 +7038,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_set(struct __pyx_obj_4cdec_2sa_3_sa_
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":119
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":119
  *         self.arr[j] = val
  * 
  *     def __setitem__(self, i, val):             # <<<<<<<<<<<<<<
@@ -7069,7 +7069,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7IntList_21__setitem__(struct __pyx_obj_4cdec
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__setitem__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":120
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":120
  * 
  *     def __setitem__(self, i, val):
  *         self.set(i, val)             # <<<<<<<<<<<<<<
@@ -7080,7 +7080,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7IntList_21__setitem__(struct __pyx_obj_4cdec
   __pyx_t_2 = __Pyx_PyInt_As_int(__pyx_v_val); if (unlikely((__pyx_t_2 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->__pyx_vtab)->set(__pyx_v_self, __pyx_t_1, __pyx_t_2);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":119
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":119
  *         self.arr[j] = val
  * 
  *     def __setitem__(self, i, val):             # <<<<<<<<<<<<<<
@@ -7099,7 +7099,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7IntList_21__setitem__(struct __pyx_obj_4cdec
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":122
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":122
  *         self.set(i, val)
  * 
  *     def __len__(self):             # <<<<<<<<<<<<<<
@@ -7125,7 +7125,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_7IntList_23__len__(struct __pyx_obj_4c
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":123
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":123
  * 
  *     def __len__(self):
  *         return self.len             # <<<<<<<<<<<<<<
@@ -7135,7 +7135,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_7IntList_23__len__(struct __pyx_obj_4c
   __pyx_r = __pyx_v_self->len;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":122
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":122
  *         self.set(i, val)
  * 
  *     def __len__(self):             # <<<<<<<<<<<<<<
@@ -7149,7 +7149,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_7IntList_23__len__(struct __pyx_obj_4c
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":125
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":125
  *         return self.len
  * 
  *     def get_size(self):             # <<<<<<<<<<<<<<
@@ -7179,7 +7179,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_25get_size(struct __pyx_obj_4c
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_size", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":126
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":126
  * 
  *     def get_size(self):
  *         return self.size             # <<<<<<<<<<<<<<
@@ -7193,7 +7193,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_25get_size(struct __pyx_obj_4c
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":125
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":125
  *         return self.len
  * 
  *     def get_size(self):             # <<<<<<<<<<<<<<
@@ -7212,7 +7212,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_25get_size(struct __pyx_obj_4c
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":128
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":128
  *         return self.size
  * 
  *     def append(self, int val):             # <<<<<<<<<<<<<<
@@ -7251,7 +7251,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_27append(struct __pyx_obj_4cde
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("append", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":129
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":129
  * 
  *     def append(self, int val):
  *         self._append(val)             # <<<<<<<<<<<<<<
@@ -7260,7 +7260,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_27append(struct __pyx_obj_4cde
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->__pyx_vtab)->_append(__pyx_v_self, __pyx_v_val);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":128
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":128
  *         return self.size
  * 
  *     def append(self, int val):             # <<<<<<<<<<<<<<
@@ -7275,7 +7275,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_27append(struct __pyx_obj_4cde
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":131
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":131
  *         self._append(val)
  * 
  *     cdef void _append(self, int val):             # <<<<<<<<<<<<<<
@@ -7288,7 +7288,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__append(struct __pyx_obj_4cdec_2sa_3
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("_append", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":132
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":132
  * 
  *     cdef void _append(self, int val):
  *         if self.len == self.size:             # <<<<<<<<<<<<<<
@@ -7298,7 +7298,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__append(struct __pyx_obj_4cdec_2sa_3
   __pyx_t_1 = ((__pyx_v_self->len == __pyx_v_self->size) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":133
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":133
  *     cdef void _append(self, int val):
  *         if self.len == self.size:
  *             self.size = self.size + self.increment             # <<<<<<<<<<<<<<
@@ -7307,7 +7307,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__append(struct __pyx_obj_4cdec_2sa_3
  */
     __pyx_v_self->size = (__pyx_v_self->size + __pyx_v_self->increment);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":134
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":134
  *         if self.len == self.size:
  *             self.size = self.size + self.increment
  *             self.arr = <int*> realloc(self.arr, self.size*sizeof(int))             # <<<<<<<<<<<<<<
@@ -7319,7 +7319,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__append(struct __pyx_obj_4cdec_2sa_3
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":135
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":135
  *             self.size = self.size + self.increment
  *             self.arr = <int*> realloc(self.arr, self.size*sizeof(int))
  *         self.arr[self.len] = val             # <<<<<<<<<<<<<<
@@ -7328,7 +7328,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__append(struct __pyx_obj_4cdec_2sa_3
  */
   (__pyx_v_self->arr[__pyx_v_self->len]) = __pyx_v_val;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":136
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":136
  *             self.arr = <int*> realloc(self.arr, self.size*sizeof(int))
  *         self.arr[self.len] = val
  *         self.len = self.len + 1             # <<<<<<<<<<<<<<
@@ -7337,7 +7337,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__append(struct __pyx_obj_4cdec_2sa_3
  */
   __pyx_v_self->len = (__pyx_v_self->len + 1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":131
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":131
  *         self._append(val)
  * 
  *     cdef void _append(self, int val):             # <<<<<<<<<<<<<<
@@ -7349,7 +7349,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__append(struct __pyx_obj_4cdec_2sa_3
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":138
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":138
  *         self.len = self.len + 1
  * 
  *     def extend(self, other):             # <<<<<<<<<<<<<<
@@ -7378,7 +7378,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_29extend(struct __pyx_obj_4cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("extend", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":139
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":139
  * 
  *     def extend(self, other):
  *         self._extend(other)             # <<<<<<<<<<<<<<
@@ -7388,7 +7388,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_29extend(struct __pyx_obj_4cde
   if (!(likely(((__pyx_v_other) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_other, __pyx_ptype_4cdec_2sa_3_sa_IntList))))) {__pyx_filename = __pyx_f[2]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->__pyx_vtab)->_extend(__pyx_v_self, ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_v_other));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":138
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":138
  *         self.len = self.len + 1
  * 
  *     def extend(self, other):             # <<<<<<<<<<<<<<
@@ -7408,7 +7408,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_29extend(struct __pyx_obj_4cde
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":141
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":141
  *         self._extend(other)
  * 
  *     cdef void _extend(self, IntList other):             # <<<<<<<<<<<<<<
@@ -7420,7 +7420,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__extend(struct __pyx_obj_4cdec_2sa_3
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("_extend", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":142
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":142
  * 
  *     cdef void _extend(self, IntList other):
  *         self._extend_arr(other.arr, other.len)             # <<<<<<<<<<<<<<
@@ -7429,7 +7429,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__extend(struct __pyx_obj_4cdec_2sa_3
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->__pyx_vtab)->_extend_arr(__pyx_v_self, __pyx_v_other->arr, __pyx_v_other->len);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":141
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":141
  *         self._extend(other)
  * 
  *     cdef void _extend(self, IntList other):             # <<<<<<<<<<<<<<
@@ -7441,7 +7441,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__extend(struct __pyx_obj_4cdec_2sa_3
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":144
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":144
  *         self._extend_arr(other.arr, other.len)
  * 
  *     cdef void _extend_arr(self, int* other, int other_len):             # <<<<<<<<<<<<<<
@@ -7454,7 +7454,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__extend_arr(struct __pyx_obj_4cdec_2
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("_extend_arr", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":145
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":145
  * 
  *     cdef void _extend_arr(self, int* other, int other_len):
  *         if self.size < self.len + other_len:             # <<<<<<<<<<<<<<
@@ -7464,7 +7464,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__extend_arr(struct __pyx_obj_4cdec_2
   __pyx_t_1 = ((__pyx_v_self->size < (__pyx_v_self->len + __pyx_v_other_len)) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":146
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":146
  *     cdef void _extend_arr(self, int* other, int other_len):
  *         if self.size < self.len + other_len:
  *             self.size = self.len + other_len             # <<<<<<<<<<<<<<
@@ -7473,7 +7473,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__extend_arr(struct __pyx_obj_4cdec_2
  */
     __pyx_v_self->size = (__pyx_v_self->len + __pyx_v_other_len);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":147
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":147
  *         if self.size < self.len + other_len:
  *             self.size = self.len + other_len
  *             self.arr = <int*> realloc(self.arr, self.size*sizeof(int))             # <<<<<<<<<<<<<<
@@ -7485,7 +7485,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__extend_arr(struct __pyx_obj_4cdec_2
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":148
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":148
  *             self.size = self.len + other_len
  *             self.arr = <int*> realloc(self.arr, self.size*sizeof(int))
  *         memcpy(self.arr+self.len, other, other_len*sizeof(int))             # <<<<<<<<<<<<<<
@@ -7494,7 +7494,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__extend_arr(struct __pyx_obj_4cdec_2
  */
   memcpy((__pyx_v_self->arr + __pyx_v_self->len), __pyx_v_other, (__pyx_v_other_len * (sizeof(int))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":149
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":149
  *             self.arr = <int*> realloc(self.arr, self.size*sizeof(int))
  *         memcpy(self.arr+self.len, other, other_len*sizeof(int))
  *         self.len = self.len + other_len             # <<<<<<<<<<<<<<
@@ -7503,7 +7503,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__extend_arr(struct __pyx_obj_4cdec_2
  */
   __pyx_v_self->len = (__pyx_v_self->len + __pyx_v_other_len);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":144
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":144
  *         self._extend_arr(other.arr, other.len)
  * 
  *     cdef void _extend_arr(self, int* other, int other_len):             # <<<<<<<<<<<<<<
@@ -7515,7 +7515,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__extend_arr(struct __pyx_obj_4cdec_2
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":151
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":151
  *         self.len = self.len + other_len
  * 
  *     cdef void _clear(self):             # <<<<<<<<<<<<<<
@@ -7527,7 +7527,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__clear(struct __pyx_obj_4cdec_2sa_3_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("_clear", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":152
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":152
  * 
  *     cdef void _clear(self):
  *         free(self.arr)             # <<<<<<<<<<<<<<
@@ -7536,7 +7536,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__clear(struct __pyx_obj_4cdec_2sa_3_
  */
   free(__pyx_v_self->arr);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":153
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":153
  *     cdef void _clear(self):
  *         free(self.arr)
  *         self.len = 0             # <<<<<<<<<<<<<<
@@ -7545,7 +7545,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__clear(struct __pyx_obj_4cdec_2sa_3_
  */
   __pyx_v_self->len = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":154
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":154
  *         free(self.arr)
  *         self.len = 0
  *         self.size = 0             # <<<<<<<<<<<<<<
@@ -7554,7 +7554,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__clear(struct __pyx_obj_4cdec_2sa_3_
  */
   __pyx_v_self->size = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":155
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":155
  *         self.len = 0
  *         self.size = 0
  *         self.arr = <int*> malloc(0)             # <<<<<<<<<<<<<<
@@ -7563,7 +7563,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__clear(struct __pyx_obj_4cdec_2sa_3_
  */
   __pyx_v_self->arr = ((int *)malloc(0));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":151
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":151
  *         self.len = self.len + other_len
  * 
  *     cdef void _clear(self):             # <<<<<<<<<<<<<<
@@ -7575,7 +7575,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList__clear(struct __pyx_obj_4cdec_2sa_3_
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":157
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":157
  *         self.arr = <int*> malloc(0)
  * 
  *     cdef void write_handle(self, FILE* f):             # <<<<<<<<<<<<<<
@@ -7587,7 +7587,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_write_handle(struct __pyx_obj_4cdec_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("write_handle", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":158
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":158
  * 
  *     cdef void write_handle(self, FILE* f):
  *         fwrite(&(self.len), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -7596,7 +7596,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_write_handle(struct __pyx_obj_4cdec_
  */
   fwrite((&__pyx_v_self->len), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":159
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":159
  *     cdef void write_handle(self, FILE* f):
  *         fwrite(&(self.len), sizeof(int), 1, f)
  *         fwrite(self.arr, sizeof(int), self.len, f)             # <<<<<<<<<<<<<<
@@ -7605,7 +7605,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_write_handle(struct __pyx_obj_4cdec_
  */
   fwrite(__pyx_v_self->arr, (sizeof(int)), __pyx_v_self->len, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":157
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":157
  *         self.arr = <int*> malloc(0)
  * 
  *     cdef void write_handle(self, FILE* f):             # <<<<<<<<<<<<<<
@@ -7617,7 +7617,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_write_handle(struct __pyx_obj_4cdec_
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":161
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":161
  *         fwrite(self.arr, sizeof(int), self.len, f)
  * 
  *     def write(self, char* filename):             # <<<<<<<<<<<<<<
@@ -7657,7 +7657,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_31write(struct __pyx_obj_4cdec
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("write", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":163
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":163
  *     def write(self, char* filename):
  *         cdef FILE* f
  *         f = fopen(filename, "w")             # <<<<<<<<<<<<<<
@@ -7666,7 +7666,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_31write(struct __pyx_obj_4cdec
  */
   __pyx_v_f = fopen(__pyx_v_filename, __pyx_k_w);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":164
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":164
  *         cdef FILE* f
  *         f = fopen(filename, "w")
  *         self.write_handle(f)             # <<<<<<<<<<<<<<
@@ -7675,7 +7675,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_31write(struct __pyx_obj_4cdec
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->__pyx_vtab)->write_handle(__pyx_v_self, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":165
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":165
  *         f = fopen(filename, "w")
  *         self.write_handle(f)
  *         fclose(f)             # <<<<<<<<<<<<<<
@@ -7684,7 +7684,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_31write(struct __pyx_obj_4cdec
  */
   fclose(__pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":161
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":161
  *         fwrite(self.arr, sizeof(int), self.len, f)
  * 
  *     def write(self, char* filename):             # <<<<<<<<<<<<<<
@@ -7699,7 +7699,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_31write(struct __pyx_obj_4cdec
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":167
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":167
  *         fclose(f)
  * 
  *     cdef void read_handle(self, FILE* f):             # <<<<<<<<<<<<<<
@@ -7712,7 +7712,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_read_handle(struct __pyx_obj_4cdec_2
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("read_handle", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":168
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":168
  * 
  *     cdef void read_handle(self, FILE* f):
  *         (self.arr)             # <<<<<<<<<<<<<<
@@ -7721,7 +7721,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_read_handle(struct __pyx_obj_4cdec_2
  */
   __pyx_v_self->arr;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":169
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":169
  *     cdef void read_handle(self, FILE* f):
  *         (self.arr)
  *         fread(&(self.len), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -7730,7 +7730,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_read_handle(struct __pyx_obj_4cdec_2
  */
   fread((&__pyx_v_self->len), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":170
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":170
  *         (self.arr)
  *         fread(&(self.len), sizeof(int), 1, f)
  *         self.arr = <int*> malloc(self.len * sizeof(int))             # <<<<<<<<<<<<<<
@@ -7739,7 +7739,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_read_handle(struct __pyx_obj_4cdec_2
  */
   __pyx_v_self->arr = ((int *)malloc((__pyx_v_self->len * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":171
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":171
  *         fread(&(self.len), sizeof(int), 1, f)
  *         self.arr = <int*> malloc(self.len * sizeof(int))
  *         self.size = self.len             # <<<<<<<<<<<<<<
@@ -7749,7 +7749,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_read_handle(struct __pyx_obj_4cdec_2
   __pyx_t_1 = __pyx_v_self->len;
   __pyx_v_self->size = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":172
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":172
  *         self.arr = <int*> malloc(self.len * sizeof(int))
  *         self.size = self.len
  *         fread(self.arr, sizeof(int), self.len, f)             # <<<<<<<<<<<<<<
@@ -7758,7 +7758,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_read_handle(struct __pyx_obj_4cdec_2
  */
   fread(__pyx_v_self->arr, (sizeof(int)), __pyx_v_self->len, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":167
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":167
  *         fclose(f)
  * 
  *     cdef void read_handle(self, FILE* f):             # <<<<<<<<<<<<<<
@@ -7770,7 +7770,7 @@ static void __pyx_f_4cdec_2sa_3_sa_7IntList_read_handle(struct __pyx_obj_4cdec_2
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":174
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":174
  *         fread(self.arr, sizeof(int), self.len, f)
  * 
  *     def read(self, char* filename):             # <<<<<<<<<<<<<<
@@ -7810,7 +7810,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_33read(struct __pyx_obj_4cdec_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("read", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":176
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":176
  *     def read(self, char* filename):
  *         cdef FILE* f
  *         f = fopen(filename, "r")             # <<<<<<<<<<<<<<
@@ -7819,7 +7819,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_33read(struct __pyx_obj_4cdec_
  */
   __pyx_v_f = fopen(__pyx_v_filename, __pyx_k_r);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":177
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":177
  *         cdef FILE* f
  *         f = fopen(filename, "r")
  *         self.read_handle(f)             # <<<<<<<<<<<<<<
@@ -7827,14 +7827,14 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_33read(struct __pyx_obj_4cdec_
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->__pyx_vtab)->read_handle(__pyx_v_self, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":178
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":178
  *         f = fopen(filename, "r")
  *         self.read_handle(f)
  *         fclose(f)             # <<<<<<<<<<<<<<
  */
   fclose(__pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/int_list.pxi":174
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/int_list.pxi":174
  *         fread(self.arr, sizeof(int), self.len, f)
  * 
  *     def read(self, char* filename):             # <<<<<<<<<<<<<<
@@ -7849,7 +7849,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7IntList_33read(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/str_map.pxi":13
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/str_map.pxi":13
  *     cdef int index(self, char *s)
  * 
  *     def __cinit__(self):             # <<<<<<<<<<<<<<
@@ -7878,7 +7878,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9StringMap___cinit__(struct __pyx_obj_4cdec_2
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/str_map.pxi":14
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/str_map.pxi":14
  * 
  *     def __cinit__(self):
  *         self.vocab = stringmap_new()             # <<<<<<<<<<<<<<
@@ -7887,7 +7887,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9StringMap___cinit__(struct __pyx_obj_4cdec_2
  */
   __pyx_v_self->vocab = stringmap_new();
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/str_map.pxi":13
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/str_map.pxi":13
  *     cdef int index(self, char *s)
  * 
  *     def __cinit__(self):             # <<<<<<<<<<<<<<
@@ -7901,7 +7901,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9StringMap___cinit__(struct __pyx_obj_4cdec_2
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/str_map.pxi":16
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/str_map.pxi":16
  *         self.vocab = stringmap_new()
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -7924,7 +7924,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_9StringMap_2__dealloc__(struct __pyx_obj_4cd
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/str_map.pxi":17
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/str_map.pxi":17
  * 
  *     def __dealloc__(self):
  *         stringmap_delete(self.vocab)             # <<<<<<<<<<<<<<
@@ -7933,7 +7933,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_9StringMap_2__dealloc__(struct __pyx_obj_4cd
  */
   stringmap_delete(__pyx_v_self->vocab);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/str_map.pxi":16
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/str_map.pxi":16
  *         self.vocab = stringmap_new()
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -7945,7 +7945,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_9StringMap_2__dealloc__(struct __pyx_obj_4cd
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/str_map.pxi":19
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/str_map.pxi":19
  *         stringmap_delete(self.vocab)
  * 
  *     cdef char *word(self, int i):             # <<<<<<<<<<<<<<
@@ -7958,7 +7958,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_9StringMap_word(struct __pyx_obj_4cdec_2sa_3
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("word", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/str_map.pxi":20
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/str_map.pxi":20
  * 
  *     cdef char *word(self, int i):
  *         return stringmap_word(self.vocab, i)             # <<<<<<<<<<<<<<
@@ -7968,7 +7968,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_9StringMap_word(struct __pyx_obj_4cdec_2sa_3
   __pyx_r = stringmap_word(__pyx_v_self->vocab, __pyx_v_i);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/str_map.pxi":19
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/str_map.pxi":19
  *         stringmap_delete(self.vocab)
  * 
  *     cdef char *word(self, int i):             # <<<<<<<<<<<<<<
@@ -7982,7 +7982,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_9StringMap_word(struct __pyx_obj_4cdec_2sa_3
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/str_map.pxi":22
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/str_map.pxi":22
  *         return stringmap_word(self.vocab, i)
  * 
  *     cdef int index(self, char *s):             # <<<<<<<<<<<<<<
@@ -7994,7 +7994,7 @@ static int __pyx_f_4cdec_2sa_3_sa_9StringMap_index(struct __pyx_obj_4cdec_2sa_3_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("index", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/str_map.pxi":23
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/str_map.pxi":23
  * 
  *     cdef int index(self, char *s):
  *         return stringmap_index(self.vocab, s)             # <<<<<<<<<<<<<<
@@ -8002,7 +8002,7 @@ static int __pyx_f_4cdec_2sa_3_sa_9StringMap_index(struct __pyx_obj_4cdec_2sa_3_
   __pyx_r = stringmap_index(__pyx_v_self->vocab, __pyx_v_s);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/str_map.pxi":22
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/str_map.pxi":22
  *         return stringmap_word(self.vocab, i)
  * 
  *     cdef int index(self, char *s):             # <<<<<<<<<<<<<<
@@ -8015,7 +8015,7 @@ static int __pyx_f_4cdec_2sa_3_sa_9StringMap_index(struct __pyx_obj_4cdec_2sa_3_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":17
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":17
  *     cdef bint use_sent_id
  * 
  *     def __cinit__(self, from_binary=None, from_text=None, side=None, bint use_sent_id=False):             # <<<<<<<<<<<<<<
@@ -8125,7 +8125,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray___cinit__(struct __pyx_obj_4cdec_2
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":18
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":18
  * 
  *     def __cinit__(self, from_binary=None, from_text=None, side=None, bint use_sent_id=False):
  *         self.word2id = {"END_OF_FILE":0, "END_OF_LINE":1}             # <<<<<<<<<<<<<<
@@ -8142,7 +8142,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray___cinit__(struct __pyx_obj_4cdec_2
   __pyx_v_self->word2id = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":19
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":19
  *     def __cinit__(self, from_binary=None, from_text=None, side=None, bint use_sent_id=False):
  *         self.word2id = {"END_OF_FILE":0, "END_OF_LINE":1}
  *         self.id2word = ["END_OF_FILE", "END_OF_LINE"]             # <<<<<<<<<<<<<<
@@ -8163,7 +8163,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray___cinit__(struct __pyx_obj_4cdec_2
   __pyx_v_self->id2word = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":20
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":20
  *         self.word2id = {"END_OF_FILE":0, "END_OF_LINE":1}
  *         self.id2word = ["END_OF_FILE", "END_OF_LINE"]
  *         self.data = IntList(1000,1000)             # <<<<<<<<<<<<<<
@@ -8178,7 +8178,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray___cinit__(struct __pyx_obj_4cdec_2
   __pyx_v_self->data = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":21
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":21
  *         self.id2word = ["END_OF_FILE", "END_OF_LINE"]
  *         self.data = IntList(1000,1000)
  *         self.sent_id = IntList(1000,1000)             # <<<<<<<<<<<<<<
@@ -8193,7 +8193,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray___cinit__(struct __pyx_obj_4cdec_2
   __pyx_v_self->sent_id = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":22
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":22
  *         self.data = IntList(1000,1000)
  *         self.sent_id = IntList(1000,1000)
  *         self.sent_index = IntList(1000,1000)             # <<<<<<<<<<<<<<
@@ -8208,7 +8208,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray___cinit__(struct __pyx_obj_4cdec_2
   __pyx_v_self->sent_index = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":23
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":23
  *         self.sent_id = IntList(1000,1000)
  *         self.sent_index = IntList(1000,1000)
  *         self.use_sent_id = use_sent_id             # <<<<<<<<<<<<<<
@@ -8217,7 +8217,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray___cinit__(struct __pyx_obj_4cdec_2
  */
   __pyx_v_self->use_sent_id = __pyx_v_use_sent_id;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":24
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":24
  *         self.sent_index = IntList(1000,1000)
  *         self.use_sent_id = use_sent_id
  *         if from_binary:             # <<<<<<<<<<<<<<
@@ -8227,7 +8227,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray___cinit__(struct __pyx_obj_4cdec_2
   __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_from_binary); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":25
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":25
  *         self.use_sent_id = use_sent_id
  *         if from_binary:
  *             self.read_binary(from_binary)             # <<<<<<<<<<<<<<
@@ -8249,7 +8249,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray___cinit__(struct __pyx_obj_4cdec_2
     goto __pyx_L3;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":26
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":26
  *         if from_binary:
  *             self.read_binary(from_binary)
  *         elif from_text:             # <<<<<<<<<<<<<<
@@ -8259,7 +8259,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray___cinit__(struct __pyx_obj_4cdec_2
   __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_from_text); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":27
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":27
  *             self.read_binary(from_binary)
  *         elif from_text:
  *             if side:             # <<<<<<<<<<<<<<
@@ -8269,7 +8269,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray___cinit__(struct __pyx_obj_4cdec_2
     __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_side); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":28
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":28
  *         elif from_text:
  *             if side:
  *                 self.read_bitext(from_text, (0 if side == 'source' else 1))             # <<<<<<<<<<<<<<
@@ -8303,7 +8303,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray___cinit__(struct __pyx_obj_4cdec_2
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":30
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":30
  *                 self.read_bitext(from_text, (0 if side == 'source' else 1))
  *             else:
  *                 self.read_text(from_text)             # <<<<<<<<<<<<<<
@@ -8328,7 +8328,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray___cinit__(struct __pyx_obj_4cdec_2
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":17
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":17
  *     cdef bint use_sent_id
  * 
  *     def __cinit__(self, from_binary=None, from_text=None, side=None, bint use_sent_id=False):             # <<<<<<<<<<<<<<
@@ -8350,7 +8350,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray___cinit__(struct __pyx_obj_4cdec_2
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":32
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":32
  *                 self.read_text(from_text)
  * 
  *     def __len__(self):             # <<<<<<<<<<<<<<
@@ -8381,7 +8381,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_9DataArray_2__len__(struct __pyx_obj_4
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__len__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":33
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":33
  * 
  *     def __len__(self):
  *         return len(self.data)             # <<<<<<<<<<<<<<
@@ -8395,7 +8395,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_9DataArray_2__len__(struct __pyx_obj_4
   __pyx_r = __pyx_t_2;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":32
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":32
  *                 self.read_text(from_text)
  * 
  *     def __len__(self):             # <<<<<<<<<<<<<<
@@ -8413,7 +8413,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_9DataArray_2__len__(struct __pyx_obj_4
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":35
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":35
  *         return len(self.data)
  * 
  *     def get_sentence_id(self, i):             # <<<<<<<<<<<<<<
@@ -8444,7 +8444,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_4get_sentence_id(struct __py
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_sentence_id", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":36
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":36
  * 
  *     def get_sentence_id(self, i):
  *         return self.sent_id.arr[i]             # <<<<<<<<<<<<<<
@@ -8459,7 +8459,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_4get_sentence_id(struct __py
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":35
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":35
  *         return len(self.data)
  * 
  *     def get_sentence_id(self, i):             # <<<<<<<<<<<<<<
@@ -8478,7 +8478,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_4get_sentence_id(struct __py
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":38
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":38
  *         return self.sent_id.arr[i]
  * 
  *     def get_sentence(self, i):             # <<<<<<<<<<<<<<
@@ -8516,7 +8516,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_6get_sentence(struct __pyx_o
   __Pyx_RefNannySetupContext("get_sentence", 0);
   __Pyx_INCREF(__pyx_v_i);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":40
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":40
  *     def get_sentence(self, i):
  *         cdef int j, start, stop
  *         sent = []             # <<<<<<<<<<<<<<
@@ -8528,7 +8528,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_6get_sentence(struct __pyx_o
   __pyx_v_sent = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":41
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":41
  *         cdef int j, start, stop
  *         sent = []
  *         start = self.sent_index.arr[i]             # <<<<<<<<<<<<<<
@@ -8538,7 +8538,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_6get_sentence(struct __pyx_o
   __pyx_t_2 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_2 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_start = (__pyx_v_self->sent_index->arr[__pyx_t_2]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":42
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":42
  *         sent = []
  *         start = self.sent_index.arr[i]
  *         stop = self.sent_index.arr[i+1]             # <<<<<<<<<<<<<<
@@ -8551,7 +8551,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_6get_sentence(struct __pyx_o
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_v_stop = (__pyx_v_self->sent_index->arr[__pyx_t_2]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":43
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":43
  *         start = self.sent_index.arr[i]
  *         stop = self.sent_index.arr[i+1]
  *         for i from start <= i < stop:             # <<<<<<<<<<<<<<
@@ -8565,7 +8565,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_6get_sentence(struct __pyx_o
     __Pyx_DECREF_SET(__pyx_v_i, __pyx_t_1);
     __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":44
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":44
  *         stop = self.sent_index.arr[i+1]
  *         for i from start <= i < stop:
  *             sent.append(self.id2word[self.data.arr[i]])             # <<<<<<<<<<<<<<
@@ -8580,7 +8580,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_6get_sentence(struct __pyx_o
     __pyx_t_4 = __Pyx_PyInt_As_int(__pyx_v_i); if (unlikely((__pyx_t_4 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":43
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":43
  *         start = self.sent_index.arr[i]
  *         stop = self.sent_index.arr[i+1]
  *         for i from start <= i < stop:             # <<<<<<<<<<<<<<
@@ -8592,7 +8592,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_6get_sentence(struct __pyx_o
   __Pyx_DECREF_SET(__pyx_v_i, __pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":45
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":45
  *         for i from start <= i < stop:
  *             sent.append(self.id2word[self.data.arr[i]])
  *         return sent             # <<<<<<<<<<<<<<
@@ -8604,7 +8604,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_6get_sentence(struct __pyx_o
   __pyx_r = __pyx_v_sent;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":38
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":38
  *         return self.sent_id.arr[i]
  * 
  *     def get_sentence(self, i):             # <<<<<<<<<<<<<<
@@ -8625,7 +8625,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_6get_sentence(struct __pyx_o
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":47
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":47
  *         return sent
  * 
  *     def get_id(self, word):             # <<<<<<<<<<<<<<
@@ -8659,7 +8659,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_8get_id(struct __pyx_obj_4cd
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_id", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":48
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":48
  * 
  *     def get_id(self, word):
  *         if not word in self.word2id:             # <<<<<<<<<<<<<<
@@ -8670,7 +8670,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_8get_id(struct __pyx_obj_4cd
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":49
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":49
  *     def get_id(self, word):
  *         if not word in self.word2id:
  *             self.word2id[word] = len(self.id2word)             # <<<<<<<<<<<<<<
@@ -8686,7 +8686,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_8get_id(struct __pyx_obj_4cd
     if (unlikely(PyObject_SetItem(__pyx_v_self->word2id, __pyx_v_word, __pyx_t_3) < 0)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":50
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":50
  *         if not word in self.word2id:
  *             self.word2id[word] = len(self.id2word)
  *             self.id2word.append(word)             # <<<<<<<<<<<<<<
@@ -8698,7 +8698,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_8get_id(struct __pyx_obj_4cd
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":51
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":51
  *             self.word2id[word] = len(self.id2word)
  *             self.id2word.append(word)
  *         return self.word2id[word]             # <<<<<<<<<<<<<<
@@ -8712,7 +8712,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_8get_id(struct __pyx_obj_4cd
   __pyx_t_3 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":47
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":47
  *         return sent
  * 
  *     def get_id(self, word):             # <<<<<<<<<<<<<<
@@ -8731,7 +8731,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_8get_id(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":53
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":53
  *         return self.word2id[word]
  * 
  *     def __getitem__(self, loc):             # <<<<<<<<<<<<<<
@@ -8762,7 +8762,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_10__getitem__(struct __pyx_o
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__getitem__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":54
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":54
  * 
  *     def __getitem__(self, loc):
  *         return self.id2word[self.data.arr[loc]]             # <<<<<<<<<<<<<<
@@ -8777,7 +8777,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_10__getitem__(struct __pyx_o
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":53
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":53
  *         return self.word2id[word]
  * 
  *     def __getitem__(self, loc):             # <<<<<<<<<<<<<<
@@ -8796,7 +8796,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_10__getitem__(struct __pyx_o
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":56
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":56
  *         return self.id2word[self.data.arr[loc]]
  * 
  *     def get_sentence_bounds(self, loc):             # <<<<<<<<<<<<<<
@@ -8830,7 +8830,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_12get_sentence_bounds(struct
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_sentence_bounds", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":57
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":57
  * 
  *     def get_sentence_bounds(self, loc):
  *         cdef int sid = self.sent_id.arr[loc]             # <<<<<<<<<<<<<<
@@ -8840,7 +8840,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_12get_sentence_bounds(struct
   __pyx_t_1 = __Pyx_PyIndex_AsSsize_t(__pyx_v_loc); if (unlikely((__pyx_t_1 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_sid = (__pyx_v_self->sent_id->arr[__pyx_t_1]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":58
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":58
  *     def get_sentence_bounds(self, loc):
  *         cdef int sid = self.sent_id.arr[loc]
  *         return (self.sent_index.arr[sid], self.sent_index.arr[sid+1])             # <<<<<<<<<<<<<<
@@ -8864,7 +8864,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_12get_sentence_bounds(struct
   __pyx_t_4 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":56
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":56
  *         return self.id2word[self.data.arr[loc]]
  * 
  *     def get_sentence_bounds(self, loc):             # <<<<<<<<<<<<<<
@@ -8885,7 +8885,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_12get_sentence_bounds(struct
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":60
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":60
  *         return (self.sent_index.arr[sid], self.sent_index.arr[sid+1])
  * 
  *     def write_text(self, char* filename):             # <<<<<<<<<<<<<<
@@ -8943,7 +8943,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_14write_text(struct __pyx_ob
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("write_text", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":61
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":61
  * 
  *     def write_text(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -8983,7 +8983,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_14write_text(struct __pyx_ob
           __pyx_v_f = __pyx_t_4;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":62
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":62
  *     def write_text(self, char* filename):
  *         with open(filename, "w") as f:
  *             for w_id in self.data:             # <<<<<<<<<<<<<<
@@ -9028,7 +9028,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_14write_text(struct __pyx_ob
             __Pyx_XDECREF_SET(__pyx_v_w_id, __pyx_t_1);
             __pyx_t_1 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":63
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":63
  *         with open(filename, "w") as f:
  *             for w_id in self.data:
  *                 if w_id > 1:             # <<<<<<<<<<<<<<
@@ -9040,7 +9040,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_14write_text(struct __pyx_ob
             __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
             if (__pyx_t_10) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":64
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":64
  *             for w_id in self.data:
  *                 if w_id > 1:
  *                     f.write("%s " % self.get_word(w_id))             # <<<<<<<<<<<<<<
@@ -9077,7 +9077,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_14write_text(struct __pyx_ob
             }
             __pyx_L18:;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":65
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":65
  *                 if w_id > 1:
  *                     f.write("%s " % self.get_word(w_id))
  *                 if w_id == 1:             # <<<<<<<<<<<<<<
@@ -9089,7 +9089,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_14write_text(struct __pyx_ob
             __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
             if (__pyx_t_10) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":66
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":66
  *                     f.write("%s " % self.get_word(w_id))
  *                 if w_id == 1:
  *                     f.write("\n")             # <<<<<<<<<<<<<<
@@ -9119,7 +9119,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_14write_text(struct __pyx_ob
         __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0;
         __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":61
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":61
  * 
  *     def write_text(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -9190,7 +9190,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_14write_text(struct __pyx_ob
     __pyx_L23:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":60
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":60
  *         return (self.sent_index.arr[sid], self.sent_index.arr[sid+1])
  * 
  *     def write_text(self, char* filename):             # <<<<<<<<<<<<<<
@@ -9217,7 +9217,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_14write_text(struct __pyx_ob
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":68
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":68
  *                     f.write("\n")
  * 
  *     def read_text(self, char* filename):             # <<<<<<<<<<<<<<
@@ -9271,7 +9271,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_16read_text(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("read_text", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":69
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":69
  * 
  *     def read_text(self, char* filename):
  *         with gzip_or_text(filename) as fp:             # <<<<<<<<<<<<<<
@@ -9311,7 +9311,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_16read_text(struct __pyx_obj
           __pyx_v_fp = __pyx_t_1;
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":70
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":70
  *     def read_text(self, char* filename):
  *         with gzip_or_text(filename) as fp:
  *             self.read_text_data(fp)             # <<<<<<<<<<<<<<
@@ -9340,7 +9340,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_16read_text(struct __pyx_obj
         __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
         __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":69
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":69
  * 
  *     def read_text(self, char* filename):
  *         with gzip_or_text(filename) as fp:             # <<<<<<<<<<<<<<
@@ -9411,7 +9411,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_16read_text(struct __pyx_obj
     __pyx_L19:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":68
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":68
  *                     f.write("\n")
  * 
  *     def read_text(self, char* filename):             # <<<<<<<<<<<<<<
@@ -9436,7 +9436,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_16read_text(struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":72
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":72
  *             self.read_text_data(fp)
  * 
  *     def read_bitext(self, char* filename, int side):             # <<<<<<<<<<<<<<
@@ -9506,7 +9506,7 @@ static PyObject *__pyx_pw_4cdec_2sa_3_sa_9DataArray_19read_bitext(PyObject *__py
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_9DataArray_11read_bitext_2generator6(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":74
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":74
  *     def read_bitext(self, char* filename, int side):
  *         with gzip_or_text(filename) as fp:
  *             data = (line.split(' ||| ')[side] for line in fp)             # <<<<<<<<<<<<<<
@@ -9659,7 +9659,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_9DataArray_11read_bitext_2generator6(__
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":72
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":72
  *             self.read_text_data(fp)
  * 
  *     def read_bitext(self, char* filename, int side):             # <<<<<<<<<<<<<<
@@ -9695,7 +9695,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_18read_bitext(struct __pyx_o
   __Pyx_GOTREF(__pyx_cur_scope);
   __pyx_cur_scope->__pyx_v_side = __pyx_v_side;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":73
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":73
  * 
  *     def read_bitext(self, char* filename, int side):
  *         with gzip_or_text(filename) as fp:             # <<<<<<<<<<<<<<
@@ -9736,7 +9736,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_18read_bitext(struct __pyx_o
           __pyx_cur_scope->__pyx_v_fp = __pyx_t_1;
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":74
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":74
  *     def read_bitext(self, char* filename, int side):
  *         with gzip_or_text(filename) as fp:
  *             data = (line.split(' ||| ')[side] for line in fp)             # <<<<<<<<<<<<<<
@@ -9748,7 +9748,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_18read_bitext(struct __pyx_o
           __pyx_v_data = __pyx_t_1;
           __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":75
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":75
  *         with gzip_or_text(filename) as fp:
  *             data = (line.split(' ||| ')[side] for line in fp)
  *             self.read_text_data(data)             # <<<<<<<<<<<<<<
@@ -9777,7 +9777,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_18read_bitext(struct __pyx_o
         __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
         __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":73
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":73
  * 
  *     def read_bitext(self, char* filename, int side):
  *         with gzip_or_text(filename) as fp:             # <<<<<<<<<<<<<<
@@ -9848,7 +9848,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_18read_bitext(struct __pyx_o
     __pyx_L19:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":72
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":72
  *             self.read_text_data(fp)
  * 
  *     def read_bitext(self, char* filename, int side):             # <<<<<<<<<<<<<<
@@ -9874,7 +9874,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_18read_bitext(struct __pyx_o
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":77
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":77
  *             self.read_text_data(data)
  * 
  *     def read_text_data(self, data):             # <<<<<<<<<<<<<<
@@ -9919,7 +9919,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("read_text_data", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":78
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":78
  * 
  *     def read_text_data(self, data):
  *         cdef int word_count = 0             # <<<<<<<<<<<<<<
@@ -9928,7 +9928,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
  */
   __pyx_v_word_count = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":79
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":79
  *     def read_text_data(self, data):
  *         cdef int word_count = 0
  *         for line_num, line in enumerate(data):             # <<<<<<<<<<<<<<
@@ -9982,7 +9982,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
     __pyx_t_1 = __pyx_t_5;
     __pyx_t_5 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":80
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":80
  *         cdef int word_count = 0
  *         for line_num, line in enumerate(data):
  *             self.sent_index.append(word_count)             # <<<<<<<<<<<<<<
@@ -9994,7 +9994,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
     __pyx_t_6 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_self->sent_index), __pyx_t_5); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":81
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":81
  *         for line_num, line in enumerate(data):
  *             self.sent_index.append(word_count)
  *             for word in line.split():             # <<<<<<<<<<<<<<
@@ -10045,7 +10045,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
       __Pyx_XDECREF_SET(__pyx_v_word, __pyx_t_7);
       __pyx_t_7 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":82
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":82
  *             self.sent_index.append(word_count)
  *             for word in line.split():
  *                 self.data.append(self.get_id(word))             # <<<<<<<<<<<<<<
@@ -10066,7 +10066,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
       __pyx_t_6 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_self->data), __pyx_t_11); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":83
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":83
  *             for word in line.split():
  *                 self.data.append(self.get_id(word))
  *                 if self.use_sent_id:             # <<<<<<<<<<<<<<
@@ -10076,7 +10076,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
       __pyx_t_12 = (__pyx_v_self->use_sent_id != 0);
       if (__pyx_t_12) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":84
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":84
  *                 self.data.append(self.get_id(word))
  *                 if self.use_sent_id:
  *                     self.sent_id.append(line_num)             # <<<<<<<<<<<<<<
@@ -10088,7 +10088,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
       }
       __pyx_L7:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":85
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":85
  *                 if self.use_sent_id:
  *                     self.sent_id.append(line_num)
  *                 word_count = word_count + 1             # <<<<<<<<<<<<<<
@@ -10099,7 +10099,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
     }
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":86
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":86
  *                     self.sent_id.append(line_num)
  *                 word_count = word_count + 1
  *             self.data.append(1)             # <<<<<<<<<<<<<<
@@ -10108,7 +10108,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
  */
     __pyx_t_6 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_self->data), __pyx_int_1); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":87
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":87
  *                 word_count = word_count + 1
  *             self.data.append(1)
  *             if self.use_sent_id:             # <<<<<<<<<<<<<<
@@ -10118,7 +10118,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
     __pyx_t_12 = (__pyx_v_self->use_sent_id != 0);
     if (__pyx_t_12) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":88
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":88
  *             self.data.append(1)
  *             if self.use_sent_id:
  *                 self.sent_id.append(line_num)             # <<<<<<<<<<<<<<
@@ -10130,7 +10130,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
     }
     __pyx_L8:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":89
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":89
  *             if self.use_sent_id:
  *                 self.sent_id.append(line_num)
  *             word_count = word_count + 1             # <<<<<<<<<<<<<<
@@ -10142,7 +10142,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":90
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":90
  *                 self.sent_id.append(line_num)
  *             word_count = word_count + 1
  *         self.data.append(0)             # <<<<<<<<<<<<<<
@@ -10151,7 +10151,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
  */
   __pyx_t_6 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_self->data), __pyx_int_0); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":91
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":91
  *             word_count = word_count + 1
  *         self.data.append(0)
  *         self.sent_index.append(word_count)             # <<<<<<<<<<<<<<
@@ -10163,7 +10163,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
   __pyx_t_6 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_self->sent_index), __pyx_t_1); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":77
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":77
  *             self.read_text_data(data)
  * 
  *     def read_text_data(self, data):             # <<<<<<<<<<<<<<
@@ -10192,7 +10192,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_20read_text_data(struct __py
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":94
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":94
  * 
  * 
  *     def read_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -10232,7 +10232,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_22read_binary(struct __pyx_o
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("read_binary", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":96
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":96
  *     def read_binary(self, char* filename):
  *         cdef FILE* f
  *         f = fopen(filename, "r")             # <<<<<<<<<<<<<<
@@ -10241,7 +10241,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_22read_binary(struct __pyx_o
  */
   __pyx_v_f = fopen(__pyx_v_filename, __pyx_k_r);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":97
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":97
  *         cdef FILE* f
  *         f = fopen(filename, "r")
  *         self.read_handle(f)             # <<<<<<<<<<<<<<
@@ -10250,7 +10250,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_22read_binary(struct __pyx_o
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_DataArray *)__pyx_v_self->__pyx_vtab)->read_handle(__pyx_v_self, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":98
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":98
  *         f = fopen(filename, "r")
  *         self.read_handle(f)
  *         fclose(f)             # <<<<<<<<<<<<<<
@@ -10259,7 +10259,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_22read_binary(struct __pyx_o
  */
   fclose(__pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":94
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":94
  * 
  * 
  *     def read_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -10274,7 +10274,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_22read_binary(struct __pyx_o
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":100
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":100
  *         fclose(f)
  * 
  *     cdef void read_handle(self, FILE* f):             # <<<<<<<<<<<<<<
@@ -10300,7 +10300,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("read_handle", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":105
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":105
  *         cdef char* word
  * 
  *         self.data.read_handle(f)             # <<<<<<<<<<<<<<
@@ -10309,7 +10309,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->data->__pyx_vtab)->read_handle(__pyx_v_self->data, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":106
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":106
  * 
  *         self.data.read_handle(f)
  *         self.sent_index.read_handle(f)             # <<<<<<<<<<<<<<
@@ -10318,7 +10318,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->sent_index->__pyx_vtab)->read_handle(__pyx_v_self->sent_index, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":107
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":107
  *         self.data.read_handle(f)
  *         self.sent_index.read_handle(f)
  *         self.sent_id.read_handle(f)             # <<<<<<<<<<<<<<
@@ -10327,7 +10327,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->sent_id->__pyx_vtab)->read_handle(__pyx_v_self->sent_id, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":108
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":108
  *         self.sent_index.read_handle(f)
  *         self.sent_id.read_handle(f)
  *         fread(&(num_words), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -10336,7 +10336,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
  */
   fread((&__pyx_v_num_words), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":109
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":109
  *         self.sent_id.read_handle(f)
  *         fread(&(num_words), sizeof(int), 1, f)
  *         for i in range(num_words):             # <<<<<<<<<<<<<<
@@ -10347,7 +10347,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_v_i = __pyx_t_2;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":110
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":110
  *         fread(&(num_words), sizeof(int), 1, f)
  *         for i in range(num_words):
  *             fread(&(word_len), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -10356,7 +10356,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
  */
     fread((&__pyx_v_word_len), (sizeof(int)), 1, __pyx_v_f);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":111
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":111
  *         for i in range(num_words):
  *             fread(&(word_len), sizeof(int), 1, f)
  *             word = <char*> malloc (word_len * sizeof(char))             # <<<<<<<<<<<<<<
@@ -10365,7 +10365,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
  */
     __pyx_v_word = ((char *)malloc((__pyx_v_word_len * (sizeof(char)))));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":112
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":112
  *             fread(&(word_len), sizeof(int), 1, f)
  *             word = <char*> malloc (word_len * sizeof(char))
  *             fread(word, sizeof(char), word_len, f)             # <<<<<<<<<<<<<<
@@ -10374,7 +10374,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
  */
     fread(__pyx_v_word, (sizeof(char)), __pyx_v_word_len, __pyx_v_f);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":113
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":113
  *             word = <char*> malloc (word_len * sizeof(char))
  *             fread(word, sizeof(char), word_len, f)
  *             self.word2id[word] = len(self.id2word)             # <<<<<<<<<<<<<<
@@ -10393,7 +10393,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":114
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":114
  *             fread(word, sizeof(char), word_len, f)
  *             self.word2id[word] = len(self.id2word)
  *             self.id2word.append(word)             # <<<<<<<<<<<<<<
@@ -10405,7 +10405,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
     __pyx_t_6 = __Pyx_PyObject_Append(__pyx_v_self->id2word, __pyx_t_3); if (unlikely(__pyx_t_6 == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":115
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":115
  *             self.word2id[word] = len(self.id2word)
  *             self.id2word.append(word)
  *             free(word)             # <<<<<<<<<<<<<<
@@ -10415,7 +10415,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
     free(__pyx_v_word);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":116
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":116
  *             self.id2word.append(word)
  *             free(word)
  *         if len(self.sent_id) == 0:             # <<<<<<<<<<<<<<
@@ -10429,7 +10429,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
   __pyx_t_7 = ((__pyx_t_4 == 0) != 0);
   if (__pyx_t_7) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":117
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":117
  *             free(word)
  *         if len(self.sent_id) == 0:
  *             self.use_sent_id = False             # <<<<<<<<<<<<<<
@@ -10441,7 +10441,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":119
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":119
  *             self.use_sent_id = False
  *         else:
  *             self.use_sent_id = True             # <<<<<<<<<<<<<<
@@ -10452,7 +10452,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
   }
   __pyx_L5:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":100
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":100
  *         fclose(f)
  * 
  *     cdef void read_handle(self, FILE* f):             # <<<<<<<<<<<<<<
@@ -10470,7 +10470,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_read_handle(struct __pyx_obj_4cdec
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":121
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":121
  *             self.use_sent_id = True
  * 
  *     cdef void write_handle(self, FILE* f):             # <<<<<<<<<<<<<<
@@ -10494,7 +10494,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_write_handle(struct __pyx_obj_4cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("write_handle", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":125
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":125
  *         cdef int num_words
  * 
  *         self.data.write_handle(f)             # <<<<<<<<<<<<<<
@@ -10503,7 +10503,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_write_handle(struct __pyx_obj_4cde
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->data->__pyx_vtab)->write_handle(__pyx_v_self->data, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":126
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":126
  * 
  *         self.data.write_handle(f)
  *         self.sent_index.write_handle(f)             # <<<<<<<<<<<<<<
@@ -10512,7 +10512,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_write_handle(struct __pyx_obj_4cde
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->sent_index->__pyx_vtab)->write_handle(__pyx_v_self->sent_index, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":127
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":127
  *         self.data.write_handle(f)
  *         self.sent_index.write_handle(f)
  *         self.sent_id.write_handle(f)             # <<<<<<<<<<<<<<
@@ -10521,7 +10521,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_write_handle(struct __pyx_obj_4cde
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->sent_id->__pyx_vtab)->write_handle(__pyx_v_self->sent_id, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":128
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":128
  *         self.sent_index.write_handle(f)
  *         self.sent_id.write_handle(f)
  *         num_words = len(self.id2word) - 2             # <<<<<<<<<<<<<<
@@ -10534,7 +10534,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_write_handle(struct __pyx_obj_4cde
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_v_num_words = (__pyx_t_2 - 2);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":129
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":129
  *         self.sent_id.write_handle(f)
  *         num_words = len(self.id2word) - 2
  *         fwrite(&(num_words), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -10543,7 +10543,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_write_handle(struct __pyx_obj_4cde
  */
   fwrite((&__pyx_v_num_words), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":130
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":130
  *         num_words = len(self.id2word) - 2
  *         fwrite(&(num_words), sizeof(int), 1, f)
  *         for word in self.id2word[2:]:             # <<<<<<<<<<<<<<
@@ -10591,7 +10591,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_write_handle(struct __pyx_obj_4cde
     __Pyx_XDECREF_SET(__pyx_v_word, __pyx_t_1);
     __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":131
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":131
  *         fwrite(&(num_words), sizeof(int), 1, f)
  *         for word in self.id2word[2:]:
  *             word_len = len(word) + 1             # <<<<<<<<<<<<<<
@@ -10601,7 +10601,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_write_handle(struct __pyx_obj_4cde
     __pyx_t_5 = PyObject_Length(__pyx_v_word); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[3]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __pyx_v_word_len = (__pyx_t_5 + 1);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":132
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":132
  *         for word in self.id2word[2:]:
  *             word_len = len(word) + 1
  *             fwrite(&(word_len), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -10610,7 +10610,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_write_handle(struct __pyx_obj_4cde
  */
     fwrite((&__pyx_v_word_len), (sizeof(int)), 1, __pyx_v_f);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":133
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":133
  *             word_len = len(word) + 1
  *             fwrite(&(word_len), sizeof(int), 1, f)
  *             fwrite(<char *>word, sizeof(char), word_len, f)             # <<<<<<<<<<<<<<
@@ -10622,7 +10622,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_write_handle(struct __pyx_obj_4cde
   }
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":121
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":121
  *             self.use_sent_id = True
  * 
  *     cdef void write_handle(self, FILE* f):             # <<<<<<<<<<<<<<
@@ -10641,7 +10641,7 @@ static void __pyx_f_4cdec_2sa_3_sa_9DataArray_write_handle(struct __pyx_obj_4cde
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":135
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":135
  *             fwrite(<char *>word, sizeof(char), word_len, f)
  * 
  *     def write_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -10681,7 +10681,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_24write_binary(struct __pyx_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("write_binary", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":137
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":137
  *     def write_binary(self, char* filename):
  *         cdef FILE* f
  *         f = fopen(filename, "w")             # <<<<<<<<<<<<<<
@@ -10690,7 +10690,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_24write_binary(struct __pyx_
  */
   __pyx_v_f = fopen(__pyx_v_filename, __pyx_k_w);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":138
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":138
  *         cdef FILE* f
  *         f = fopen(filename, "w")
  *         self.write_handle(f)             # <<<<<<<<<<<<<<
@@ -10699,7 +10699,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_24write_binary(struct __pyx_
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_DataArray *)__pyx_v_self->__pyx_vtab)->write_handle(__pyx_v_self, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":139
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":139
  *         f = fopen(filename, "w")
  *         self.write_handle(f)
  *         fclose(f)             # <<<<<<<<<<<<<<
@@ -10708,7 +10708,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_24write_binary(struct __pyx_
  */
   fclose(__pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":135
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":135
  *             fwrite(<char *>word, sizeof(char), word_len, f)
  * 
  *     def write_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -10723,7 +10723,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_24write_binary(struct __pyx_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":141
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":141
  *         fclose(f)
  * 
  *     def write_enhanced_handle(self, f):             # <<<<<<<<<<<<<<
@@ -10760,7 +10760,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_26write_enhanced_handle(stru
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("write_enhanced_handle", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":142
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":142
  * 
  *     def write_enhanced_handle(self, f):
  *         for i in self.data:             # <<<<<<<<<<<<<<
@@ -10805,7 +10805,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_26write_enhanced_handle(stru
     __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":143
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":143
  *     def write_enhanced_handle(self, f):
  *         for i in self.data:
  *             f.write("%d " %i)             # <<<<<<<<<<<<<<
@@ -10829,7 +10829,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_26write_enhanced_handle(stru
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":144
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":144
  *         for i in self.data:
  *             f.write("%d " %i)
  *         f.write("\n")             # <<<<<<<<<<<<<<
@@ -10843,7 +10843,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_26write_enhanced_handle(stru
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":145
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":145
  *             f.write("%d " %i)
  *         f.write("\n")
  *         for i in self.sent_index:             # <<<<<<<<<<<<<<
@@ -10888,7 +10888,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_26write_enhanced_handle(stru
     __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_1);
     __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":146
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":146
  *         f.write("\n")
  *         for i in self.sent_index:
  *             f.write("%d " %i)             # <<<<<<<<<<<<<<
@@ -10912,7 +10912,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_26write_enhanced_handle(stru
   }
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":147
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":147
  *         for i in self.sent_index:
  *             f.write("%d " %i)
  *         f.write("\n")             # <<<<<<<<<<<<<<
@@ -10926,7 +10926,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_26write_enhanced_handle(stru
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":148
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":148
  *             f.write("%d " %i)
  *         f.write("\n")
  *         for i in self.sent_id:             # <<<<<<<<<<<<<<
@@ -10971,7 +10971,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_26write_enhanced_handle(stru
     __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_5);
     __pyx_t_5 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":149
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":149
  *         f.write("\n")
  *         for i in self.sent_id:
  *             f.write("%d " %i)             # <<<<<<<<<<<<<<
@@ -10995,7 +10995,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_26write_enhanced_handle(stru
   }
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":150
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":150
  *         for i in self.sent_id:
  *             f.write("%d " %i)
  *         f.write("\n")             # <<<<<<<<<<<<<<
@@ -11009,7 +11009,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_26write_enhanced_handle(stru
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":151
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":151
  *             f.write("%d " %i)
  *         f.write("\n")
  *         for word in self.id2word:             # <<<<<<<<<<<<<<
@@ -11054,7 +11054,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_26write_enhanced_handle(stru
     __Pyx_XDECREF_SET(__pyx_v_word, __pyx_t_6);
     __pyx_t_6 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":152
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":152
  *         f.write("\n")
  *         for word in self.id2word:
  *             f.write("%s %d " % (word, self.word2id[word]))             # <<<<<<<<<<<<<<
@@ -11089,7 +11089,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_26write_enhanced_handle(stru
   }
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":153
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":153
  *         for word in self.id2word:
  *             f.write("%s %d " % (word, self.word2id[word]))
  *         f.write("\n")             # <<<<<<<<<<<<<<
@@ -11103,7 +11103,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_26write_enhanced_handle(stru
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":141
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":141
  *         fclose(f)
  * 
  *     def write_enhanced_handle(self, f):             # <<<<<<<<<<<<<<
@@ -11129,7 +11129,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_26write_enhanced_handle(stru
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":155
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":155
  *         f.write("\n")
  * 
  *     def write_enhanced(self, char* filename):             # <<<<<<<<<<<<<<
@@ -11183,7 +11183,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_28write_enhanced(struct __py
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("write_enhanced", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":156
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":156
  * 
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -11222,7 +11222,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_28write_enhanced(struct __py
           __pyx_v_f = __pyx_t_4;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":157
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":157
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:
  *             self.write_enhanced_handle(self, f)             # <<<<<<<<<<<<<<
@@ -11252,7 +11252,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_28write_enhanced(struct __py
         __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
         __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":156
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":156
  * 
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -11322,7 +11322,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_28write_enhanced(struct __py
     __pyx_L19:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":155
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":155
  *         f.write("\n")
  * 
  *     def write_enhanced(self, char* filename):             # <<<<<<<<<<<<<<
@@ -11347,7 +11347,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9DataArray_28write_enhanced(struct __py
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":10
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":10
  * 
  * cdef class DataArray:
  *     cdef public word2id             # <<<<<<<<<<<<<<
@@ -11442,7 +11442,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray_7word2id_4__del__(struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":11
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":11
  * cdef class DataArray:
  *     cdef public word2id
  *     cdef public id2word             # <<<<<<<<<<<<<<
@@ -11537,7 +11537,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray_7id2word_4__del__(struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":12
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":12
  *     cdef public word2id
  *     cdef public id2word
  *     cdef public IntList data             # <<<<<<<<<<<<<<
@@ -11645,7 +11645,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray_4data_4__del__(struct __pyx_obj_4c
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":13
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":13
  *     cdef public id2word
  *     cdef public IntList data
  *     cdef public IntList sent_id             # <<<<<<<<<<<<<<
@@ -11753,7 +11753,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9DataArray_7sent_id_4__del__(struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":14
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":14
  *     cdef public IntList data
  *     cdef public IntList sent_id
  *     cdef public IntList sent_index             # <<<<<<<<<<<<<<
@@ -11866,7 +11866,7 @@ static int __pyx_f_4cdec_2sa_3_sa_9Alignment_link(CYTHON_UNUSED struct __pyx_obj
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("link", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":16
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":16
  *     cdef int link(self, int i, int j):
  *         """Integerizes an alignment link pair"""
  *         return i * ALIGNMENT_CODE + j             # <<<<<<<<<<<<<<
@@ -11876,7 +11876,7 @@ static int __pyx_f_4cdec_2sa_3_sa_9Alignment_link(CYTHON_UNUSED struct __pyx_obj
   __pyx_r = ((__pyx_v_i * __pyx_v_4cdec_2sa_3_sa_ALIGNMENT_CODE) + __pyx_v_j);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":14
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":14
  *     cdef IntList sent_index
  * 
  *     cdef int link(self, int i, int j):             # <<<<<<<<<<<<<<
@@ -11890,7 +11890,7 @@ static int __pyx_f_4cdec_2sa_3_sa_9Alignment_link(CYTHON_UNUSED struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":18
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":18
  *         return i * ALIGNMENT_CODE + j
  * 
  *     def unlink(self, link):             # <<<<<<<<<<<<<<
@@ -11923,7 +11923,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_unlink(CYTHON_UNUSED struct
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("unlink", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":20
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":20
  *     def unlink(self, link):
  *         """De-integerizes an alignment link pair"""
  *         return (link / ALIGNMENT_CODE, link % ALIGNMENT_CODE)             # <<<<<<<<<<<<<<
@@ -11953,7 +11953,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_unlink(CYTHON_UNUSED struct
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":18
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":18
  *         return i * ALIGNMENT_CODE + j
  * 
  *     def unlink(self, link):             # <<<<<<<<<<<<<<
@@ -11974,7 +11974,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_unlink(CYTHON_UNUSED struct
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":22
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":22
  *         return (link / ALIGNMENT_CODE, link % ALIGNMENT_CODE)
  * 
  *     cdef _unlink(self, int link, int* f, int* e):             # <<<<<<<<<<<<<<
@@ -11990,7 +11990,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_9Alignment__unlink(CYTHON_UNUSED struct
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_unlink", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":23
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":23
  * 
  *     cdef _unlink(self, int link, int* f, int* e):
  *         f[0] = link / ALIGNMENT_CODE             # <<<<<<<<<<<<<<
@@ -12019,7 +12019,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_9Alignment__unlink(CYTHON_UNUSED struct
   }
   (__pyx_v_f[0]) = __Pyx_div_int(__pyx_v_link, __pyx_v_4cdec_2sa_3_sa_ALIGNMENT_CODE);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":24
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":24
  *     cdef _unlink(self, int link, int* f, int* e):
  *         f[0] = link / ALIGNMENT_CODE
  *         e[0] = link % ALIGNMENT_CODE             # <<<<<<<<<<<<<<
@@ -12038,7 +12038,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_9Alignment__unlink(CYTHON_UNUSED struct
   }
   (__pyx_v_e[0]) = __Pyx_mod_int(__pyx_v_link, __pyx_v_4cdec_2sa_3_sa_ALIGNMENT_CODE);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":22
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":22
  *         return (link / ALIGNMENT_CODE, link % ALIGNMENT_CODE)
  * 
  *     cdef _unlink(self, int link, int* f, int* e):             # <<<<<<<<<<<<<<
@@ -12058,7 +12058,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_9Alignment__unlink(CYTHON_UNUSED struct
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":26
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":26
  *         e[0] = link % ALIGNMENT_CODE
  * 
  *     def get_sent_links(self, int sent_id):             # <<<<<<<<<<<<<<
@@ -12104,7 +12104,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_2get_sent_links(struct __pyx
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_sent_links", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":30
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":30
  *         cdef int* arr
  *         cdef int arr_len
  *         sent_links = IntList()             # <<<<<<<<<<<<<<
@@ -12116,7 +12116,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_2get_sent_links(struct __pyx
   __pyx_v_sent_links = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":31
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":31
  *         cdef int arr_len
  *         sent_links = IntList()
  *         arr = self._get_sent_links(sent_id, &arr_len)             # <<<<<<<<<<<<<<
@@ -12125,7 +12125,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_2get_sent_links(struct __pyx
  */
   __pyx_v_arr = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alignment *)__pyx_v_self->__pyx_vtab)->_get_sent_links(__pyx_v_self, __pyx_v_sent_id, (&__pyx_v_arr_len));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":32
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":32
  *         sent_links = IntList()
  *         arr = self._get_sent_links(sent_id, &arr_len)
  *         sent_links._extend_arr(arr, arr_len*2)             # <<<<<<<<<<<<<<
@@ -12134,7 +12134,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_2get_sent_links(struct __pyx
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_sent_links->__pyx_vtab)->_extend_arr(__pyx_v_sent_links, __pyx_v_arr, (__pyx_v_arr_len * 2));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":33
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":33
  *         arr = self._get_sent_links(sent_id, &arr_len)
  *         sent_links._extend_arr(arr, arr_len*2)
  *         free(arr)             # <<<<<<<<<<<<<<
@@ -12143,7 +12143,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_2get_sent_links(struct __pyx
  */
   free(__pyx_v_arr);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":34
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":34
  *         sent_links._extend_arr(arr, arr_len*2)
  *         free(arr)
  *         return sent_links             # <<<<<<<<<<<<<<
@@ -12155,7 +12155,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_2get_sent_links(struct __pyx
   __pyx_r = ((PyObject *)__pyx_v_sent_links);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":26
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":26
  *         e[0] = link % ALIGNMENT_CODE
  * 
  *     def get_sent_links(self, int sent_id):             # <<<<<<<<<<<<<<
@@ -12175,7 +12175,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_2get_sent_links(struct __pyx
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":36
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":36
  *         return sent_links
  * 
  *     cdef int* _get_sent_links(self, int sent_id, int* num_links):             # <<<<<<<<<<<<<<
@@ -12197,7 +12197,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_9Alignment__get_sent_links(struct __pyx_obj_4
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_get_sent_links", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":39
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":39
  *         cdef int* sent_links
  *         cdef int i, start, end
  *         start = self.sent_index.arr[sent_id]             # <<<<<<<<<<<<<<
@@ -12206,7 +12206,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_9Alignment__get_sent_links(struct __pyx_obj_4
  */
   __pyx_v_start = (__pyx_v_self->sent_index->arr[__pyx_v_sent_id]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":40
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":40
  *         cdef int i, start, end
  *         start = self.sent_index.arr[sent_id]
  *         end = self.sent_index.arr[sent_id+1]             # <<<<<<<<<<<<<<
@@ -12215,7 +12215,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_9Alignment__get_sent_links(struct __pyx_obj_4
  */
   __pyx_v_end = (__pyx_v_self->sent_index->arr[(__pyx_v_sent_id + 1)]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":41
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":41
  *         start = self.sent_index.arr[sent_id]
  *         end = self.sent_index.arr[sent_id+1]
  *         num_links[0] = end - start             # <<<<<<<<<<<<<<
@@ -12224,7 +12224,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_9Alignment__get_sent_links(struct __pyx_obj_4
  */
   (__pyx_v_num_links[0]) = (__pyx_v_end - __pyx_v_start);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":42
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":42
  *         end = self.sent_index.arr[sent_id+1]
  *         num_links[0] = end - start
  *         sent_links = <int*> malloc(2*num_links[0]*sizeof(int))             # <<<<<<<<<<<<<<
@@ -12233,7 +12233,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_9Alignment__get_sent_links(struct __pyx_obj_4
  */
   __pyx_v_sent_links = ((int *)malloc(((2 * (__pyx_v_num_links[0])) * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":43
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":43
  *         num_links[0] = end - start
  *         sent_links = <int*> malloc(2*num_links[0]*sizeof(int))
  *         for i from 0 <= i < num_links[0]:             # <<<<<<<<<<<<<<
@@ -12243,7 +12243,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_9Alignment__get_sent_links(struct __pyx_obj_4
   __pyx_t_1 = (__pyx_v_num_links[0]);
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_1; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":44
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":44
  *         sent_links = <int*> malloc(2*num_links[0]*sizeof(int))
  *         for i from 0 <= i < num_links[0]:
  *             self._unlink(self.links.arr[start + i], sent_links + (2*i), sent_links + (2*i) + 1)             # <<<<<<<<<<<<<<
@@ -12255,7 +12255,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_9Alignment__get_sent_links(struct __pyx_obj_4
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":45
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":45
  *         for i from 0 <= i < num_links[0]:
  *             self._unlink(self.links.arr[start + i], sent_links + (2*i), sent_links + (2*i) + 1)
  *         return sent_links             # <<<<<<<<<<<<<<
@@ -12265,7 +12265,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_9Alignment__get_sent_links(struct __pyx_obj_4
   __pyx_r = __pyx_v_sent_links;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":36
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":36
  *         return sent_links
  * 
  *     cdef int* _get_sent_links(self, int sent_id, int* num_links):             # <<<<<<<<<<<<<<
@@ -12283,7 +12283,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_9Alignment__get_sent_links(struct __pyx_obj_4
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":47
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":47
  *         return sent_links
  * 
  *     def __cinit__(self, from_binary=None, from_text=None):             # <<<<<<<<<<<<<<
@@ -12370,7 +12370,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9Alignment_4__cinit__(struct __pyx_obj_4cdec_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":48
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":48
  * 
  *     def __cinit__(self, from_binary=None, from_text=None):
  *         self.links = IntList(1000,1000)             # <<<<<<<<<<<<<<
@@ -12385,7 +12385,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9Alignment_4__cinit__(struct __pyx_obj_4cdec_
   __pyx_v_self->links = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":49
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":49
  *     def __cinit__(self, from_binary=None, from_text=None):
  *         self.links = IntList(1000,1000)
  *         self.sent_index = IntList(1000,1000)             # <<<<<<<<<<<<<<
@@ -12400,7 +12400,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9Alignment_4__cinit__(struct __pyx_obj_4cdec_
   __pyx_v_self->sent_index = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":50
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":50
  *         self.links = IntList(1000,1000)
  *         self.sent_index = IntList(1000,1000)
  *         if from_binary:             # <<<<<<<<<<<<<<
@@ -12410,7 +12410,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9Alignment_4__cinit__(struct __pyx_obj_4cdec_
   __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_from_binary); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":51
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":51
  *         self.sent_index = IntList(1000,1000)
  *         if from_binary:
  *             self.read_binary(from_binary)             # <<<<<<<<<<<<<<
@@ -12432,7 +12432,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9Alignment_4__cinit__(struct __pyx_obj_4cdec_
     goto __pyx_L3;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":52
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":52
  *         if from_binary:
  *             self.read_binary(from_binary)
  *         elif from_text:             # <<<<<<<<<<<<<<
@@ -12442,7 +12442,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9Alignment_4__cinit__(struct __pyx_obj_4cdec_
   __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_from_text); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":53
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":53
  *             self.read_binary(from_binary)
  *         elif from_text:
  *             self.read_text(from_text)             # <<<<<<<<<<<<<<
@@ -12465,7 +12465,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9Alignment_4__cinit__(struct __pyx_obj_4cdec_
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":47
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":47
  *         return sent_links
  * 
  *     def __cinit__(self, from_binary=None, from_text=None):             # <<<<<<<<<<<<<<
@@ -12487,7 +12487,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9Alignment_4__cinit__(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":55
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":55
  *             self.read_text(from_text)
  * 
  *     def read_text(self, char* filename):             # <<<<<<<<<<<<<<
@@ -12556,7 +12556,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_6read_text(struct __pyx_obj_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("read_text", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":56
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":56
  * 
  *     def read_text(self, char* filename):
  *         with gzip_or_text(filename) as f:             # <<<<<<<<<<<<<<
@@ -12596,7 +12596,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_6read_text(struct __pyx_obj_
           __pyx_v_f = __pyx_t_1;
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":57
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":57
  *     def read_text(self, char* filename):
  *         with gzip_or_text(filename) as f:
  *             for line in f:             # <<<<<<<<<<<<<<
@@ -12641,7 +12641,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_6read_text(struct __pyx_obj_
             __Pyx_XDECREF_SET(__pyx_v_line, __pyx_t_2);
             __pyx_t_2 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":58
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":58
  *         with gzip_or_text(filename) as f:
  *             for line in f:
  *                 self.sent_index.append(len(self.links))             # <<<<<<<<<<<<<<
@@ -12657,7 +12657,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_6read_text(struct __pyx_obj_
             __pyx_t_11 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_self->sent_index), __pyx_t_2); if (unlikely(__pyx_t_11 == -1)) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":59
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":59
  *             for line in f:
  *                 self.sent_index.append(len(self.links))
  *                 pairs = line.split()             # <<<<<<<<<<<<<<
@@ -12672,7 +12672,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_6read_text(struct __pyx_obj_
             __Pyx_XDECREF_SET(__pyx_v_pairs, __pyx_t_3);
             __pyx_t_3 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":60
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":60
  *                 self.sent_index.append(len(self.links))
  *                 pairs = line.split()
  *                 for pair in pairs:             # <<<<<<<<<<<<<<
@@ -12717,7 +12717,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_6read_text(struct __pyx_obj_
               __Pyx_XDECREF_SET(__pyx_v_pair, __pyx_t_2);
               __pyx_t_2 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":61
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":61
  *                 pairs = line.split()
  *                 for pair in pairs:
  *                     (i, j) = map(int, pair.split('-'))             # <<<<<<<<<<<<<<
@@ -12795,7 +12795,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_6read_text(struct __pyx_obj_
               __Pyx_XDECREF_SET(__pyx_v_j, __pyx_t_14);
               __pyx_t_14 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":62
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":62
  *                 for pair in pairs:
  *                     (i, j) = map(int, pair.split('-'))
  *                     self.links.append(self.link(i, j))             # <<<<<<<<<<<<<<
@@ -12813,7 +12813,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_6read_text(struct __pyx_obj_
           }
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":63
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":63
  *                     (i, j) = map(int, pair.split('-'))
  *                     self.links.append(self.link(i, j))
  *             self.sent_index.append(len(self.links))             # <<<<<<<<<<<<<<
@@ -12841,7 +12841,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_6read_text(struct __pyx_obj_
         __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
         __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":56
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":56
  * 
  *     def read_text(self, char* filename):
  *         with gzip_or_text(filename) as f:             # <<<<<<<<<<<<<<
@@ -12912,7 +12912,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_6read_text(struct __pyx_obj_
     __pyx_L25:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":55
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":55
  *             self.read_text(from_text)
  * 
  *     def read_text(self, char* filename):             # <<<<<<<<<<<<<<
@@ -12944,7 +12944,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_6read_text(struct __pyx_obj_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":65
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":65
  *             self.sent_index.append(len(self.links))
  * 
  *     def read_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -12984,7 +12984,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_8read_binary(struct __pyx_ob
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("read_binary", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":67
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":67
  *     def read_binary(self, char* filename):
  *         cdef FILE* f
  *         f = fopen(filename, "r")             # <<<<<<<<<<<<<<
@@ -12993,7 +12993,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_8read_binary(struct __pyx_ob
  */
   __pyx_v_f = fopen(__pyx_v_filename, __pyx_k_r);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":68
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":68
  *         cdef FILE* f
  *         f = fopen(filename, "r")
  *         self.links.read_handle(f)             # <<<<<<<<<<<<<<
@@ -13002,7 +13002,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_8read_binary(struct __pyx_ob
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->links->__pyx_vtab)->read_handle(__pyx_v_self->links, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":69
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":69
  *         f = fopen(filename, "r")
  *         self.links.read_handle(f)
  *         self.sent_index.read_handle(f)             # <<<<<<<<<<<<<<
@@ -13011,7 +13011,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_8read_binary(struct __pyx_ob
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->sent_index->__pyx_vtab)->read_handle(__pyx_v_self->sent_index, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":70
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":70
  *         self.links.read_handle(f)
  *         self.sent_index.read_handle(f)
  *         fclose(f)             # <<<<<<<<<<<<<<
@@ -13020,7 +13020,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_8read_binary(struct __pyx_ob
  */
   fclose(__pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":65
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":65
  *             self.sent_index.append(len(self.links))
  * 
  *     def read_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -13035,7 +13035,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_8read_binary(struct __pyx_ob
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":72
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":72
  *         fclose(f)
  * 
  *     def write_text(self, char* filename):             # <<<<<<<<<<<<<<
@@ -13096,7 +13096,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_10write_text(struct __pyx_ob
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("write_text", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":73
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":73
  * 
  *     def write_text(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -13136,7 +13136,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_10write_text(struct __pyx_ob
           __pyx_v_f = __pyx_t_4;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":74
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":74
  *     def write_text(self, char* filename):
  *         with open(filename, "w") as f:
  *             sent_num = 0             # <<<<<<<<<<<<<<
@@ -13146,7 +13146,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_10write_text(struct __pyx_ob
           __Pyx_INCREF(__pyx_int_0);
           __pyx_v_sent_num = __pyx_int_0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":75
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":75
  *         with open(filename, "w") as f:
  *             sent_num = 0
  *             for i, link in enumerate(self.links):             # <<<<<<<<<<<<<<
@@ -13200,7 +13200,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_10write_text(struct __pyx_ob
             __pyx_t_4 = __pyx_t_2;
             __pyx_t_2 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":76
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":76
  *             sent_num = 0
  *             for i, link in enumerate(self.links):
  *                 while i >= self.sent_index[sent_num]:             # <<<<<<<<<<<<<<
@@ -13216,7 +13216,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_10write_text(struct __pyx_ob
               __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
               if (!__pyx_t_11) break;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":77
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":77
  *             for i, link in enumerate(self.links):
  *                 while i >= self.sent_index[sent_num]:
  *                     f.write("\n")             # <<<<<<<<<<<<<<
@@ -13230,7 +13230,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_10write_text(struct __pyx_ob
               __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
               __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":78
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":78
  *                 while i >= self.sent_index[sent_num]:
  *                     f.write("\n")
  *                     sent_num = sent_num + 1             # <<<<<<<<<<<<<<
@@ -13243,7 +13243,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_10write_text(struct __pyx_ob
               __pyx_t_2 = 0;
             }
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":79
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":79
  *                     f.write("\n")
  *                     sent_num = sent_num + 1
  *                 f.write("%d-%d " % self.unlink(link))             # <<<<<<<<<<<<<<
@@ -13280,7 +13280,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_10write_text(struct __pyx_ob
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":80
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":80
  *                     sent_num = sent_num + 1
  *                 f.write("%d-%d " % self.unlink(link))
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -13306,7 +13306,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_10write_text(struct __pyx_ob
         __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
         __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":73
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":73
  * 
  *     def write_text(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -13377,7 +13377,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_10write_text(struct __pyx_ob
     __pyx_L23:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":72
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":72
  *         fclose(f)
  * 
  *     def write_text(self, char* filename):             # <<<<<<<<<<<<<<
@@ -13407,7 +13407,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_10write_text(struct __pyx_ob
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":82
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":82
  *             f.write("\n")
  * 
  *     def write_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -13447,7 +13447,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_12write_binary(struct __pyx_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("write_binary", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":84
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":84
  *     def write_binary(self, char* filename):
  *         cdef FILE* f
  *         f = fopen(filename, "w")             # <<<<<<<<<<<<<<
@@ -13456,7 +13456,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_12write_binary(struct __pyx_
  */
   __pyx_v_f = fopen(__pyx_v_filename, __pyx_k_w);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":85
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":85
  *         cdef FILE* f
  *         f = fopen(filename, "w")
  *         self.links.write_handle(f)             # <<<<<<<<<<<<<<
@@ -13465,7 +13465,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_12write_binary(struct __pyx_
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->links->__pyx_vtab)->write_handle(__pyx_v_self->links, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":86
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":86
  *         f = fopen(filename, "w")
  *         self.links.write_handle(f)
  *         self.sent_index.write_handle(f)             # <<<<<<<<<<<<<<
@@ -13474,7 +13474,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_12write_binary(struct __pyx_
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->sent_index->__pyx_vtab)->write_handle(__pyx_v_self->sent_index, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":87
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":87
  *         self.links.write_handle(f)
  *         self.sent_index.write_handle(f)
  *         fclose(f)             # <<<<<<<<<<<<<<
@@ -13483,7 +13483,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_12write_binary(struct __pyx_
  */
   fclose(__pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":82
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":82
  *             f.write("\n")
  * 
  *     def write_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -13498,7 +13498,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_12write_binary(struct __pyx_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":89
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":89
  *         fclose(f)
  * 
  *     def write_enhanced(self, char* filename):             # <<<<<<<<<<<<<<
@@ -13556,7 +13556,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_14write_enhanced(struct __py
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("write_enhanced", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":90
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":90
  * 
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -13596,7 +13596,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_14write_enhanced(struct __py
           __pyx_v_f = __pyx_t_4;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":91
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":91
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:
  *             for link in self.links:             # <<<<<<<<<<<<<<
@@ -13641,7 +13641,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_14write_enhanced(struct __py
             __Pyx_XDECREF_SET(__pyx_v_link, __pyx_t_1);
             __pyx_t_1 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":92
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":92
  *         with open(filename, "w") as f:
  *             for link in self.links:
  *                 f.write("%d " % link)             # <<<<<<<<<<<<<<
@@ -13665,7 +13665,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_14write_enhanced(struct __py
           }
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":93
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":93
  *             for link in self.links:
  *                 f.write("%d " % link)
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -13679,7 +13679,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_14write_enhanced(struct __py
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":94
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":94
  *                 f.write("%d " % link)
  *             f.write("\n")
  *             for i in self.sent_index:             # <<<<<<<<<<<<<<
@@ -13724,7 +13724,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_14write_enhanced(struct __py
             __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_4);
             __pyx_t_4 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":95
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":95
  *             f.write("\n")
  *             for i in self.sent_index:
  *                 f.write("%d " % i)             # <<<<<<<<<<<<<<
@@ -13748,7 +13748,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_14write_enhanced(struct __py
           }
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":96
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":96
  *             for i in self.sent_index:
  *                 f.write("%d " % i)
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -13772,7 +13772,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_14write_enhanced(struct __py
         __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
         __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":90
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":90
  * 
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -13843,7 +13843,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_14write_enhanced(struct __py
     __pyx_L23:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":89
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":89
  *         fclose(f)
  * 
  *     def write_enhanced(self, char* filename):             # <<<<<<<<<<<<<<
@@ -13870,7 +13870,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_14write_enhanced(struct __py
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":98
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":98
  *             f.write("\n")
  * 
  *     def alignment(self, i):             # <<<<<<<<<<<<<<
@@ -13910,7 +13910,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_16alignment(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("alignment", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":101
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":101
  *         """Return all (e,f) pairs for sentence i"""
  *         cdef int j, start, end
  *         result = []             # <<<<<<<<<<<<<<
@@ -13922,7 +13922,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_16alignment(struct __pyx_obj
   __pyx_v_result = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":102
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":102
  *         cdef int j, start, end
  *         result = []
  *         start = self.sent_index.arr[i]             # <<<<<<<<<<<<<<
@@ -13932,7 +13932,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_16alignment(struct __pyx_obj
   __pyx_t_2 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_2 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[4]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_start = (__pyx_v_self->sent_index->arr[__pyx_t_2]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":103
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":103
  *         result = []
  *         start = self.sent_index.arr[i]
  *         end = self.sent_index.arr[i+1]             # <<<<<<<<<<<<<<
@@ -13945,7 +13945,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_16alignment(struct __pyx_obj
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_v_end = (__pyx_v_self->sent_index->arr[__pyx_t_2]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":104
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":104
  *         start = self.sent_index.arr[i]
  *         end = self.sent_index.arr[i+1]
  *         for j from start <= j < end:             # <<<<<<<<<<<<<<
@@ -13955,7 +13955,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_16alignment(struct __pyx_obj
   __pyx_t_3 = __pyx_v_end;
   for (__pyx_v_j = __pyx_v_start; __pyx_v_j < __pyx_t_3; __pyx_v_j++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":105
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":105
  *         end = self.sent_index.arr[i+1]
  *         for j from start <= j < end:
  *             result.append(self.unlink(self.links.arr[j]))             # <<<<<<<<<<<<<<
@@ -13978,7 +13978,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_16alignment(struct __pyx_obj
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":106
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":106
  *         for j from start <= j < end:
  *             result.append(self.unlink(self.links.arr[j]))
  *         return result             # <<<<<<<<<<<<<<
@@ -13988,7 +13988,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_16alignment(struct __pyx_obj
   __pyx_r = __pyx_v_result;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":98
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":98
  *             f.write("\n")
  * 
  *     def alignment(self, i):             # <<<<<<<<<<<<<<
@@ -14010,7 +14010,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_9Alignment_16alignment(struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":15
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":15
  *     int val
  * 
  * cdef _node* new_node(int key):             # <<<<<<<<<<<<<<
@@ -14024,7 +14024,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__node *__pyx_f_4cdec_2sa_3_sa_new_node(int
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("new_node", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":17
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":17
  * cdef _node* new_node(int key):
  *     cdef _node* n
  *     n = <_node*> malloc(sizeof(_node))             # <<<<<<<<<<<<<<
@@ -14033,7 +14033,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__node *__pyx_f_4cdec_2sa_3_sa_new_node(int
  */
   __pyx_v_n = ((struct __pyx_t_4cdec_2sa_3_sa__node *)malloc((sizeof(struct __pyx_t_4cdec_2sa_3_sa__node))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":18
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":18
  *     cdef _node* n
  *     n = <_node*> malloc(sizeof(_node))
  *     n.smaller = NULL             # <<<<<<<<<<<<<<
@@ -14042,7 +14042,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__node *__pyx_f_4cdec_2sa_3_sa_new_node(int
  */
   __pyx_v_n->smaller = NULL;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":19
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":19
  *     n = <_node*> malloc(sizeof(_node))
  *     n.smaller = NULL
  *     n.bigger = NULL             # <<<<<<<<<<<<<<
@@ -14051,7 +14051,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__node *__pyx_f_4cdec_2sa_3_sa_new_node(int
  */
   __pyx_v_n->bigger = NULL;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":20
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":20
  *     n.smaller = NULL
  *     n.bigger = NULL
  *     n.key = key             # <<<<<<<<<<<<<<
@@ -14060,7 +14060,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__node *__pyx_f_4cdec_2sa_3_sa_new_node(int
  */
   __pyx_v_n->key = __pyx_v_key;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":21
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":21
  *     n.bigger = NULL
  *     n.key = key
  *     n.val = 0             # <<<<<<<<<<<<<<
@@ -14069,7 +14069,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__node *__pyx_f_4cdec_2sa_3_sa_new_node(int
  */
   __pyx_v_n->val = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":22
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":22
  *     n.key = key
  *     n.val = 0
  *     return n             # <<<<<<<<<<<<<<
@@ -14079,7 +14079,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__node *__pyx_f_4cdec_2sa_3_sa_new_node(int
   __pyx_r = __pyx_v_n;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":15
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":15
  *     int val
  * 
  * cdef _node* new_node(int key):             # <<<<<<<<<<<<<<
@@ -14093,7 +14093,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__node *__pyx_f_4cdec_2sa_3_sa_new_node(int
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":25
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":25
  * 
  * 
  * cdef del_node(_node* n):             # <<<<<<<<<<<<<<
@@ -14111,7 +14111,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_node(struct __pyx_t_4cdec_2sa_3_sa__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("del_node", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":26
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":26
  * 
  * cdef del_node(_node* n):
  *     if n.smaller != NULL:             # <<<<<<<<<<<<<<
@@ -14121,7 +14121,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_node(struct __pyx_t_4cdec_2sa_3_sa__
   __pyx_t_1 = ((__pyx_v_n->smaller != NULL) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":27
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":27
  * cdef del_node(_node* n):
  *     if n.smaller != NULL:
  *         del_node(n.smaller)             # <<<<<<<<<<<<<<
@@ -14135,7 +14135,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_node(struct __pyx_t_4cdec_2sa_3_sa__
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":28
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":28
  *     if n.smaller != NULL:
  *         del_node(n.smaller)
  *     if n.bigger != NULL:             # <<<<<<<<<<<<<<
@@ -14145,7 +14145,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_node(struct __pyx_t_4cdec_2sa_3_sa__
   __pyx_t_1 = ((__pyx_v_n->bigger != NULL) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":29
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":29
  *         del_node(n.smaller)
  *     if n.bigger != NULL:
  *         del_node(n.bigger)             # <<<<<<<<<<<<<<
@@ -14159,7 +14159,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_node(struct __pyx_t_4cdec_2sa_3_sa__
   }
   __pyx_L4:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":30
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":30
  *     if n.bigger != NULL:
  *         del_node(n.bigger)
  *     free(n)             # <<<<<<<<<<<<<<
@@ -14168,7 +14168,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_node(struct __pyx_t_4cdec_2sa_3_sa__
  */
   free(__pyx_v_n);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":25
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":25
  * 
  * 
  * cdef del_node(_node* n):             # <<<<<<<<<<<<<<
@@ -14189,7 +14189,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_node(struct __pyx_t_4cdec_2sa_3_sa__
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":32
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":32
  *     free(n)
  * 
  * cdef int* get_val(_node* n, int key):             # <<<<<<<<<<<<<<
@@ -14203,7 +14203,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_get_val(struct __pyx_t_4cdec_2sa_3_sa__node *
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("get_val", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":33
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":33
  * 
  * cdef int* get_val(_node* n, int key):
  *     if key == n.key:             # <<<<<<<<<<<<<<
@@ -14213,7 +14213,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_get_val(struct __pyx_t_4cdec_2sa_3_sa__node *
   __pyx_t_1 = ((__pyx_v_key == __pyx_v_n->key) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":34
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":34
  * cdef int* get_val(_node* n, int key):
  *     if key == n.key:
  *         return &n.val             # <<<<<<<<<<<<<<
@@ -14224,7 +14224,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_get_val(struct __pyx_t_4cdec_2sa_3_sa__node *
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":35
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":35
  *     if key == n.key:
  *         return &n.val
  *     elif key < n.key:             # <<<<<<<<<<<<<<
@@ -14234,7 +14234,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_get_val(struct __pyx_t_4cdec_2sa_3_sa__node *
   __pyx_t_1 = ((__pyx_v_key < __pyx_v_n->key) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":36
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":36
  *         return &n.val
  *     elif key < n.key:
  *         if n.smaller == NULL:             # <<<<<<<<<<<<<<
@@ -14244,7 +14244,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_get_val(struct __pyx_t_4cdec_2sa_3_sa__node *
     __pyx_t_1 = ((__pyx_v_n->smaller == NULL) != 0);
     if (__pyx_t_1) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":37
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":37
  *     elif key < n.key:
  *         if n.smaller == NULL:
  *             n.smaller = new_node(key)             # <<<<<<<<<<<<<<
@@ -14253,7 +14253,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_get_val(struct __pyx_t_4cdec_2sa_3_sa__node *
  */
       __pyx_v_n->smaller = __pyx_f_4cdec_2sa_3_sa_new_node(__pyx_v_key);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":38
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":38
  *         if n.smaller == NULL:
  *             n.smaller = new_node(key)
  *             return &(n.smaller.val)             # <<<<<<<<<<<<<<
@@ -14264,7 +14264,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_get_val(struct __pyx_t_4cdec_2sa_3_sa__node *
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":39
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":39
  *             n.smaller = new_node(key)
  *             return &(n.smaller.val)
  *         return get_val(n.smaller, key)             # <<<<<<<<<<<<<<
@@ -14276,7 +14276,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_get_val(struct __pyx_t_4cdec_2sa_3_sa__node *
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":41
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":41
  *         return get_val(n.smaller, key)
  *     else:
  *         if n.bigger == NULL:             # <<<<<<<<<<<<<<
@@ -14286,7 +14286,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_get_val(struct __pyx_t_4cdec_2sa_3_sa__node *
     __pyx_t_1 = ((__pyx_v_n->bigger == NULL) != 0);
     if (__pyx_t_1) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":42
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":42
  *     else:
  *         if n.bigger == NULL:
  *             n.bigger = new_node(key)             # <<<<<<<<<<<<<<
@@ -14295,7 +14295,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_get_val(struct __pyx_t_4cdec_2sa_3_sa__node *
  */
       __pyx_v_n->bigger = __pyx_f_4cdec_2sa_3_sa_new_node(__pyx_v_key);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":43
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":43
  *         if n.bigger == NULL:
  *             n.bigger = new_node(key)
  *             return &(n.bigger.val)             # <<<<<<<<<<<<<<
@@ -14306,7 +14306,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_get_val(struct __pyx_t_4cdec_2sa_3_sa__node *
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":44
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":44
  *             n.bigger = new_node(key)
  *             return &(n.bigger.val)
  *         return get_val(n.bigger, key)             # <<<<<<<<<<<<<<
@@ -14317,7 +14317,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_get_val(struct __pyx_t_4cdec_2sa_3_sa__node *
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":32
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":32
  *     free(n)
  * 
  * cdef int* get_val(_node* n, int key):             # <<<<<<<<<<<<<<
@@ -14331,7 +14331,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_get_val(struct __pyx_t_4cdec_2sa_3_sa__node *
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":54
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":54
  *     cdef id2eword, id2fword, eword2id, fword2id
  * 
  *     def __cinit__(self, from_text=None, from_data=False, from_binary=None,             # <<<<<<<<<<<<<<
@@ -14361,7 +14361,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_5BiLex_1__cinit__(PyObject *__pyx_v_self, PyO
     values[1] = ((PyObject *)Py_False);
     values[2] = ((PyObject *)Py_None);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":55
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":55
  * 
  *     def __cinit__(self, from_text=None, from_data=False, from_binary=None,
  *             earray=None, fsarray=None, alignment=None):             # <<<<<<<<<<<<<<
@@ -14449,7 +14449,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_5BiLex_1__cinit__(PyObject *__pyx_v_self, PyO
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(((struct __pyx_obj_4cdec_2sa_3_sa_BiLex *)__pyx_v_self), __pyx_v_from_text, __pyx_v_from_data, __pyx_v_from_binary, __pyx_v_earray, __pyx_v_fsarray, __pyx_v_alignment);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":54
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":54
  *     cdef id2eword, id2fword, eword2id, fword2id
  * 
  *     def __cinit__(self, from_text=None, from_data=False, from_binary=None,             # <<<<<<<<<<<<<<
@@ -14474,7 +14474,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":56
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":56
  *     def __cinit__(self, from_text=None, from_data=False, from_binary=None,
  *             earray=None, fsarray=None, alignment=None):
  *         self.id2eword = []             # <<<<<<<<<<<<<<
@@ -14489,7 +14489,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
   __pyx_v_self->id2eword = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":57
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":57
  *             earray=None, fsarray=None, alignment=None):
  *         self.id2eword = []
  *         self.id2fword = []             # <<<<<<<<<<<<<<
@@ -14504,7 +14504,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
   __pyx_v_self->id2fword = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":58
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":58
  *         self.id2eword = []
  *         self.id2fword = []
  *         self.eword2id = {}             # <<<<<<<<<<<<<<
@@ -14519,7 +14519,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
   __pyx_v_self->eword2id = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":59
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":59
  *         self.id2fword = []
  *         self.eword2id = {}
  *         self.fword2id = {}             # <<<<<<<<<<<<<<
@@ -14534,7 +14534,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
   __pyx_v_self->fword2id = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":60
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":60
  *         self.eword2id = {}
  *         self.fword2id = {}
  *         self.e_index = IntList()             # <<<<<<<<<<<<<<
@@ -14549,7 +14549,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
   __pyx_v_self->e_index = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":61
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":61
  *         self.fword2id = {}
  *         self.e_index = IntList()
  *         self.f_index = IntList()             # <<<<<<<<<<<<<<
@@ -14564,7 +14564,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
   __pyx_v_self->f_index = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":62
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":62
  *         self.e_index = IntList()
  *         self.f_index = IntList()
  *         self.col1 = FloatList()             # <<<<<<<<<<<<<<
@@ -14579,7 +14579,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
   __pyx_v_self->col1 = ((struct __pyx_obj_4cdec_2sa_3_sa_FloatList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":63
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":63
  *         self.f_index = IntList()
  *         self.col1 = FloatList()
  *         self.col2 = FloatList()             # <<<<<<<<<<<<<<
@@ -14594,7 +14594,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
   __pyx_v_self->col2 = ((struct __pyx_obj_4cdec_2sa_3_sa_FloatList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":64
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":64
  *         self.col1 = FloatList()
  *         self.col2 = FloatList()
  *         if from_binary:             # <<<<<<<<<<<<<<
@@ -14604,7 +14604,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
   __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_from_binary); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":65
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":65
  *         self.col2 = FloatList()
  *         if from_binary:
  *             self.read_binary(from_binary)             # <<<<<<<<<<<<<<
@@ -14626,7 +14626,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
     goto __pyx_L3;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":66
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":66
  *         if from_binary:
  *             self.read_binary(from_binary)
  *         elif from_data:             # <<<<<<<<<<<<<<
@@ -14636,7 +14636,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
   __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_from_data); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":67
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":67
  *             self.read_binary(from_binary)
  *         elif from_data:
  *             self.compute_from_data(fsarray, earray, alignment)             # <<<<<<<<<<<<<<
@@ -14653,7 +14653,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":69
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":69
  *             self.compute_from_data(fsarray, earray, alignment)
  *         else:
  *             self.read_text(from_text)             # <<<<<<<<<<<<<<
@@ -14675,7 +14675,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":54
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":54
  *     cdef id2eword, id2fword, eword2id, fword2id
  * 
  *     def __cinit__(self, from_text=None, from_data=False, from_binary=None,             # <<<<<<<<<<<<<<
@@ -14697,7 +14697,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_5BiLex___cinit__(struct __pyx_obj_4cdec_2sa_3
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":72
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":72
  * 
  * 
  *     cdef compute_from_data(self, SuffixArray fsa, DataArray eda, Alignment aa):             # <<<<<<<<<<<<<<
@@ -14752,7 +14752,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("compute_from_data", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":79
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":79
  *         cdef int null_word
  * 
  *         null_word = 0             # <<<<<<<<<<<<<<
@@ -14761,7 +14761,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
   __pyx_v_null_word = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":80
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":80
  * 
  *         null_word = 0
  *         for word in fsa.darray.id2word: # I miss list comprehensions             # <<<<<<<<<<<<<<
@@ -14806,7 +14806,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
     __Pyx_XDECREF_SET(__pyx_v_word, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":81
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":81
  *         null_word = 0
  *         for word in fsa.darray.id2word: # I miss list comprehensions
  *             self.id2fword.append(word)             # <<<<<<<<<<<<<<
@@ -14817,7 +14817,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":82
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":82
  *         for word in fsa.darray.id2word: # I miss list comprehensions
  *             self.id2fword.append(word)
  *         self.id2fword[null_word] = "NULL"             # <<<<<<<<<<<<<<
@@ -14826,7 +14826,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
   if (unlikely(__Pyx_SetItemInt(__pyx_v_self->id2fword, __pyx_v_null_word, __pyx_n_s_NULL, int, 1, __Pyx_PyInt_From_int, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":83
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":83
  *             self.id2fword.append(word)
  *         self.id2fword[null_word] = "NULL"
  *         for id, word in enumerate(self.id2fword):             # <<<<<<<<<<<<<<
@@ -14880,7 +14880,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
     __pyx_t_1 = __pyx_t_6;
     __pyx_t_6 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":84
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":84
  *         self.id2fword[null_word] = "NULL"
  *         for id, word in enumerate(self.id2fword):
  *             self.fword2id[word] = id             # <<<<<<<<<<<<<<
@@ -14892,7 +14892,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":86
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":86
  *             self.fword2id[word] = id
  * 
  *         for word in eda.id2word:             # <<<<<<<<<<<<<<
@@ -14937,7 +14937,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
     __Pyx_XDECREF_SET(__pyx_v_word, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":87
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":87
  * 
  *         for word in eda.id2word:
  *             self.id2eword.append(word)             # <<<<<<<<<<<<<<
@@ -14948,7 +14948,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":88
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":88
  *         for word in eda.id2word:
  *             self.id2eword.append(word)
  *         self.id2eword[null_word] = "NULL"             # <<<<<<<<<<<<<<
@@ -14957,7 +14957,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
   if (unlikely(__Pyx_SetItemInt(__pyx_v_self->id2eword, __pyx_v_null_word, __pyx_n_s_NULL, int, 1, __Pyx_PyInt_From_int, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":89
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":89
  *             self.id2eword.append(word)
  *         self.id2eword[null_word] = "NULL"
  *         for id, word in enumerate(self.id2eword):             # <<<<<<<<<<<<<<
@@ -15011,7 +15011,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
     __pyx_t_1 = __pyx_t_6;
     __pyx_t_6 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":90
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":90
  *         self.id2eword[null_word] = "NULL"
  *         for id, word in enumerate(self.id2eword):
  *             self.eword2id[word] = id             # <<<<<<<<<<<<<<
@@ -15023,7 +15023,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":92
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":92
  *             self.eword2id[word] = id
  * 
  *         num_pairs = 0             # <<<<<<<<<<<<<<
@@ -15032,7 +15032,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
   __pyx_v_num_pairs = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":94
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":94
  *         num_pairs = 0
  * 
  *         V_E = len(eda.id2word)             # <<<<<<<<<<<<<<
@@ -15045,7 +15045,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_v_V_E = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":95
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":95
  * 
  *         V_E = len(eda.id2word)
  *         V_F = len(fsa.darray.id2word)             # <<<<<<<<<<<<<<
@@ -15058,7 +15058,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_v_V_F = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":96
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":96
  *         V_E = len(eda.id2word)
  *         V_F = len(fsa.darray.id2word)
  *         fmargin = <int*> malloc(V_F*sizeof(int))             # <<<<<<<<<<<<<<
@@ -15067,7 +15067,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
   __pyx_v_fmargin = ((int *)malloc((__pyx_v_V_F * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":97
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":97
  *         V_F = len(fsa.darray.id2word)
  *         fmargin = <int*> malloc(V_F*sizeof(int))
  *         emargin = <int*> malloc(V_E*sizeof(int))             # <<<<<<<<<<<<<<
@@ -15076,7 +15076,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
   __pyx_v_emargin = ((int *)malloc((__pyx_v_V_E * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":98
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":98
  *         fmargin = <int*> malloc(V_F*sizeof(int))
  *         emargin = <int*> malloc(V_E*sizeof(int))
  *         memset(fmargin, 0, V_F*sizeof(int))             # <<<<<<<<<<<<<<
@@ -15085,7 +15085,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
   memset(__pyx_v_fmargin, 0, (__pyx_v_V_F * (sizeof(int))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":99
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":99
  *         emargin = <int*> malloc(V_E*sizeof(int))
  *         memset(fmargin, 0, V_F*sizeof(int))
  *         memset(emargin, 0, V_E*sizeof(int))             # <<<<<<<<<<<<<<
@@ -15094,7 +15094,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
   memset(__pyx_v_emargin, 0, (__pyx_v_V_E * (sizeof(int))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":101
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":101
  *         memset(emargin, 0, V_E*sizeof(int))
  * 
  *         dict = <_node**> malloc(V_F*sizeof(_node*))             # <<<<<<<<<<<<<<
@@ -15103,7 +15103,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
   __pyx_v_dict = ((struct __pyx_t_4cdec_2sa_3_sa__node **)malloc((__pyx_v_V_F * (sizeof(struct __pyx_t_4cdec_2sa_3_sa__node *)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":102
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":102
  * 
  *         dict = <_node**> malloc(V_F*sizeof(_node*))
  *         memset(dict, 0, V_F*sizeof(_node*))             # <<<<<<<<<<<<<<
@@ -15112,7 +15112,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
   memset(__pyx_v_dict, 0, (__pyx_v_V_F * (sizeof(struct __pyx_t_4cdec_2sa_3_sa__node *))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":104
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":104
  *         memset(dict, 0, V_F*sizeof(_node*))
  * 
  *         num_sents = len(fsa.darray.sent_index)             # <<<<<<<<<<<<<<
@@ -15128,7 +15128,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   __pyx_v_num_sents = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":105
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":105
  * 
  *         num_sents = len(fsa.darray.sent_index)
  *         for sent_id from 0 <= sent_id < num_sents-1:             # <<<<<<<<<<<<<<
@@ -15141,7 +15141,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   for (__pyx_v_sent_id = 0; __pyx_v_sent_id < __pyx_t_7; __pyx_v_sent_id++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":107
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":107
  *         for sent_id from 0 <= sent_id < num_sents-1:
  * 
  *             fsent = fsa.darray.data.arr + fsa.darray.sent_index.arr[sent_id]             # <<<<<<<<<<<<<<
@@ -15150,7 +15150,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
     __pyx_v_fsent = (__pyx_v_fsa->darray->data->arr + (__pyx_v_fsa->darray->sent_index->arr[__pyx_v_sent_id]));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":108
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":108
  * 
  *             fsent = fsa.darray.data.arr + fsa.darray.sent_index.arr[sent_id]
  *             I = fsa.darray.sent_index.arr[sent_id+1] - fsa.darray.sent_index.arr[sent_id] - 1             # <<<<<<<<<<<<<<
@@ -15159,7 +15159,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
     __pyx_v_I = (((__pyx_v_fsa->darray->sent_index->arr[(__pyx_v_sent_id + 1)]) - (__pyx_v_fsa->darray->sent_index->arr[__pyx_v_sent_id])) - 1);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":109
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":109
  *             fsent = fsa.darray.data.arr + fsa.darray.sent_index.arr[sent_id]
  *             I = fsa.darray.sent_index.arr[sent_id+1] - fsa.darray.sent_index.arr[sent_id] - 1
  *             faligned = <int*> malloc(I*sizeof(int))             # <<<<<<<<<<<<<<
@@ -15168,7 +15168,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
     __pyx_v_faligned = ((int *)malloc((__pyx_v_I * (sizeof(int)))));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":110
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":110
  *             I = fsa.darray.sent_index.arr[sent_id+1] - fsa.darray.sent_index.arr[sent_id] - 1
  *             faligned = <int*> malloc(I*sizeof(int))
  *             memset(faligned, 0, I*sizeof(int))             # <<<<<<<<<<<<<<
@@ -15177,7 +15177,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
     memset(__pyx_v_faligned, 0, (__pyx_v_I * (sizeof(int))));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":112
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":112
  *             memset(faligned, 0, I*sizeof(int))
  * 
  *             esent = eda.data.arr + eda.sent_index.arr[sent_id]             # <<<<<<<<<<<<<<
@@ -15186,7 +15186,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
     __pyx_v_esent = (__pyx_v_eda->data->arr + (__pyx_v_eda->sent_index->arr[__pyx_v_sent_id]));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":113
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":113
  * 
  *             esent = eda.data.arr + eda.sent_index.arr[sent_id]
  *             J = eda.sent_index.arr[sent_id+1] - eda.sent_index.arr[sent_id] - 1             # <<<<<<<<<<<<<<
@@ -15195,7 +15195,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
     __pyx_v_J = (((__pyx_v_eda->sent_index->arr[(__pyx_v_sent_id + 1)]) - (__pyx_v_eda->sent_index->arr[__pyx_v_sent_id])) - 1);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":114
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":114
  *             esent = eda.data.arr + eda.sent_index.arr[sent_id]
  *             J = eda.sent_index.arr[sent_id+1] - eda.sent_index.arr[sent_id] - 1
  *             ealigned = <int*> malloc(J*sizeof(int))             # <<<<<<<<<<<<<<
@@ -15204,7 +15204,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
     __pyx_v_ealigned = ((int *)malloc((__pyx_v_J * (sizeof(int)))));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":115
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":115
  *             J = eda.sent_index.arr[sent_id+1] - eda.sent_index.arr[sent_id] - 1
  *             ealigned = <int*> malloc(J*sizeof(int))
  *             memset(ealigned, 0, J*sizeof(int))             # <<<<<<<<<<<<<<
@@ -15213,7 +15213,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
     memset(__pyx_v_ealigned, 0, (__pyx_v_J * (sizeof(int))));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":117
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":117
  *             memset(ealigned, 0, J*sizeof(int))
  * 
  *             links = aa._get_sent_links(sent_id, &num_links)             # <<<<<<<<<<<<<<
@@ -15222,7 +15222,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
     __pyx_v_links = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alignment *)__pyx_v_aa->__pyx_vtab)->_get_sent_links(__pyx_v_aa, __pyx_v_sent_id, (&__pyx_v_num_links));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":119
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":119
  *             links = aa._get_sent_links(sent_id, &num_links)
  * 
  *             for l from 0 <= l < num_links:             # <<<<<<<<<<<<<<
@@ -15232,7 +15232,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
     __pyx_t_8 = __pyx_v_num_links;
     for (__pyx_v_l = 0; __pyx_v_l < __pyx_t_8; __pyx_v_l++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":120
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":120
  * 
  *             for l from 0 <= l < num_links:
  *                 i = links[l*2]             # <<<<<<<<<<<<<<
@@ -15241,7 +15241,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
       __pyx_v_i = (__pyx_v_links[(__pyx_v_l * 2)]);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":121
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":121
  *             for l from 0 <= l < num_links:
  *                 i = links[l*2]
  *                 j = links[l*2+1]             # <<<<<<<<<<<<<<
@@ -15250,7 +15250,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
       __pyx_v_j = (__pyx_v_links[((__pyx_v_l * 2) + 1)]);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":122
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":122
  *                 i = links[l*2]
  *                 j = links[l*2+1]
  *                 if i >= I or j >= J:             # <<<<<<<<<<<<<<
@@ -15266,7 +15266,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
       }
       if (__pyx_t_11) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":123
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":123
  *                 j = links[l*2+1]
  *                 if i >= I or j >= J:
  *                     raise Exception("%d-%d out of bounds (I=%d,J=%d) in line %d\n" % (i,j,I,J,sent_id+1))             # <<<<<<<<<<<<<<
@@ -15316,7 +15316,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
         {__pyx_filename = __pyx_f[5]; __pyx_lineno = 123; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":124
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":124
  *                 if i >= I or j >= J:
  *                     raise Exception("%d-%d out of bounds (I=%d,J=%d) in line %d\n" % (i,j,I,J,sent_id+1))
  *                 f_i = fsent[i]             # <<<<<<<<<<<<<<
@@ -15325,7 +15325,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
       __pyx_v_f_i = (__pyx_v_fsent[__pyx_v_i]);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":125
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":125
  *                     raise Exception("%d-%d out of bounds (I=%d,J=%d) in line %d\n" % (i,j,I,J,sent_id+1))
  *                 f_i = fsent[i]
  *                 e_j = esent[j]             # <<<<<<<<<<<<<<
@@ -15334,7 +15334,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
       __pyx_v_e_j = (__pyx_v_esent[__pyx_v_j]);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":126
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":126
  *                 f_i = fsent[i]
  *                 e_j = esent[j]
  *                 fmargin[f_i] = fmargin[f_i]+1             # <<<<<<<<<<<<<<
@@ -15343,7 +15343,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
       (__pyx_v_fmargin[__pyx_v_f_i]) = ((__pyx_v_fmargin[__pyx_v_f_i]) + 1);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":127
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":127
  *                 e_j = esent[j]
  *                 fmargin[f_i] = fmargin[f_i]+1
  *                 emargin[e_j] = emargin[e_j]+1             # <<<<<<<<<<<<<<
@@ -15352,7 +15352,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
       (__pyx_v_emargin[__pyx_v_e_j]) = ((__pyx_v_emargin[__pyx_v_e_j]) + 1);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":128
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":128
  *                 fmargin[f_i] = fmargin[f_i]+1
  *                 emargin[e_j] = emargin[e_j]+1
  *                 if dict[f_i] == NULL:             # <<<<<<<<<<<<<<
@@ -15362,7 +15362,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
       __pyx_t_11 = (((__pyx_v_dict[__pyx_v_f_i]) == NULL) != 0);
       if (__pyx_t_11) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":129
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":129
  *                 emargin[e_j] = emargin[e_j]+1
  *                 if dict[f_i] == NULL:
  *                     dict[f_i] = new_node(e_j)             # <<<<<<<<<<<<<<
@@ -15371,7 +15371,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
         (__pyx_v_dict[__pyx_v_f_i]) = __pyx_f_4cdec_2sa_3_sa_new_node(__pyx_v_e_j);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":130
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":130
  *                 if dict[f_i] == NULL:
  *                     dict[f_i] = new_node(e_j)
  *                     dict[f_i].val = 1             # <<<<<<<<<<<<<<
@@ -15380,7 +15380,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
         (__pyx_v_dict[__pyx_v_f_i])->val = 1;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":131
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":131
  *                     dict[f_i] = new_node(e_j)
  *                     dict[f_i].val = 1
  *                     num_pairs = num_pairs + 1             # <<<<<<<<<<<<<<
@@ -15392,7 +15392,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
       }
       /*else*/ {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":133
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":133
  *                     num_pairs = num_pairs + 1
  *                 else:
  *                     count = get_val(dict[f_i], e_j)             # <<<<<<<<<<<<<<
@@ -15401,7 +15401,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
         __pyx_v_count = __pyx_f_4cdec_2sa_3_sa_get_val((__pyx_v_dict[__pyx_v_f_i]), __pyx_v_e_j);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":134
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":134
  *                 else:
  *                     count = get_val(dict[f_i], e_j)
  *                     if count[0] == 0:             # <<<<<<<<<<<<<<
@@ -15411,7 +15411,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
         __pyx_t_11 = (((__pyx_v_count[0]) == 0) != 0);
         if (__pyx_t_11) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":135
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":135
  *                     count = get_val(dict[f_i], e_j)
  *                     if count[0] == 0:
  *                         num_pairs = num_pairs + 1             # <<<<<<<<<<<<<<
@@ -15423,7 +15423,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
         }
         __pyx_L17:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":136
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":136
  *                     if count[0] == 0:
  *                         num_pairs = num_pairs + 1
  *                     count[0] = count[0] + 1             # <<<<<<<<<<<<<<
@@ -15434,7 +15434,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
       }
       __pyx_L16:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":138
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":138
  *                     count[0] = count[0] + 1
  *                 # add count
  *                 faligned[i] = 1             # <<<<<<<<<<<<<<
@@ -15443,7 +15443,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
       (__pyx_v_faligned[__pyx_v_i]) = 1;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":139
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":139
  *                 # add count
  *                 faligned[i] = 1
  *                 ealigned[j] = 1             # <<<<<<<<<<<<<<
@@ -15453,7 +15453,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
       (__pyx_v_ealigned[__pyx_v_j]) = 1;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":140
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":140
  *                 faligned[i] = 1
  *                 ealigned[j] = 1
  *             for i from 0 <= i < I:             # <<<<<<<<<<<<<<
@@ -15463,7 +15463,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
     __pyx_t_8 = __pyx_v_I;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_8; __pyx_v_i++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":141
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":141
  *                 ealigned[j] = 1
  *             for i from 0 <= i < I:
  *                 if faligned[i] == 0:             # <<<<<<<<<<<<<<
@@ -15473,7 +15473,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
       __pyx_t_11 = (((__pyx_v_faligned[__pyx_v_i]) == 0) != 0);
       if (__pyx_t_11) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":142
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":142
  *             for i from 0 <= i < I:
  *                 if faligned[i] == 0:
  *                     f_i = fsent[i]             # <<<<<<<<<<<<<<
@@ -15482,7 +15482,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
         __pyx_v_f_i = (__pyx_v_fsent[__pyx_v_i]);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":143
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":143
  *                 if faligned[i] == 0:
  *                     f_i = fsent[i]
  *                     fmargin[f_i] = fmargin[f_i] + 1             # <<<<<<<<<<<<<<
@@ -15491,7 +15491,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
         (__pyx_v_fmargin[__pyx_v_f_i]) = ((__pyx_v_fmargin[__pyx_v_f_i]) + 1);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":144
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":144
  *                     f_i = fsent[i]
  *                     fmargin[f_i] = fmargin[f_i] + 1
  *                     emargin[null_word] = emargin[null_word] + 1             # <<<<<<<<<<<<<<
@@ -15500,7 +15500,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
         (__pyx_v_emargin[__pyx_v_null_word]) = ((__pyx_v_emargin[__pyx_v_null_word]) + 1);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":145
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":145
  *                     fmargin[f_i] = fmargin[f_i] + 1
  *                     emargin[null_word] = emargin[null_word] + 1
  *                     if dict[f_i] == NULL:             # <<<<<<<<<<<<<<
@@ -15510,7 +15510,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
         __pyx_t_11 = (((__pyx_v_dict[__pyx_v_f_i]) == NULL) != 0);
         if (__pyx_t_11) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":146
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":146
  *                     emargin[null_word] = emargin[null_word] + 1
  *                     if dict[f_i] == NULL:
  *                         dict[f_i] = new_node(null_word)             # <<<<<<<<<<<<<<
@@ -15519,7 +15519,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
           (__pyx_v_dict[__pyx_v_f_i]) = __pyx_f_4cdec_2sa_3_sa_new_node(__pyx_v_null_word);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":147
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":147
  *                     if dict[f_i] == NULL:
  *                         dict[f_i] = new_node(null_word)
  *                         dict[f_i].val = 1             # <<<<<<<<<<<<<<
@@ -15528,7 +15528,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
           (__pyx_v_dict[__pyx_v_f_i])->val = 1;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":148
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":148
  *                         dict[f_i] = new_node(null_word)
  *                         dict[f_i].val = 1
  *                         num_pairs = num_pairs + 1             # <<<<<<<<<<<<<<
@@ -15540,7 +15540,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
         }
         /*else*/ {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":150
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":150
  *                         num_pairs = num_pairs + 1
  *                     else:
  *                         count = get_val(dict[f_i], null_word)             # <<<<<<<<<<<<<<
@@ -15549,7 +15549,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
           __pyx_v_count = __pyx_f_4cdec_2sa_3_sa_get_val((__pyx_v_dict[__pyx_v_f_i]), __pyx_v_null_word);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":151
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":151
  *                     else:
  *                         count = get_val(dict[f_i], null_word)
  *                         if count[0] == 0:             # <<<<<<<<<<<<<<
@@ -15559,7 +15559,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
           __pyx_t_11 = (((__pyx_v_count[0]) == 0) != 0);
           if (__pyx_t_11) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":152
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":152
  *                         count = get_val(dict[f_i], null_word)
  *                         if count[0] == 0:
  *                             num_pairs = num_pairs + 1             # <<<<<<<<<<<<<<
@@ -15571,7 +15571,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
           }
           __pyx_L22:;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":153
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":153
  *                         if count[0] == 0:
  *                             num_pairs = num_pairs + 1
  *                         count[0] = count[0] + 1             # <<<<<<<<<<<<<<
@@ -15586,7 +15586,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
       __pyx_L20:;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":154
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":154
  *                             num_pairs = num_pairs + 1
  *                         count[0] = count[0] + 1
  *             for j from 0 <= j < J:             # <<<<<<<<<<<<<<
@@ -15596,7 +15596,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
     __pyx_t_8 = __pyx_v_J;
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_8; __pyx_v_j++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":155
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":155
  *                         count[0] = count[0] + 1
  *             for j from 0 <= j < J:
  *                 if ealigned[j] == 0:             # <<<<<<<<<<<<<<
@@ -15606,7 +15606,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
       __pyx_t_11 = (((__pyx_v_ealigned[__pyx_v_j]) == 0) != 0);
       if (__pyx_t_11) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":156
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":156
  *             for j from 0 <= j < J:
  *                 if ealigned[j] == 0:
  *                     e_j = esent[j]             # <<<<<<<<<<<<<<
@@ -15615,7 +15615,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
         __pyx_v_e_j = (__pyx_v_esent[__pyx_v_j]);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":157
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":157
  *                 if ealigned[j] == 0:
  *                     e_j = esent[j]
  *                     fmargin[null_word] = fmargin[null_word] + 1             # <<<<<<<<<<<<<<
@@ -15624,7 +15624,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
         (__pyx_v_fmargin[__pyx_v_null_word]) = ((__pyx_v_fmargin[__pyx_v_null_word]) + 1);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":158
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":158
  *                     e_j = esent[j]
  *                     fmargin[null_word] = fmargin[null_word] + 1
  *                     emargin[e_j] = emargin[e_j] + 1             # <<<<<<<<<<<<<<
@@ -15633,7 +15633,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
         (__pyx_v_emargin[__pyx_v_e_j]) = ((__pyx_v_emargin[__pyx_v_e_j]) + 1);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":159
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":159
  *                     fmargin[null_word] = fmargin[null_word] + 1
  *                     emargin[e_j] = emargin[e_j] + 1
  *                     if dict[null_word] == NULL:             # <<<<<<<<<<<<<<
@@ -15643,7 +15643,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
         __pyx_t_11 = (((__pyx_v_dict[__pyx_v_null_word]) == NULL) != 0);
         if (__pyx_t_11) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":160
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":160
  *                     emargin[e_j] = emargin[e_j] + 1
  *                     if dict[null_word] == NULL:
  *                         dict[null_word] = new_node(e_j)             # <<<<<<<<<<<<<<
@@ -15652,7 +15652,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
           (__pyx_v_dict[__pyx_v_null_word]) = __pyx_f_4cdec_2sa_3_sa_new_node(__pyx_v_e_j);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":161
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":161
  *                     if dict[null_word] == NULL:
  *                         dict[null_word] = new_node(e_j)
  *                         dict[null_word].val = 1             # <<<<<<<<<<<<<<
@@ -15661,7 +15661,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
           (__pyx_v_dict[__pyx_v_null_word])->val = 1;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":162
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":162
  *                         dict[null_word] = new_node(e_j)
  *                         dict[null_word].val = 1
  *                         num_pairs = num_pairs + 1             # <<<<<<<<<<<<<<
@@ -15673,7 +15673,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
         }
         /*else*/ {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":164
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":164
  *                         num_pairs = num_pairs + 1
  *                     else:
  *                         count = get_val(dict[null_word], e_j)             # <<<<<<<<<<<<<<
@@ -15682,7 +15682,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
           __pyx_v_count = __pyx_f_4cdec_2sa_3_sa_get_val((__pyx_v_dict[__pyx_v_null_word]), __pyx_v_e_j);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":165
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":165
  *                     else:
  *                         count = get_val(dict[null_word], e_j)
  *                         if count[0] == 0:             # <<<<<<<<<<<<<<
@@ -15692,7 +15692,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
           __pyx_t_11 = (((__pyx_v_count[0]) == 0) != 0);
           if (__pyx_t_11) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":166
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":166
  *                         count = get_val(dict[null_word], e_j)
  *                         if count[0] == 0:
  *                             num_pairs = num_pairs + 1             # <<<<<<<<<<<<<<
@@ -15704,7 +15704,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
           }
           __pyx_L27:;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":167
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":167
  *                         if count[0] == 0:
  *                             num_pairs = num_pairs + 1
  *                         count[0] = count[0] + 1             # <<<<<<<<<<<<<<
@@ -15719,7 +15719,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
       __pyx_L25:;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":168
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":168
  *                             num_pairs = num_pairs + 1
  *                         count[0] = count[0] + 1
  *             free(links)             # <<<<<<<<<<<<<<
@@ -15728,7 +15728,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
     free(__pyx_v_links);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":169
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":169
  *                         count[0] = count[0] + 1
  *             free(links)
  *             free(faligned)             # <<<<<<<<<<<<<<
@@ -15737,7 +15737,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
     free(__pyx_v_faligned);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":170
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":170
  *             free(links)
  *             free(faligned)
  *             free(ealigned)             # <<<<<<<<<<<<<<
@@ -15747,7 +15747,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
     free(__pyx_v_ealigned);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":171
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":171
  *             free(faligned)
  *             free(ealigned)
  *         self.f_index = IntList(initial_len=V_F)             # <<<<<<<<<<<<<<
@@ -15769,7 +15769,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   __pyx_v_self->f_index = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_14);
   __pyx_t_14 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":172
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":172
  *             free(ealigned)
  *         self.f_index = IntList(initial_len=V_F)
  *         self.e_index = IntList(initial_len=num_pairs)             # <<<<<<<<<<<<<<
@@ -15791,7 +15791,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   __pyx_v_self->e_index = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_13);
   __pyx_t_13 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":173
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":173
  *         self.f_index = IntList(initial_len=V_F)
  *         self.e_index = IntList(initial_len=num_pairs)
  *         self.col1 = FloatList(initial_len=num_pairs)             # <<<<<<<<<<<<<<
@@ -15813,7 +15813,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   __pyx_v_self->col1 = ((struct __pyx_obj_4cdec_2sa_3_sa_FloatList *)__pyx_t_14);
   __pyx_t_14 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":174
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":174
  *         self.e_index = IntList(initial_len=num_pairs)
  *         self.col1 = FloatList(initial_len=num_pairs)
  *         self.col2 = FloatList(initial_len=num_pairs)             # <<<<<<<<<<<<<<
@@ -15835,7 +15835,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   __pyx_v_self->col2 = ((struct __pyx_obj_4cdec_2sa_3_sa_FloatList *)__pyx_t_13);
   __pyx_t_13 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":176
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":176
  *         self.col2 = FloatList(initial_len=num_pairs)
  * 
  *         num_pairs = 0             # <<<<<<<<<<<<<<
@@ -15844,7 +15844,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
   __pyx_v_num_pairs = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":177
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":177
  * 
  *         num_pairs = 0
  *         for i from 0 <= i < V_F:             # <<<<<<<<<<<<<<
@@ -15854,7 +15854,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   __pyx_t_7 = __pyx_v_V_F;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_7; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":179
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":179
  *         for i from 0 <= i < V_F:
  *             #self.f_index[i] = num_pairs
  *             self.f_index.set(i, num_pairs)             # <<<<<<<<<<<<<<
@@ -15863,7 +15863,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
     ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->f_index->__pyx_vtab)->set(__pyx_v_self->f_index, __pyx_v_i, __pyx_v_num_pairs);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":180
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":180
  *             #self.f_index[i] = num_pairs
  *             self.f_index.set(i, num_pairs)
  *             if dict[i] != NULL:             # <<<<<<<<<<<<<<
@@ -15873,7 +15873,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
     __pyx_t_11 = (((__pyx_v_dict[__pyx_v_i]) != NULL) != 0);
     if (__pyx_t_11) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":181
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":181
  *             self.f_index.set(i, num_pairs)
  *             if dict[i] != NULL:
  *                 self._add_node(dict[i], &num_pairs, float(fmargin[i]), emargin)             # <<<<<<<<<<<<<<
@@ -15884,7 +15884,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
       __Pyx_GOTREF(__pyx_t_13);
       __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":182
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":182
  *             if dict[i] != NULL:
  *                 self._add_node(dict[i], &num_pairs, float(fmargin[i]), emargin)
  *                 del_node(dict[i])             # <<<<<<<<<<<<<<
@@ -15899,7 +15899,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
     __pyx_L30:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":183
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":183
  *                 self._add_node(dict[i], &num_pairs, float(fmargin[i]), emargin)
  *                 del_node(dict[i])
  *         free(fmargin)             # <<<<<<<<<<<<<<
@@ -15908,7 +15908,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
   free(__pyx_v_fmargin);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":184
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":184
  *                 del_node(dict[i])
  *         free(fmargin)
  *         free(emargin)             # <<<<<<<<<<<<<<
@@ -15917,7 +15917,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
   free(__pyx_v_emargin);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":185
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":185
  *         free(fmargin)
  *         free(emargin)
  *         free(dict)             # <<<<<<<<<<<<<<
@@ -15926,7 +15926,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
  */
   free(__pyx_v_dict);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":186
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":186
  *         free(emargin)
  *         free(dict)
  *         return             # <<<<<<<<<<<<<<
@@ -15937,7 +15937,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":72
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":72
  * 
  * 
  *     cdef compute_from_data(self, SuffixArray fsa, DataArray eda, Alignment aa):             # <<<<<<<<<<<<<<
@@ -15964,7 +15964,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_compute_from_data(struct __pyx_ob
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":189
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":189
  * 
  * 
  *     cdef _add_node(self, _node* n, int* num_pairs, float fmargin, int* emargin):             # <<<<<<<<<<<<<<
@@ -15983,7 +15983,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex__add_node(struct __pyx_obj_4cdec_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("_add_node", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":191
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":191
  *     cdef _add_node(self, _node* n, int* num_pairs, float fmargin, int* emargin):
  *         cdef int loc
  *         if n.smaller != NULL:             # <<<<<<<<<<<<<<
@@ -15993,7 +15993,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex__add_node(struct __pyx_obj_4cdec_
   __pyx_t_1 = ((__pyx_v_n->smaller != NULL) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":192
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":192
  *         cdef int loc
  *         if n.smaller != NULL:
  *             self._add_node(n.smaller, num_pairs, fmargin, emargin)             # <<<<<<<<<<<<<<
@@ -16007,7 +16007,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex__add_node(struct __pyx_obj_4cdec_
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":193
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":193
  *         if n.smaller != NULL:
  *             self._add_node(n.smaller, num_pairs, fmargin, emargin)
  *         loc = num_pairs[0]             # <<<<<<<<<<<<<<
@@ -16016,7 +16016,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex__add_node(struct __pyx_obj_4cdec_
  */
   __pyx_v_loc = (__pyx_v_num_pairs[0]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":194
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":194
  *             self._add_node(n.smaller, num_pairs, fmargin, emargin)
  *         loc = num_pairs[0]
  *         self.e_index.set(loc, n.key)             # <<<<<<<<<<<<<<
@@ -16025,7 +16025,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex__add_node(struct __pyx_obj_4cdec_
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->e_index->__pyx_vtab)->set(__pyx_v_self->e_index, __pyx_v_loc, __pyx_v_n->key);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":195
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":195
  *         loc = num_pairs[0]
  *         self.e_index.set(loc, n.key)
  *         self.col1.set(loc, float(n.val)/fmargin)             # <<<<<<<<<<<<<<
@@ -16044,7 +16044,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex__add_node(struct __pyx_obj_4cdec_
   }
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList *)__pyx_v_self->col1->__pyx_vtab)->set(__pyx_v_self->col1, __pyx_v_loc, (((double)__pyx_v_n->val) / __pyx_v_fmargin));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":196
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":196
  *         self.e_index.set(loc, n.key)
  *         self.col1.set(loc, float(n.val)/fmargin)
  *         self.col2.set(loc, float(n.val)/float(emargin[n.key]))             # <<<<<<<<<<<<<<
@@ -16063,7 +16063,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex__add_node(struct __pyx_obj_4cdec_
   }
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList *)__pyx_v_self->col2->__pyx_vtab)->set(__pyx_v_self->col2, __pyx_v_loc, (((double)__pyx_v_n->val) / ((double)(__pyx_v_emargin[__pyx_v_n->key]))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":197
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":197
  *         self.col1.set(loc, float(n.val)/fmargin)
  *         self.col2.set(loc, float(n.val)/float(emargin[n.key]))
  *         num_pairs[0] = loc + 1             # <<<<<<<<<<<<<<
@@ -16072,7 +16072,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex__add_node(struct __pyx_obj_4cdec_
  */
   (__pyx_v_num_pairs[0]) = (__pyx_v_loc + 1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":198
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":198
  *         self.col2.set(loc, float(n.val)/float(emargin[n.key]))
  *         num_pairs[0] = loc + 1
  *         if n.bigger != NULL:             # <<<<<<<<<<<<<<
@@ -16082,7 +16082,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex__add_node(struct __pyx_obj_4cdec_
   __pyx_t_1 = ((__pyx_v_n->bigger != NULL) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":199
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":199
  *         num_pairs[0] = loc + 1
  *         if n.bigger != NULL:
  *             self._add_node(n.bigger, num_pairs, fmargin, emargin)             # <<<<<<<<<<<<<<
@@ -16096,7 +16096,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex__add_node(struct __pyx_obj_4cdec_
   }
   __pyx_L4:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":189
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":189
  * 
  * 
  *     cdef _add_node(self, _node* n, int* num_pairs, float fmargin, int* emargin):             # <<<<<<<<<<<<<<
@@ -16117,7 +16117,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex__add_node(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":202
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":202
  * 
  * 
  *     def write_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -16162,7 +16162,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_2write_binary(struct __pyx_obj_4
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("write_binary", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":204
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":204
  *     def write_binary(self, char* filename):
  *         cdef FILE* f
  *         f = fopen(filename, "w")             # <<<<<<<<<<<<<<
@@ -16171,7 +16171,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_2write_binary(struct __pyx_obj_4
  */
   __pyx_v_f = fopen(__pyx_v_filename, __pyx_k_w);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":205
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":205
  *         cdef FILE* f
  *         f = fopen(filename, "w")
  *         self.f_index.write_handle(f)             # <<<<<<<<<<<<<<
@@ -16180,7 +16180,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_2write_binary(struct __pyx_obj_4
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->f_index->__pyx_vtab)->write_handle(__pyx_v_self->f_index, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":206
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":206
  *         f = fopen(filename, "w")
  *         self.f_index.write_handle(f)
  *         self.e_index.write_handle(f)             # <<<<<<<<<<<<<<
@@ -16189,7 +16189,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_2write_binary(struct __pyx_obj_4
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->e_index->__pyx_vtab)->write_handle(__pyx_v_self->e_index, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":207
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":207
  *         self.f_index.write_handle(f)
  *         self.e_index.write_handle(f)
  *         self.col1.write_handle(f)             # <<<<<<<<<<<<<<
@@ -16198,7 +16198,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_2write_binary(struct __pyx_obj_4
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList *)__pyx_v_self->col1->__pyx_vtab)->write_handle(__pyx_v_self->col1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":208
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":208
  *         self.e_index.write_handle(f)
  *         self.col1.write_handle(f)
  *         self.col2.write_handle(f)             # <<<<<<<<<<<<<<
@@ -16207,7 +16207,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_2write_binary(struct __pyx_obj_4
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList *)__pyx_v_self->col2->__pyx_vtab)->write_handle(__pyx_v_self->col2, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":209
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":209
  *         self.col1.write_handle(f)
  *         self.col2.write_handle(f)
  *         self.write_wordlist(self.id2fword, f)             # <<<<<<<<<<<<<<
@@ -16221,7 +16221,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_2write_binary(struct __pyx_obj_4
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":210
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":210
  *         self.col2.write_handle(f)
  *         self.write_wordlist(self.id2fword, f)
  *         self.write_wordlist(self.id2eword, f)             # <<<<<<<<<<<<<<
@@ -16235,7 +16235,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_2write_binary(struct __pyx_obj_4
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":211
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":211
  *         self.write_wordlist(self.id2fword, f)
  *         self.write_wordlist(self.id2eword, f)
  *         fclose(f)             # <<<<<<<<<<<<<<
@@ -16244,7 +16244,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_2write_binary(struct __pyx_obj_4
  */
   fclose(__pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":202
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":202
  * 
  * 
  *     def write_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -16266,7 +16266,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_2write_binary(struct __pyx_obj_4
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":214
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":214
  * 
  * 
  *     cdef write_wordlist(self, wordlist, FILE* f):             # <<<<<<<<<<<<<<
@@ -16291,7 +16291,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_write_wordlist(CYTHON_UNUSED stru
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("write_wordlist", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":218
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":218
  *         cdef int num_words
  * 
  *         num_words = len(wordlist)             # <<<<<<<<<<<<<<
@@ -16301,7 +16301,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_write_wordlist(CYTHON_UNUSED stru
   __pyx_t_1 = PyObject_Length(__pyx_v_wordlist); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 218; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_num_words = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":219
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":219
  * 
  *         num_words = len(wordlist)
  *         fwrite(&(num_words), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -16310,7 +16310,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_write_wordlist(CYTHON_UNUSED stru
  */
   fwrite((&__pyx_v_num_words), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":220
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":220
  *         num_words = len(wordlist)
  *         fwrite(&(num_words), sizeof(int), 1, f)
  *         for word in wordlist:             # <<<<<<<<<<<<<<
@@ -16355,7 +16355,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_write_wordlist(CYTHON_UNUSED stru
     __Pyx_XDECREF_SET(__pyx_v_word, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":221
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":221
  *         fwrite(&(num_words), sizeof(int), 1, f)
  *         for word in wordlist:
  *             word_len = len(word) + 1             # <<<<<<<<<<<<<<
@@ -16365,7 +16365,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_write_wordlist(CYTHON_UNUSED stru
     __pyx_t_5 = PyObject_Length(__pyx_v_word); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 221; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __pyx_v_word_len = (__pyx_t_5 + 1);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":222
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":222
  *         for word in wordlist:
  *             word_len = len(word) + 1
  *             fwrite(&(word_len), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -16374,7 +16374,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_write_wordlist(CYTHON_UNUSED stru
  */
     fwrite((&__pyx_v_word_len), (sizeof(int)), 1, __pyx_v_f);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":223
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":223
  *             word_len = len(word) + 1
  *             fwrite(&(word_len), sizeof(int), 1, f)
  *             fwrite(<char *>word, sizeof(char), word_len, f)             # <<<<<<<<<<<<<<
@@ -16386,7 +16386,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_write_wordlist(CYTHON_UNUSED stru
   }
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":214
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":214
  * 
  * 
  *     cdef write_wordlist(self, wordlist, FILE* f):             # <<<<<<<<<<<<<<
@@ -16409,7 +16409,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_write_wordlist(CYTHON_UNUSED stru
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":226
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":226
  * 
  * 
  *     cdef read_wordlist(self, word2id, id2word, FILE* f):             # <<<<<<<<<<<<<<
@@ -16434,7 +16434,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_read_wordlist(CYTHON_UNUSED struc
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("read_wordlist", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":231
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":231
  *         cdef char* word
  * 
  *         fread(&(num_words), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -16443,7 +16443,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_read_wordlist(CYTHON_UNUSED struc
  */
   fread((&__pyx_v_num_words), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":232
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":232
  * 
  *         fread(&(num_words), sizeof(int), 1, f)
  *         for i from 0 <= i < num_words:             # <<<<<<<<<<<<<<
@@ -16453,7 +16453,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_read_wordlist(CYTHON_UNUSED struc
   __pyx_t_1 = __pyx_v_num_words;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_1; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":233
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":233
  *         fread(&(num_words), sizeof(int), 1, f)
  *         for i from 0 <= i < num_words:
  *             fread(&(word_len), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -16462,7 +16462,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_read_wordlist(CYTHON_UNUSED struc
  */
     fread((&__pyx_v_word_len), (sizeof(int)), 1, __pyx_v_f);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":234
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":234
  *         for i from 0 <= i < num_words:
  *             fread(&(word_len), sizeof(int), 1, f)
  *             word = <char*> malloc (word_len * sizeof(char))             # <<<<<<<<<<<<<<
@@ -16471,7 +16471,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_read_wordlist(CYTHON_UNUSED struc
  */
     __pyx_v_word = ((char *)malloc((__pyx_v_word_len * (sizeof(char)))));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":235
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":235
  *             fread(&(word_len), sizeof(int), 1, f)
  *             word = <char*> malloc (word_len * sizeof(char))
  *             fread(word, sizeof(char), word_len, f)             # <<<<<<<<<<<<<<
@@ -16480,7 +16480,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_read_wordlist(CYTHON_UNUSED struc
  */
     fread(__pyx_v_word, (sizeof(char)), __pyx_v_word_len, __pyx_v_f);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":236
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":236
  *             word = <char*> malloc (word_len * sizeof(char))
  *             fread(word, sizeof(char), word_len, f)
  *             word2id[word] = len(id2word)             # <<<<<<<<<<<<<<
@@ -16496,7 +16496,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_read_wordlist(CYTHON_UNUSED struc
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":237
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":237
  *             fread(word, sizeof(char), word_len, f)
  *             word2id[word] = len(id2word)
  *             id2word.append(word)             # <<<<<<<<<<<<<<
@@ -16508,7 +16508,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_read_wordlist(CYTHON_UNUSED struc
     __pyx_t_5 = __Pyx_PyObject_Append(__pyx_v_id2word, __pyx_t_3); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":238
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":238
  *             word2id[word] = len(id2word)
  *             id2word.append(word)
  *             free(word)             # <<<<<<<<<<<<<<
@@ -16518,7 +16518,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_read_wordlist(CYTHON_UNUSED struc
     free(__pyx_v_word);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":226
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":226
  * 
  * 
  *     cdef read_wordlist(self, word2id, id2word, FILE* f):             # <<<<<<<<<<<<<<
@@ -16540,7 +16540,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_read_wordlist(CYTHON_UNUSED struc
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":240
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":240
  *             free(word)
  * 
  *     def read_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -16586,7 +16586,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_4read_binary(struct __pyx_obj_4c
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("read_binary", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":242
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":242
  *     def read_binary(self, char* filename):
  *         cdef FILE* f
  *         f = fopen(filename, "r")             # <<<<<<<<<<<<<<
@@ -16595,7 +16595,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_4read_binary(struct __pyx_obj_4c
  */
   __pyx_v_f = fopen(__pyx_v_filename, __pyx_k_r);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":243
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":243
  *         cdef FILE* f
  *         f = fopen(filename, "r")
  *         self.f_index.read_handle(f)             # <<<<<<<<<<<<<<
@@ -16604,7 +16604,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_4read_binary(struct __pyx_obj_4c
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->f_index->__pyx_vtab)->read_handle(__pyx_v_self->f_index, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":244
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":244
  *         f = fopen(filename, "r")
  *         self.f_index.read_handle(f)
  *         self.e_index.read_handle(f)             # <<<<<<<<<<<<<<
@@ -16613,7 +16613,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_4read_binary(struct __pyx_obj_4c
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->e_index->__pyx_vtab)->read_handle(__pyx_v_self->e_index, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":245
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":245
  *         self.f_index.read_handle(f)
  *         self.e_index.read_handle(f)
  *         self.col1.read_handle(f)             # <<<<<<<<<<<<<<
@@ -16622,7 +16622,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_4read_binary(struct __pyx_obj_4c
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList *)__pyx_v_self->col1->__pyx_vtab)->read_handle(__pyx_v_self->col1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":246
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":246
  *         self.e_index.read_handle(f)
  *         self.col1.read_handle(f)
  *         self.col2.read_handle(f)             # <<<<<<<<<<<<<<
@@ -16631,7 +16631,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_4read_binary(struct __pyx_obj_4c
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_FloatList *)__pyx_v_self->col2->__pyx_vtab)->read_handle(__pyx_v_self->col2, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":247
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":247
  *         self.col1.read_handle(f)
  *         self.col2.read_handle(f)
  *         self.read_wordlist(self.fword2id, self.id2fword, f)             # <<<<<<<<<<<<<<
@@ -16648,7 +16648,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_4read_binary(struct __pyx_obj_4c
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":248
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":248
  *         self.col2.read_handle(f)
  *         self.read_wordlist(self.fword2id, self.id2fword, f)
  *         self.read_wordlist(self.eword2id, self.id2eword, f)             # <<<<<<<<<<<<<<
@@ -16665,7 +16665,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_4read_binary(struct __pyx_obj_4c
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":249
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":249
  *         self.read_wordlist(self.fword2id, self.id2fword, f)
  *         self.read_wordlist(self.eword2id, self.id2eword, f)
  *         fclose(f)             # <<<<<<<<<<<<<<
@@ -16674,7 +16674,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_4read_binary(struct __pyx_obj_4c
  */
   fclose(__pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":240
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":240
  *             free(word)
  * 
  *     def read_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -16697,7 +16697,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_4read_binary(struct __pyx_obj_4c
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":252
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":252
  * 
  * 
  *     def contains_e_word(self, eword):             # <<<<<<<<<<<<<<
@@ -16728,7 +16728,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_6contains_e_word(struct __pyx_ob
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("contains_e_word", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":253
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":253
  * 
  *     def contains_e_word(self, eword):
  *         return (eword in self.eword2id)             # <<<<<<<<<<<<<<
@@ -16743,7 +16743,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_6contains_e_word(struct __pyx_ob
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":252
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":252
  * 
  * 
  *     def contains_e_word(self, eword):             # <<<<<<<<<<<<<<
@@ -16762,7 +16762,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_6contains_e_word(struct __pyx_ob
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":256
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":256
  * 
  * 
  *     def contains_f_word(self, fword):             # <<<<<<<<<<<<<<
@@ -16793,7 +16793,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_8contains_f_word(struct __pyx_ob
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("contains_f_word", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":257
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":257
  * 
  *     def contains_f_word(self, fword):
  *         return (fword in self.fword2id)             # <<<<<<<<<<<<<<
@@ -16808,7 +16808,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_8contains_f_word(struct __pyx_ob
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":256
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":256
  * 
  * 
  *     def contains_f_word(self, fword):             # <<<<<<<<<<<<<<
@@ -16827,7 +16827,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_8contains_f_word(struct __pyx_ob
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":260
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":260
  * 
  * 
  *     def get_e_id(self, eword):             # <<<<<<<<<<<<<<
@@ -16862,7 +16862,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_10get_e_id(struct __pyx_obj_4cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_e_id", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":261
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":261
  * 
  *     def get_e_id(self, eword):
  *         if eword not in self.eword2id:             # <<<<<<<<<<<<<<
@@ -16873,7 +16873,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_10get_e_id(struct __pyx_obj_4cde
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":262
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":262
  *     def get_e_id(self, eword):
  *         if eword not in self.eword2id:
  *             e_id = len(self.id2eword)             # <<<<<<<<<<<<<<
@@ -16886,7 +16886,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_10get_e_id(struct __pyx_obj_4cde
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __pyx_v_e_id = __pyx_t_4;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":263
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":263
  *         if eword not in self.eword2id:
  *             e_id = len(self.id2eword)
  *             self.id2eword.append(eword)             # <<<<<<<<<<<<<<
@@ -16895,7 +16895,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_10get_e_id(struct __pyx_obj_4cde
  */
     __pyx_t_5 = __Pyx_PyObject_Append(__pyx_v_self->id2eword, __pyx_v_eword); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 263; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":264
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":264
  *             e_id = len(self.id2eword)
  *             self.id2eword.append(eword)
  *             self.eword2id[eword] = e_id             # <<<<<<<<<<<<<<
@@ -16910,7 +16910,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_10get_e_id(struct __pyx_obj_4cde
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":265
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":265
  *             self.id2eword.append(eword)
  *             self.eword2id[eword] = e_id
  *         return self.eword2id[eword]             # <<<<<<<<<<<<<<
@@ -16924,7 +16924,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_10get_e_id(struct __pyx_obj_4cde
   __pyx_t_3 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":260
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":260
  * 
  * 
  *     def get_e_id(self, eword):             # <<<<<<<<<<<<<<
@@ -16943,7 +16943,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_10get_e_id(struct __pyx_obj_4cde
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":268
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":268
  * 
  * 
  *     def get_f_id(self, fword):             # <<<<<<<<<<<<<<
@@ -16978,7 +16978,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_12get_f_id(struct __pyx_obj_4cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_f_id", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":269
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":269
  * 
  *     def get_f_id(self, fword):
  *         if fword not in self.fword2id:             # <<<<<<<<<<<<<<
@@ -16989,7 +16989,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_12get_f_id(struct __pyx_obj_4cde
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":270
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":270
  *     def get_f_id(self, fword):
  *         if fword not in self.fword2id:
  *             f_id = len(self.id2fword)             # <<<<<<<<<<<<<<
@@ -17002,7 +17002,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_12get_f_id(struct __pyx_obj_4cde
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __pyx_v_f_id = __pyx_t_4;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":271
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":271
  *         if fword not in self.fword2id:
  *             f_id = len(self.id2fword)
  *             self.id2fword.append(fword)             # <<<<<<<<<<<<<<
@@ -17011,7 +17011,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_12get_f_id(struct __pyx_obj_4cde
  */
     __pyx_t_5 = __Pyx_PyObject_Append(__pyx_v_self->id2fword, __pyx_v_fword); if (unlikely(__pyx_t_5 == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 271; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":272
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":272
  *             f_id = len(self.id2fword)
  *             self.id2fword.append(fword)
  *             self.fword2id[fword] = f_id             # <<<<<<<<<<<<<<
@@ -17026,7 +17026,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_12get_f_id(struct __pyx_obj_4cde
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":273
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":273
  *             self.id2fword.append(fword)
  *             self.fword2id[fword] = f_id
  *         return self.fword2id[fword]             # <<<<<<<<<<<<<<
@@ -17040,7 +17040,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_12get_f_id(struct __pyx_obj_4cde
   __pyx_t_3 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":268
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":268
  * 
  * 
  *     def get_f_id(self, fword):             # <<<<<<<<<<<<<<
@@ -17059,7 +17059,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_12get_f_id(struct __pyx_obj_4cde
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":276
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":276
  * 
  * 
  *     def read_text(self, char* filename):             # <<<<<<<<<<<<<<
@@ -17141,7 +17141,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("read_text", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":280
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":280
  *         cdef IntList fcount
  * 
  *         fcount = IntList()             # <<<<<<<<<<<<<<
@@ -17153,7 +17153,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
   __pyx_v_fcount = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":281
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":281
  * 
  *         fcount = IntList()
  *         with gzip_or_text(filename) as f:             # <<<<<<<<<<<<<<
@@ -17193,7 +17193,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
           __pyx_v_f = __pyx_t_1;
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":283
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":283
  *         with gzip_or_text(filename) as f:
  *             # first loop merely establishes size of array objects
  *             for line in f:             # <<<<<<<<<<<<<<
@@ -17238,7 +17238,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __Pyx_XDECREF_SET(__pyx_v_line, __pyx_t_2);
             __pyx_t_2 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":284
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":284
  *             # first loop merely establishes size of array objects
  *             for line in f:
  *                 (fword, eword, score1, score2) = line.split()             # <<<<<<<<<<<<<<
@@ -17322,7 +17322,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __Pyx_XDECREF_SET(__pyx_v_score2, __pyx_t_12);
             __pyx_t_12 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":285
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":285
  *             for line in f:
  *                 (fword, eword, score1, score2) = line.split()
  *                 f_id = self.get_f_id(fword)             # <<<<<<<<<<<<<<
@@ -17343,7 +17343,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __Pyx_XDECREF_SET(__pyx_v_f_id, __pyx_t_11);
             __pyx_t_11 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":286
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":286
  *                 (fword, eword, score1, score2) = line.split()
  *                 f_id = self.get_f_id(fword)
  *                 e_id = self.get_e_id(eword)             # <<<<<<<<<<<<<<
@@ -17364,7 +17364,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __Pyx_XDECREF_SET(__pyx_v_e_id, __pyx_t_3);
             __pyx_t_3 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":287
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":287
  *                 f_id = self.get_f_id(fword)
  *                 e_id = self.get_e_id(eword)
  *                 while f_id >= len(fcount):             # <<<<<<<<<<<<<<
@@ -17381,7 +17381,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
               __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;
               if (!__pyx_t_16) break;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":288
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":288
  *                 e_id = self.get_e_id(eword)
  *                 while f_id >= len(fcount):
  *                     fcount.append(0)             # <<<<<<<<<<<<<<
@@ -17391,7 +17391,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
               __pyx_t_17 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_fcount), __pyx_int_0); if (unlikely(__pyx_t_17 == -1)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 288; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             }
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":289
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":289
  *                 while f_id >= len(fcount):
  *                     fcount.append(0)
  *                 fcount.arr[f_id] = fcount.arr[f_id] + 1             # <<<<<<<<<<<<<<
@@ -17404,7 +17404,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
           }
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":292
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":292
  * 
  *             # Allocate space for dictionary in arrays
  *             N = 0             # <<<<<<<<<<<<<<
@@ -17414,7 +17414,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
           __Pyx_INCREF(__pyx_int_0);
           __pyx_v_N = __pyx_int_0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":293
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":293
  *             # Allocate space for dictionary in arrays
  *             N = 0
  *             n_f = len(fcount)             # <<<<<<<<<<<<<<
@@ -17427,7 +17427,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
           __pyx_v_n_f = __pyx_t_1;
           __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":294
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":294
  *             N = 0
  *             n_f = len(fcount)
  *             self.f_index = IntList(initial_len=n_f+1)             # <<<<<<<<<<<<<<
@@ -17449,7 +17449,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
           __pyx_v_self->f_index = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_12);
           __pyx_t_12 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":295
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":295
  *             n_f = len(fcount)
  *             self.f_index = IntList(initial_len=n_f+1)
  *             for i from 0 <= i < n_f:             # <<<<<<<<<<<<<<
@@ -17463,7 +17463,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_12);
             __pyx_t_12 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":296
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":296
  *             self.f_index = IntList(initial_len=n_f+1)
  *             for i from 0 <= i < n_f:
  *                 self.f_index.arr[i] = N             # <<<<<<<<<<<<<<
@@ -17474,7 +17474,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __pyx_t_8 = __Pyx_PyIndex_AsSsize_t(__pyx_v_i); if (unlikely((__pyx_t_8 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 296; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             (__pyx_v_self->f_index->arr[__pyx_t_8]) = __pyx_t_21;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":297
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":297
  *             for i from 0 <= i < n_f:
  *                 self.f_index.arr[i] = N
  *                 N = N + fcount.arr[i]             # <<<<<<<<<<<<<<
@@ -17490,7 +17490,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __Pyx_DECREF_SET(__pyx_v_N, __pyx_t_1);
             __pyx_t_1 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":298
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":298
  *                 self.f_index.arr[i] = N
  *                 N = N + fcount.arr[i]
  *                 fcount.arr[i] = 0             # <<<<<<<<<<<<<<
@@ -17502,7 +17502,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __pyx_t_20 = __Pyx_PyInt_As_long(__pyx_v_i); if (unlikely((__pyx_t_20 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
           }
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":295
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":295
  *             n_f = len(fcount)
  *             self.f_index = IntList(initial_len=n_f+1)
  *             for i from 0 <= i < n_f:             # <<<<<<<<<<<<<<
@@ -17514,7 +17514,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
           __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_1);
           __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":299
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":299
  *                 N = N + fcount.arr[i]
  *                 fcount.arr[i] = 0
  *             self.f_index.arr[n_f] = N             # <<<<<<<<<<<<<<
@@ -17525,7 +17525,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
           __pyx_t_8 = __Pyx_PyIndex_AsSsize_t(__pyx_v_n_f); if (unlikely((__pyx_t_8 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 299; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
           (__pyx_v_self->f_index->arr[__pyx_t_8]) = __pyx_t_21;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":300
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":300
  *                 fcount.arr[i] = 0
  *             self.f_index.arr[n_f] = N
  *             self.e_index = IntList(initial_len=N)             # <<<<<<<<<<<<<<
@@ -17544,7 +17544,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
           __pyx_v_self->e_index = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_12);
           __pyx_t_12 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":301
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":301
  *             self.f_index.arr[n_f] = N
  *             self.e_index = IntList(initial_len=N)
  *             self.col1 = FloatList(initial_len=N)             # <<<<<<<<<<<<<<
@@ -17563,7 +17563,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
           __pyx_v_self->col1 = ((struct __pyx_obj_4cdec_2sa_3_sa_FloatList *)__pyx_t_1);
           __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":302
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":302
  *             self.e_index = IntList(initial_len=N)
  *             self.col1 = FloatList(initial_len=N)
  *             self.col2 = FloatList(initial_len=N)             # <<<<<<<<<<<<<<
@@ -17582,7 +17582,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
           __pyx_v_self->col2 = ((struct __pyx_obj_4cdec_2sa_3_sa_FloatList *)__pyx_t_12);
           __pyx_t_12 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":305
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":305
  * 
  *             # Re-read file, placing words into buckets
  *             f.seek(0)             # <<<<<<<<<<<<<<
@@ -17596,7 +17596,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
           __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":306
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":306
  *             # Re-read file, placing words into buckets
  *             f.seek(0)
  *             for line in f:             # <<<<<<<<<<<<<<
@@ -17641,7 +17641,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __Pyx_XDECREF_SET(__pyx_v_line, __pyx_t_12);
             __pyx_t_12 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":307
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":307
  *             f.seek(0)
  *             for line in f:
  *                 (fword, eword, score1, score2) = line.split()             # <<<<<<<<<<<<<<
@@ -17725,7 +17725,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __Pyx_XDECREF_SET(__pyx_v_score2, __pyx_t_2);
             __pyx_t_2 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":308
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":308
  *             for line in f:
  *                 (fword, eword, score1, score2) = line.split()
  *                 f_id = self.get_f_id(fword)             # <<<<<<<<<<<<<<
@@ -17746,7 +17746,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __Pyx_XDECREF_SET(__pyx_v_f_id, __pyx_t_10);
             __pyx_t_10 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":309
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":309
  *                 (fword, eword, score1, score2) = line.split()
  *                 f_id = self.get_f_id(fword)
  *                 e_id = self.get_e_id(eword)             # <<<<<<<<<<<<<<
@@ -17767,7 +17767,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __Pyx_XDECREF_SET(__pyx_v_e_id, __pyx_t_3);
             __pyx_t_3 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":310
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":310
  *                 f_id = self.get_f_id(fword)
  *                 e_id = self.get_e_id(eword)
  *                 index = self.f_index.arr[f_id] + fcount.arr[f_id]             # <<<<<<<<<<<<<<
@@ -17781,7 +17781,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __Pyx_XDECREF_SET(__pyx_v_index, __pyx_t_3);
             __pyx_t_3 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":311
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":311
  *                 e_id = self.get_e_id(eword)
  *                 index = self.f_index.arr[f_id] + fcount.arr[f_id]
  *                 fcount.arr[f_id] = fcount.arr[f_id] + 1             # <<<<<<<<<<<<<<
@@ -17792,7 +17792,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __pyx_t_15 = __Pyx_PyIndex_AsSsize_t(__pyx_v_f_id); if (unlikely((__pyx_t_15 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 311; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             (__pyx_v_fcount->arr[__pyx_t_15]) = ((__pyx_v_fcount->arr[__pyx_t_18]) + 1);
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":312
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":312
  *                 index = self.f_index.arr[f_id] + fcount.arr[f_id]
  *                 fcount.arr[f_id] = fcount.arr[f_id] + 1
  *                 self.e_index.arr[index] = int(e_id)             # <<<<<<<<<<<<<<
@@ -17806,7 +17806,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             __pyx_t_18 = __Pyx_PyIndex_AsSsize_t(__pyx_v_index); if (unlikely((__pyx_t_18 == (Py_ssize_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 312; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             (__pyx_v_self->e_index->arr[__pyx_t_18]) = __pyx_t_21;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":313
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":313
  *                 fcount.arr[f_id] = fcount.arr[f_id] + 1
  *                 self.e_index.arr[index] = int(e_id)
  *                 self.col1[index] = float(score1)             # <<<<<<<<<<<<<<
@@ -17819,7 +17819,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
             if (unlikely(PyObject_SetItem(((PyObject *)__pyx_v_self->col1), __pyx_v_index, __pyx_t_3) < 0)) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 313; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
             __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":314
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":314
  *                 self.e_index.arr[index] = int(e_id)
  *                 self.col1[index] = float(score1)
  *                 self.col2[index] = float(score2)             # <<<<<<<<<<<<<<
@@ -17847,7 +17847,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
         __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
         __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":281
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":281
  * 
  *         fcount = IntList()
  *         with gzip_or_text(filename) as f:             # <<<<<<<<<<<<<<
@@ -17918,7 +17918,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
     __pyx_L31:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":317
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":317
  * 
  *         # Sort buckets by eword
  *         for b from 0 <= b < n_f:             # <<<<<<<<<<<<<<
@@ -17933,7 +17933,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
     __Pyx_XDECREF_SET(__pyx_v_b, __pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":318
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":318
  *         # Sort buckets by eword
  *         for b from 0 <= b < n_f:
  *             i = self.f_index.arr[b]             # <<<<<<<<<<<<<<
@@ -17946,7 +17946,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
     __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":319
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":319
  *         for b from 0 <= b < n_f:
  *             i = self.f_index.arr[b]
  *             j = self.f_index.arr[b+1]             # <<<<<<<<<<<<<<
@@ -17962,7 +17962,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
     __Pyx_XDECREF_SET(__pyx_v_j, __pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":320
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":320
  *             i = self.f_index.arr[b]
  *             j = self.f_index.arr[b+1]
  *             self.qsort(i,j, "")             # <<<<<<<<<<<<<<
@@ -17977,7 +17977,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
     __pyx_t_19 = __Pyx_PyInt_As_long(__pyx_v_b); if (unlikely((__pyx_t_19 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 317; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":317
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":317
  * 
  *         # Sort buckets by eword
  *         for b from 0 <= b < n_f:             # <<<<<<<<<<<<<<
@@ -17989,7 +17989,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
   __Pyx_XDECREF_SET(__pyx_v_b, __pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":276
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":276
  * 
  * 
  *     def read_text(self, char* filename):             # <<<<<<<<<<<<<<
@@ -18031,7 +18031,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_14read_text(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":323
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":323
  * 
  * 
  *     cdef swap(self, int i, int j):             # <<<<<<<<<<<<<<
@@ -18047,7 +18047,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_swap(struct __pyx_obj_4cdec_2sa_3
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("swap", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":327
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":327
  *         cdef float ftmp
  * 
  *         if i == j:             # <<<<<<<<<<<<<<
@@ -18057,7 +18057,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_swap(struct __pyx_obj_4cdec_2sa_3
   __pyx_t_1 = ((__pyx_v_i == __pyx_v_j) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":328
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":328
  * 
  *         if i == j:
  *             return             # <<<<<<<<<<<<<<
@@ -18069,7 +18069,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_swap(struct __pyx_obj_4cdec_2sa_3
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":330
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":330
  *             return
  * 
  *         itmp = self.e_index.arr[i]             # <<<<<<<<<<<<<<
@@ -18078,7 +18078,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_swap(struct __pyx_obj_4cdec_2sa_3
  */
   __pyx_v_itmp = (__pyx_v_self->e_index->arr[__pyx_v_i]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":331
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":331
  * 
  *         itmp = self.e_index.arr[i]
  *         self.e_index.arr[i] = self.e_index.arr[j]             # <<<<<<<<<<<<<<
@@ -18087,7 +18087,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_swap(struct __pyx_obj_4cdec_2sa_3
  */
   (__pyx_v_self->e_index->arr[__pyx_v_i]) = (__pyx_v_self->e_index->arr[__pyx_v_j]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":332
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":332
  *         itmp = self.e_index.arr[i]
  *         self.e_index.arr[i] = self.e_index.arr[j]
  *         self.e_index.arr[j] = itmp             # <<<<<<<<<<<<<<
@@ -18096,7 +18096,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_swap(struct __pyx_obj_4cdec_2sa_3
  */
   (__pyx_v_self->e_index->arr[__pyx_v_j]) = __pyx_v_itmp;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":334
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":334
  *         self.e_index.arr[j] = itmp
  * 
  *         ftmp = self.col1.arr[i]             # <<<<<<<<<<<<<<
@@ -18105,7 +18105,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_swap(struct __pyx_obj_4cdec_2sa_3
  */
   __pyx_v_ftmp = (__pyx_v_self->col1->arr[__pyx_v_i]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":335
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":335
  * 
  *         ftmp = self.col1.arr[i]
  *         self.col1.arr[i] = self.col1.arr[j]             # <<<<<<<<<<<<<<
@@ -18114,7 +18114,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_swap(struct __pyx_obj_4cdec_2sa_3
  */
   (__pyx_v_self->col1->arr[__pyx_v_i]) = (__pyx_v_self->col1->arr[__pyx_v_j]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":336
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":336
  *         ftmp = self.col1.arr[i]
  *         self.col1.arr[i] = self.col1.arr[j]
  *         self.col1.arr[j] = ftmp             # <<<<<<<<<<<<<<
@@ -18123,7 +18123,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_swap(struct __pyx_obj_4cdec_2sa_3
  */
   (__pyx_v_self->col1->arr[__pyx_v_j]) = __pyx_v_ftmp;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":338
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":338
  *         self.col1.arr[j] = ftmp
  * 
  *         ftmp = self.col2.arr[i]             # <<<<<<<<<<<<<<
@@ -18132,7 +18132,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_swap(struct __pyx_obj_4cdec_2sa_3
  */
   __pyx_v_ftmp = (__pyx_v_self->col2->arr[__pyx_v_i]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":339
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":339
  * 
  *         ftmp = self.col2.arr[i]
  *         self.col2.arr[i] = self.col2.arr[j]             # <<<<<<<<<<<<<<
@@ -18141,7 +18141,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_swap(struct __pyx_obj_4cdec_2sa_3
  */
   (__pyx_v_self->col2->arr[__pyx_v_i]) = (__pyx_v_self->col2->arr[__pyx_v_j]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":340
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":340
  *         ftmp = self.col2.arr[i]
  *         self.col2.arr[i] = self.col2.arr[j]
  *         self.col2.arr[j] = ftmp             # <<<<<<<<<<<<<<
@@ -18150,7 +18150,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_swap(struct __pyx_obj_4cdec_2sa_3
  */
   (__pyx_v_self->col2->arr[__pyx_v_j]) = __pyx_v_ftmp;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":323
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":323
  * 
  * 
  *     cdef swap(self, int i, int j):             # <<<<<<<<<<<<<<
@@ -18166,7 +18166,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_swap(struct __pyx_obj_4cdec_2sa_3
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":343
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":343
  * 
  * 
  *     cdef qsort(self, int i, int j, pad):             # <<<<<<<<<<<<<<
@@ -18189,7 +18189,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("qsort", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":346
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":346
  *         cdef int pval, p
  * 
  *         if i > j:             # <<<<<<<<<<<<<<
@@ -18199,7 +18199,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
   __pyx_t_1 = ((__pyx_v_i > __pyx_v_j) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":347
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":347
  * 
  *         if i > j:
  *             raise Exception("Sort error in CLex")             # <<<<<<<<<<<<<<
@@ -18213,7 +18213,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
     {__pyx_filename = __pyx_f[5]; __pyx_lineno = 347; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":348
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":348
  *         if i > j:
  *             raise Exception("Sort error in CLex")
  *         if i == j: #empty interval             # <<<<<<<<<<<<<<
@@ -18223,7 +18223,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
   __pyx_t_1 = ((__pyx_v_i == __pyx_v_j) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":349
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":349
  *             raise Exception("Sort error in CLex")
  *         if i == j: #empty interval
  *             return             # <<<<<<<<<<<<<<
@@ -18235,7 +18235,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":350
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":350
  *         if i == j: #empty interval
  *             return
  *         if i == j-1: # singleton interval             # <<<<<<<<<<<<<<
@@ -18245,7 +18245,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
   __pyx_t_1 = ((__pyx_v_i == (__pyx_v_j - 1)) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":351
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":351
  *             return
  *         if i == j-1: # singleton interval
  *             return             # <<<<<<<<<<<<<<
@@ -18257,7 +18257,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":353
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":353
  *             return
  * 
  *         p = (i+j)/2             # <<<<<<<<<<<<<<
@@ -18266,7 +18266,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
  */
   __pyx_v_p = __Pyx_div_long((__pyx_v_i + __pyx_v_j), 2);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":354
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":354
  * 
  *         p = (i+j)/2
  *         pval = self.e_index.arr[p]             # <<<<<<<<<<<<<<
@@ -18275,7 +18275,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
  */
   __pyx_v_pval = (__pyx_v_self->e_index->arr[__pyx_v_p]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":355
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":355
  *         p = (i+j)/2
  *         pval = self.e_index.arr[p]
  *         self.swap(i, p)             # <<<<<<<<<<<<<<
@@ -18286,7 +18286,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":356
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":356
  *         pval = self.e_index.arr[p]
  *         self.swap(i, p)
  *         p = i             # <<<<<<<<<<<<<<
@@ -18295,7 +18295,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
  */
   __pyx_v_p = __pyx_v_i;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":357
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":357
  *         self.swap(i, p)
  *         p = i
  *         for k from i+1 <= k < j:             # <<<<<<<<<<<<<<
@@ -18305,7 +18305,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
   __pyx_t_3 = __pyx_v_j;
   for (__pyx_v_k = (__pyx_v_i + 1); __pyx_v_k < __pyx_t_3; __pyx_v_k++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":358
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":358
  *         p = i
  *         for k from i+1 <= k < j:
  *             if pval >= self.e_index.arr[k]:             # <<<<<<<<<<<<<<
@@ -18315,7 +18315,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
     __pyx_t_1 = ((__pyx_v_pval >= (__pyx_v_self->e_index->arr[__pyx_v_k])) != 0);
     if (__pyx_t_1) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":359
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":359
  *         for k from i+1 <= k < j:
  *             if pval >= self.e_index.arr[k]:
  *                 self.swap(p+1, k)             # <<<<<<<<<<<<<<
@@ -18326,7 +18326,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":360
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":360
  *             if pval >= self.e_index.arr[k]:
  *                 self.swap(p+1, k)
  *                 self.swap(p, p+1)             # <<<<<<<<<<<<<<
@@ -18337,7 +18337,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":361
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":361
  *                 self.swap(p+1, k)
  *                 self.swap(p, p+1)
  *                 p = p + 1             # <<<<<<<<<<<<<<
@@ -18350,7 +18350,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
     __pyx_L8:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":362
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":362
  *                 self.swap(p, p+1)
  *                 p = p + 1
  *         self.qsort(i,p, pad+"    ")             # <<<<<<<<<<<<<<
@@ -18364,7 +18364,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":363
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":363
  *                 p = p + 1
  *         self.qsort(i,p, pad+"    ")
  *         self.qsort(p+1,j, pad+"    ")             # <<<<<<<<<<<<<<
@@ -18378,7 +18378,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":343
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":343
  * 
  * 
  *     cdef qsort(self, int i, int j, pad):             # <<<<<<<<<<<<<<
@@ -18400,7 +18400,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_5BiLex_qsort(struct __pyx_obj_4cdec_2sa_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":366
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":366
  * 
  * 
  *     def write_enhanced(self, char* filename):             # <<<<<<<<<<<<<<
@@ -18463,7 +18463,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("write_enhanced", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":367
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":367
  * 
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -18503,7 +18503,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
           __pyx_v_f = __pyx_t_4;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":368
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":368
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:
  *             for i in self.f_index:             # <<<<<<<<<<<<<<
@@ -18548,7 +18548,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
             __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_1);
             __pyx_t_1 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":369
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":369
  *         with open(filename, "w") as f:
  *             for i in self.f_index:
  *                 f.write("%d " % i)             # <<<<<<<<<<<<<<
@@ -18572,7 +18572,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
           }
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":370
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":370
  *             for i in self.f_index:
  *                 f.write("%d " % i)
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -18586,7 +18586,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":371
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":371
  *                 f.write("%d " % i)
  *             f.write("\n")
  *             for i, s1, s2 in zip(self.e_index, self.col1, self.col2):             # <<<<<<<<<<<<<<
@@ -18707,7 +18707,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
             __Pyx_XDECREF_SET(__pyx_v_s2, __pyx_t_11);
             __pyx_t_11 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":372
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":372
  *             f.write("\n")
  *             for i, s1, s2 in zip(self.e_index, self.col1, self.col2):
  *                 f.write("%d %f %f " % (i, s1, s2))             # <<<<<<<<<<<<<<
@@ -18743,7 +18743,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
           }
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":373
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":373
  *             for i, s1, s2 in zip(self.e_index, self.col1, self.col2):
  *                 f.write("%d %f %f " % (i, s1, s2))
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -18757,7 +18757,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":374
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":374
  *                 f.write("%d %f %f " % (i, s1, s2))
  *             f.write("\n")
  *             for i, w in enumerate(self.id2fword):             # <<<<<<<<<<<<<<
@@ -18811,7 +18811,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
             __pyx_t_1 = __pyx_t_11;
             __pyx_t_11 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":375
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":375
  *             f.write("\n")
  *             for i, w in enumerate(self.id2fword):
  *                 f.write("%d %s " % (i, w))             # <<<<<<<<<<<<<<
@@ -18845,7 +18845,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":376
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":376
  *             for i, w in enumerate(self.id2fword):
  *                 f.write("%d %s " % (i, w))
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -18859,7 +18859,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":377
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":377
  *                 f.write("%d %s " % (i, w))
  *             f.write("\n")
  *             for i, w in enumerate(self.id2eword):             # <<<<<<<<<<<<<<
@@ -18913,7 +18913,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
             __pyx_t_2 = __pyx_t_10;
             __pyx_t_10 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":378
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":378
  *             f.write("\n")
  *             for i, w in enumerate(self.id2eword):
  *                 f.write("%d %s " % (i, w))             # <<<<<<<<<<<<<<
@@ -18947,7 +18947,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":379
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":379
  *             for i, w in enumerate(self.id2eword):
  *                 f.write("%d %s " % (i, w))
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -18973,7 +18973,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
         __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
         __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":367
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":367
  * 
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -19044,7 +19044,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
     __pyx_L29:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":366
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":366
  * 
  * 
  *     def write_enhanced(self, char* filename):             # <<<<<<<<<<<<<<
@@ -19075,7 +19075,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_16write_enhanced(struct __pyx_ob
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":382
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":382
  * 
  * 
  *     def get_score(self, fword, eword, col):             # <<<<<<<<<<<<<<
@@ -19172,7 +19172,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_score", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":385
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":385
  *         cdef e_id, f_id, low, high, midpoint, val
  * 
  *         if eword not in self.eword2id:             # <<<<<<<<<<<<<<
@@ -19183,7 +19183,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":386
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":386
  * 
  *         if eword not in self.eword2id:
  *             return None             # <<<<<<<<<<<<<<
@@ -19196,7 +19196,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":387
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":387
  *         if eword not in self.eword2id:
  *             return None
  *         if fword not in self.fword2id:             # <<<<<<<<<<<<<<
@@ -19207,7 +19207,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
   __pyx_t_1 = (__pyx_t_2 != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":388
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":388
  *             return None
  *         if fword not in self.fword2id:
  *             return None             # <<<<<<<<<<<<<<
@@ -19220,7 +19220,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":389
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":389
  *         if fword not in self.fword2id:
  *             return None
  *         f_id = self.fword2id[fword]             # <<<<<<<<<<<<<<
@@ -19232,7 +19232,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
   __pyx_v_f_id = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":390
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":390
  *             return None
  *         f_id = self.fword2id[fword]
  *         e_id = self.eword2id[eword]             # <<<<<<<<<<<<<<
@@ -19244,7 +19244,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
   __pyx_v_e_id = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":391
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":391
  *         f_id = self.fword2id[fword]
  *         e_id = self.eword2id[eword]
  *         low = self.f_index.arr[f_id]             # <<<<<<<<<<<<<<
@@ -19257,7 +19257,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
   __pyx_v_low = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":392
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":392
  *         e_id = self.eword2id[eword]
  *         low = self.f_index.arr[f_id]
  *         high = self.f_index.arr[f_id+1]             # <<<<<<<<<<<<<<
@@ -19273,7 +19273,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
   __pyx_v_high = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":393
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":393
  *         low = self.f_index.arr[f_id]
  *         high = self.f_index.arr[f_id+1]
  *         while high - low > 0:             # <<<<<<<<<<<<<<
@@ -19289,7 +19289,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     if (!__pyx_t_1) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":394
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":394
  *         high = self.f_index.arr[f_id+1]
  *         while high - low > 0:
  *             midpoint = (low+high)/2             # <<<<<<<<<<<<<<
@@ -19304,7 +19304,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
     __Pyx_XDECREF_SET(__pyx_v_midpoint, __pyx_t_3);
     __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":395
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":395
  *         while high - low > 0:
  *             midpoint = (low+high)/2
  *             val = self.e_index.arr[midpoint]             # <<<<<<<<<<<<<<
@@ -19317,7 +19317,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
     __Pyx_XDECREF_SET(__pyx_v_val, __pyx_t_3);
     __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":396
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":396
  *             midpoint = (low+high)/2
  *             val = self.e_index.arr[midpoint]
  *             if val == e_id:             # <<<<<<<<<<<<<<
@@ -19329,7 +19329,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     if (__pyx_t_1) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":397
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":397
  *             val = self.e_index.arr[midpoint]
  *             if val == e_id:
  *                 if col == 0:             # <<<<<<<<<<<<<<
@@ -19341,7 +19341,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
       if (__pyx_t_1) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":398
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":398
  *             if val == e_id:
  *                 if col == 0:
  *                     return self.col1.arr[midpoint]             # <<<<<<<<<<<<<<
@@ -19357,7 +19357,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
         goto __pyx_L0;
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":399
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":399
  *                 if col == 0:
  *                     return self.col1.arr[midpoint]
  *                 if col == 1:             # <<<<<<<<<<<<<<
@@ -19369,7 +19369,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
       if (__pyx_t_1) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":400
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":400
  *                     return self.col1.arr[midpoint]
  *                 if col == 1:
  *                     return self.col2.arr[midpoint]             # <<<<<<<<<<<<<<
@@ -19388,7 +19388,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
     }
     __pyx_L7:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":401
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":401
  *                 if col == 1:
  *                     return self.col2.arr[midpoint]
  *             if val > e_id:             # <<<<<<<<<<<<<<
@@ -19400,7 +19400,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     if (__pyx_t_1) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":402
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":402
  *                     return self.col2.arr[midpoint]
  *             if val > e_id:
  *                 high = midpoint             # <<<<<<<<<<<<<<
@@ -19413,7 +19413,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
     }
     __pyx_L10:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":403
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":403
  *             if val > e_id:
  *                 high = midpoint
  *             if val < e_id:             # <<<<<<<<<<<<<<
@@ -19425,7 +19425,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     if (__pyx_t_1) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":404
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":404
  *                 high = midpoint
  *             if val < e_id:
  *                 low = midpoint + 1             # <<<<<<<<<<<<<<
@@ -19441,7 +19441,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
     __pyx_L11:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":405
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":405
  *             if val < e_id:
  *                 low = midpoint + 1
  *         return None             # <<<<<<<<<<<<<<
@@ -19453,7 +19453,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
   __pyx_r = Py_None;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":382
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":382
  * 
  * 
  *     def get_score(self, fword, eword, col):             # <<<<<<<<<<<<<<
@@ -19479,7 +19479,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_18get_score(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":408
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":408
  * 
  * 
  *     def write_text(self, char* filename):             # <<<<<<<<<<<<<<
@@ -19543,7 +19543,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_20write_text(struct __pyx_obj_4c
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("write_text", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":412
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":412
  *         cdef i, N, e_id, f_id
  * 
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -19583,7 +19583,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_20write_text(struct __pyx_obj_4c
           __pyx_v_f = __pyx_t_4;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":413
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":413
  * 
  *         with open(filename, "w") as f:
  *             N = len(self.e_index)             # <<<<<<<<<<<<<<
@@ -19599,7 +19599,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_20write_text(struct __pyx_obj_4c
           __pyx_v_N = __pyx_t_4;
           __pyx_t_4 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":414
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":414
  *         with open(filename, "w") as f:
  *             N = len(self.e_index)
  *             f_id = 0             # <<<<<<<<<<<<<<
@@ -19609,7 +19609,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_20write_text(struct __pyx_obj_4c
           __Pyx_INCREF(__pyx_int_0);
           __pyx_v_f_id = __pyx_int_0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":415
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":415
  *             N = len(self.e_index)
  *             f_id = 0
  *             for i from 0 <= i < N:             # <<<<<<<<<<<<<<
@@ -19623,7 +19623,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_20write_text(struct __pyx_obj_4c
             __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_4);
             __pyx_t_4 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":416
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":416
  *             f_id = 0
  *             for i from 0 <= i < N:
  *                 while self.f_index.arr[f_id+1] == i:             # <<<<<<<<<<<<<<
@@ -19643,7 +19643,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_20write_text(struct __pyx_obj_4c
               __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
               if (!__pyx_t_11) break;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":417
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":417
  *             for i from 0 <= i < N:
  *                 while self.f_index.arr[f_id+1] == i:
  *                     f_id = f_id + 1             # <<<<<<<<<<<<<<
@@ -19656,7 +19656,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_20write_text(struct __pyx_obj_4c
               __pyx_t_1 = 0;
             }
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":418
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":418
  *                 while self.f_index.arr[f_id+1] == i:
  *                     f_id = f_id + 1
  *                 e_id = self.e_index.arr[i]             # <<<<<<<<<<<<<<
@@ -19669,7 +19669,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_20write_text(struct __pyx_obj_4c
             __Pyx_XDECREF_SET(__pyx_v_e_id, __pyx_t_1);
             __pyx_t_1 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":419
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":419
  *                     f_id = f_id + 1
  *                 e_id = self.e_index.arr[i]
  *                 score1 = self.col1.arr[i]             # <<<<<<<<<<<<<<
@@ -19682,7 +19682,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_20write_text(struct __pyx_obj_4c
             __Pyx_XDECREF_SET(__pyx_v_score1, __pyx_t_1);
             __pyx_t_1 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":420
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":420
  *                 e_id = self.e_index.arr[i]
  *                 score1 = self.col1.arr[i]
  *                 score2 = self.col2.arr[i]             # <<<<<<<<<<<<<<
@@ -19694,7 +19694,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_20write_text(struct __pyx_obj_4c
             __Pyx_XDECREF_SET(__pyx_v_score2, __pyx_t_1);
             __pyx_t_1 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":421
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":421
  *                 score1 = self.col1.arr[i]
  *                 score2 = self.col2.arr[i]
  *                 f.write("%s %s %.6f %.6f\n" % (self.id2fword[f_id], self.id2eword[e_id], score1, score2))             # <<<<<<<<<<<<<<
@@ -19735,7 +19735,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_20write_text(struct __pyx_obj_4c
             __pyx_t_10 = __Pyx_PyInt_As_long(__pyx_v_i); if (unlikely((__pyx_t_10 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[5]; __pyx_lineno = 415; __pyx_clineno = __LINE__; goto __pyx_L7_error;}
           }
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":415
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":415
  *             N = len(self.e_index)
  *             f_id = 0
  *             for i from 0 <= i < N:             # <<<<<<<<<<<<<<
@@ -19757,7 +19757,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_20write_text(struct __pyx_obj_4c
         __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0;
         __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":412
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":412
  *         cdef i, N, e_id, f_id
  * 
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -19828,7 +19828,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_20write_text(struct __pyx_obj_4c
     __pyx_L23:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":408
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":408
  * 
  * 
  *     def write_text(self, char* filename):             # <<<<<<<<<<<<<<
@@ -19859,7 +19859,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_5BiLex_20write_text(struct __pyx_obj_4c
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":21
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":21
  * cdef int LOWER_MASK[32]
  * 
  * cdef void _init_lower_mask():             # <<<<<<<<<<<<<<
@@ -19875,7 +19875,7 @@ static void __pyx_f_4cdec_2sa_3_sa__init_lower_mask(void) {
   unsigned int __pyx_t_2;
   __Pyx_RefNannySetupContext("_init_lower_mask", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":23
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":23
  * cdef void _init_lower_mask():
  *     cdef unsigned i
  *     cdef int mask = 0             # <<<<<<<<<<<<<<
@@ -19884,7 +19884,7 @@ static void __pyx_f_4cdec_2sa_3_sa__init_lower_mask(void) {
  */
   __pyx_v_mask = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":24
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":24
  *     cdef unsigned i
  *     cdef int mask = 0
  *     for i in range(MIN_BOTTOM_SIZE):             # <<<<<<<<<<<<<<
@@ -19895,7 +19895,7 @@ static void __pyx_f_4cdec_2sa_3_sa__init_lower_mask(void) {
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_v_i = __pyx_t_2;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":25
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":25
  *     cdef int mask = 0
  *     for i in range(MIN_BOTTOM_SIZE):
  *         mask = (mask << 1) + 1             # <<<<<<<<<<<<<<
@@ -19904,7 +19904,7 @@ static void __pyx_f_4cdec_2sa_3_sa__init_lower_mask(void) {
  */
     __pyx_v_mask = ((__pyx_v_mask << 1) + 1);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":26
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":26
  *     for i in range(MIN_BOTTOM_SIZE):
  *         mask = (mask << 1) + 1
  *         LOWER_MASK[i] = mask             # <<<<<<<<<<<<<<
@@ -19914,7 +19914,7 @@ static void __pyx_f_4cdec_2sa_3_sa__init_lower_mask(void) {
     (__pyx_v_4cdec_2sa_3_sa_LOWER_MASK[__pyx_v_i]) = __pyx_v_mask;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":21
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":21
  * cdef int LOWER_MASK[32]
  * 
  * cdef void _init_lower_mask():             # <<<<<<<<<<<<<<
@@ -19926,7 +19926,7 @@ static void __pyx_f_4cdec_2sa_3_sa__init_lower_mask(void) {
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":37
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":37
  * 
  * 
  * cdef _BitSet* new_BitSet():             # <<<<<<<<<<<<<<
@@ -19940,7 +19940,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__BitSet *__pyx_f_4cdec_2sa_3_sa_new_BitSet(
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("new_BitSet", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":40
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":40
  *     cdef _BitSet* b
  * 
  *     b = <_BitSet*> malloc(sizeof(_BitSet))             # <<<<<<<<<<<<<<
@@ -19949,7 +19949,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__BitSet *__pyx_f_4cdec_2sa_3_sa_new_BitSet(
  */
   __pyx_v_b = ((struct __pyx_t_4cdec_2sa_3_sa__BitSet *)malloc((sizeof(struct __pyx_t_4cdec_2sa_3_sa__BitSet))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":41
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":41
  * 
  *     b = <_BitSet*> malloc(sizeof(_BitSet))
  *     b.bitset = 0             # <<<<<<<<<<<<<<
@@ -19958,7 +19958,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__BitSet *__pyx_f_4cdec_2sa_3_sa_new_BitSet(
  */
   __pyx_v_b->bitset = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":42
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":42
  *     b = <_BitSet*> malloc(sizeof(_BitSet))
  *     b.bitset = 0
  *     b.min_val = -1             # <<<<<<<<<<<<<<
@@ -19967,7 +19967,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__BitSet *__pyx_f_4cdec_2sa_3_sa_new_BitSet(
  */
   __pyx_v_b->min_val = -1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":43
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":43
  *     b.bitset = 0
  *     b.min_val = -1
  *     b.max_val = -1             # <<<<<<<<<<<<<<
@@ -19976,7 +19976,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__BitSet *__pyx_f_4cdec_2sa_3_sa_new_BitSet(
  */
   __pyx_v_b->max_val = -1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":44
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":44
  *     b.min_val = -1
  *     b.max_val = -1
  *     b.size = 0             # <<<<<<<<<<<<<<
@@ -19985,7 +19985,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__BitSet *__pyx_f_4cdec_2sa_3_sa_new_BitSet(
  */
   __pyx_v_b->size = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":45
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":45
  *     b.max_val = -1
  *     b.size = 0
  *     return b             # <<<<<<<<<<<<<<
@@ -19995,7 +19995,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__BitSet *__pyx_f_4cdec_2sa_3_sa_new_BitSet(
   __pyx_r = __pyx_v_b;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":37
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":37
  * 
  * 
  * cdef _BitSet* new_BitSet():             # <<<<<<<<<<<<<<
@@ -20009,7 +20009,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__BitSet *__pyx_f_4cdec_2sa_3_sa_new_BitSet(
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":48
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":48
  * 
  * 
  * cdef int bitset_findsucc(_BitSet* b, int i):             # <<<<<<<<<<<<<<
@@ -20030,7 +20030,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
   int __pyx_t_3;
   __Pyx_RefNannySetupContext("bitset_findsucc", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":52
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":52
  *     cdef int low, high, mid
  * 
  *     if b.max_val == -1 or i >= b.max_val:             # <<<<<<<<<<<<<<
@@ -20046,7 +20046,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
   }
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":53
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":53
  * 
  *     if b.max_val == -1 or i >= b.max_val:
  *         return -1             # <<<<<<<<<<<<<<
@@ -20057,7 +20057,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":54
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":54
  *     if b.max_val == -1 or i >= b.max_val:
  *         return -1
  *     if i < b.min_val:             # <<<<<<<<<<<<<<
@@ -20067,7 +20067,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
   __pyx_t_3 = ((__pyx_v_i < __pyx_v_b->min_val) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":55
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":55
  *         return -1
  *     if i < b.min_val:
  *         return b.min_val             # <<<<<<<<<<<<<<
@@ -20078,7 +20078,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":57
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":57
  *         return b.min_val
  * 
  *     bitset = b.bitset & ~LOWER_MASK[i]             # <<<<<<<<<<<<<<
@@ -20087,7 +20087,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
  */
   __pyx_v_bitset = (__pyx_v_b->bitset & (~(__pyx_v_4cdec_2sa_3_sa_LOWER_MASK[__pyx_v_i])));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":58
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":58
  * 
  *     bitset = b.bitset & ~LOWER_MASK[i]
  *     low = i+1             # <<<<<<<<<<<<<<
@@ -20096,7 +20096,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
  */
   __pyx_v_low = (__pyx_v_i + 1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":59
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":59
  *     bitset = b.bitset & ~LOWER_MASK[i]
  *     low = i+1
  *     high = b.max_val+1             # <<<<<<<<<<<<<<
@@ -20105,7 +20105,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
  */
   __pyx_v_high = (__pyx_v_b->max_val + 1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":60
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":60
  *     low = i+1
  *     high = b.max_val+1
  *     while low < high-1:             # <<<<<<<<<<<<<<
@@ -20116,7 +20116,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
     __pyx_t_3 = ((__pyx_v_low < (__pyx_v_high - 1)) != 0);
     if (!__pyx_t_3) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":61
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":61
  *     high = b.max_val+1
  *     while low < high-1:
  *         mid = (high + low)/2             # <<<<<<<<<<<<<<
@@ -20125,7 +20125,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
  */
     __pyx_v_mid = __Pyx_div_long((__pyx_v_high + __pyx_v_low), 2);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":62
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":62
  *     while low < high-1:
  *         mid = (high + low)/2
  *         mask = ~(LOWER_MASK[high-1] ^ LOWER_MASK[mid-1])             # <<<<<<<<<<<<<<
@@ -20134,7 +20134,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
  */
     __pyx_v_mask = (~((__pyx_v_4cdec_2sa_3_sa_LOWER_MASK[(__pyx_v_high - 1)]) ^ (__pyx_v_4cdec_2sa_3_sa_LOWER_MASK[(__pyx_v_mid - 1)])));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":63
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":63
  *         mid = (high + low)/2
  *         mask = ~(LOWER_MASK[high-1] ^ LOWER_MASK[mid-1])
  *         if bitset & mask == 0:             # <<<<<<<<<<<<<<
@@ -20144,7 +20144,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
     __pyx_t_3 = (((__pyx_v_bitset & __pyx_v_mask) == 0) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":64
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":64
  *         mask = ~(LOWER_MASK[high-1] ^ LOWER_MASK[mid-1])
  *         if bitset & mask == 0:
  *             low = mid             # <<<<<<<<<<<<<<
@@ -20156,7 +20156,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":66
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":66
  *             low = mid
  *         else:
  *             bitset = bitset & mask             # <<<<<<<<<<<<<<
@@ -20165,7 +20165,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
  */
       __pyx_v_bitset = (__pyx_v_bitset & __pyx_v_mask);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":67
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":67
  *         else:
  *             bitset = bitset & mask
  *             high = mid             # <<<<<<<<<<<<<<
@@ -20177,7 +20177,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
     __pyx_L7:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":68
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":68
  *             bitset = bitset & mask
  *             high = mid
  *     return low             # <<<<<<<<<<<<<<
@@ -20187,7 +20187,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
   __pyx_r = __pyx_v_low;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":48
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":48
  * 
  * 
  * cdef int bitset_findsucc(_BitSet* b, int i):             # <<<<<<<<<<<<<<
@@ -20201,7 +20201,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(struct __pyx_t_4cdec_2sa_3_sa_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":71
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":71
  * 
  * 
  * cdef int bitset_insert(_BitSet* b, int i):             # <<<<<<<<<<<<<<
@@ -20216,7 +20216,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("bitset_insert", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":74
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":74
  *     cdef int val
  * 
  *     val = 1 << i             # <<<<<<<<<<<<<<
@@ -20225,7 +20225,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
  */
   __pyx_v_val = (1 << __pyx_v_i);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":75
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":75
  * 
  *     val = 1 << i
  *     if b.bitset & val == 0:             # <<<<<<<<<<<<<<
@@ -20235,7 +20235,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
   __pyx_t_1 = (((__pyx_v_b->bitset & __pyx_v_val) == 0) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":76
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":76
  *     val = 1 << i
  *     if b.bitset & val == 0:
  *         b.bitset = b.bitset | val             # <<<<<<<<<<<<<<
@@ -20244,7 +20244,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
  */
     __pyx_v_b->bitset = (__pyx_v_b->bitset | __pyx_v_val);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":77
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":77
  *     if b.bitset & val == 0:
  *         b.bitset = b.bitset | val
  *         if b.size == 0:             # <<<<<<<<<<<<<<
@@ -20254,7 +20254,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
     __pyx_t_1 = ((__pyx_v_b->size == 0) != 0);
     if (__pyx_t_1) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":78
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":78
  *         b.bitset = b.bitset | val
  *         if b.size == 0:
  *             b.min_val = i             # <<<<<<<<<<<<<<
@@ -20263,7 +20263,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
  */
       __pyx_v_b->min_val = __pyx_v_i;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":79
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":79
  *         if b.size == 0:
  *             b.min_val = i
  *             b.max_val = i             # <<<<<<<<<<<<<<
@@ -20275,7 +20275,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":81
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":81
  *             b.max_val = i
  *         else:
  *             if i < b.min_val:             # <<<<<<<<<<<<<<
@@ -20285,7 +20285,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
       __pyx_t_1 = ((__pyx_v_i < __pyx_v_b->min_val) != 0);
       if (__pyx_t_1) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":82
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":82
  *         else:
  *             if i < b.min_val:
  *                 b.min_val = i             # <<<<<<<<<<<<<<
@@ -20297,7 +20297,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
       }
       __pyx_L5:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":83
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":83
  *             if i < b.min_val:
  *                 b.min_val = i
  *             if i > b.max_val:             # <<<<<<<<<<<<<<
@@ -20307,7 +20307,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
       __pyx_t_1 = ((__pyx_v_i > __pyx_v_b->max_val) != 0);
       if (__pyx_t_1) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":84
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":84
  *                 b.min_val = i
  *             if i > b.max_val:
  *                 b.max_val = i             # <<<<<<<<<<<<<<
@@ -20321,7 +20321,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
     }
     __pyx_L4:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":85
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":85
  *             if i > b.max_val:
  *                 b.max_val = i
  *         b.size = b.size + 1             # <<<<<<<<<<<<<<
@@ -20330,7 +20330,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
  */
     __pyx_v_b->size = (__pyx_v_b->size + 1);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":86
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":86
  *                 b.max_val = i
  *         b.size = b.size + 1
  *         return 1             # <<<<<<<<<<<<<<
@@ -20341,7 +20341,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":87
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":87
  *         b.size = b.size + 1
  *         return 1
  *     return 0             # <<<<<<<<<<<<<<
@@ -20351,7 +20351,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":71
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":71
  * 
  * 
  * cdef int bitset_insert(_BitSet* b, int i):             # <<<<<<<<<<<<<<
@@ -20365,7 +20365,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_insert(struct __pyx_t_4cdec_2sa_3_sa__B
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":90
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":90
  * 
  * 
  * cdef int bitset_contains(_BitSet* b, int i):             # <<<<<<<<<<<<<<
@@ -20380,7 +20380,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_contains(struct __pyx_t_4cdec_2sa_3_sa_
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("bitset_contains", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":93
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":93
  *     cdef int val
  * 
  *     val = 1 << i             # <<<<<<<<<<<<<<
@@ -20389,7 +20389,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_contains(struct __pyx_t_4cdec_2sa_3_sa_
  */
   __pyx_v_val = (1 << __pyx_v_i);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":94
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":94
  * 
  *     val = 1 << i
  *     if b.bitset & val == 0:             # <<<<<<<<<<<<<<
@@ -20399,7 +20399,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_contains(struct __pyx_t_4cdec_2sa_3_sa_
   __pyx_t_1 = (((__pyx_v_b->bitset & __pyx_v_val) == 0) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":95
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":95
  *     val = 1 << i
  *     if b.bitset & val == 0:
  *         return 0             # <<<<<<<<<<<<<<
@@ -20411,7 +20411,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_contains(struct __pyx_t_4cdec_2sa_3_sa_
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":97
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":97
  *         return 0
  *     else:
  *         return 1             # <<<<<<<<<<<<<<
@@ -20422,7 +20422,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_contains(struct __pyx_t_4cdec_2sa_3_sa_
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":90
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":90
  * 
  * 
  * cdef int bitset_contains(_BitSet* b, int i):             # <<<<<<<<<<<<<<
@@ -20436,7 +20436,7 @@ static int __pyx_f_4cdec_2sa_3_sa_bitset_contains(struct __pyx_t_4cdec_2sa_3_sa_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":104
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":104
  *     cdef int next_val
  * 
  *     def __next__(self):             # <<<<<<<<<<<<<<
@@ -20469,7 +20469,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14BitSetIterator___next__(struct __pyx_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__next__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":107
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":107
  *         cdef int ret_val
  * 
  *         if self.next_val == -1:             # <<<<<<<<<<<<<<
@@ -20479,7 +20479,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14BitSetIterator___next__(struct __pyx_
   __pyx_t_1 = ((__pyx_v_self->next_val == -1) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":108
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":108
  * 
  *         if self.next_val == -1:
  *             raise StopIteration()             # <<<<<<<<<<<<<<
@@ -20493,7 +20493,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14BitSetIterator___next__(struct __pyx_
     {__pyx_filename = __pyx_f[6]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":109
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":109
  *         if self.next_val == -1:
  *             raise StopIteration()
  *         ret_val = self.next_val             # <<<<<<<<<<<<<<
@@ -20503,7 +20503,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14BitSetIterator___next__(struct __pyx_
   __pyx_t_3 = __pyx_v_self->next_val;
   __pyx_v_ret_val = __pyx_t_3;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":110
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":110
  *             raise StopIteration()
  *         ret_val = self.next_val
  *         self.next_val = bitset_findsucc(self.b, ret_val)             # <<<<<<<<<<<<<<
@@ -20512,7 +20512,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14BitSetIterator___next__(struct __pyx_
  */
   __pyx_v_self->next_val = __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(__pyx_v_self->b, __pyx_v_ret_val);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":111
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":111
  *         ret_val = self.next_val
  *         self.next_val = bitset_findsucc(self.b, ret_val)
  *         return ret_val             # <<<<<<<<<<<<<<
@@ -20526,7 +20526,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14BitSetIterator___next__(struct __pyx_
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":104
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":104
  *     cdef int next_val
  * 
  *     def __next__(self):             # <<<<<<<<<<<<<<
@@ -20545,7 +20545,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14BitSetIterator___next__(struct __pyx_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":122
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":122
  *     cdef _BitSet* b
  * 
  *     def __cinit__(self):             # <<<<<<<<<<<<<<
@@ -20574,7 +20574,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6BitSet___cinit__(struct __pyx_obj_4cdec_2sa_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":123
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":123
  * 
  *     def __cinit__(self):
  *         self.b = new_BitSet()             # <<<<<<<<<<<<<<
@@ -20583,7 +20583,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6BitSet___cinit__(struct __pyx_obj_4cdec_2sa_
  */
   __pyx_v_self->b = __pyx_f_4cdec_2sa_3_sa_new_BitSet();
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":122
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":122
  *     cdef _BitSet* b
  * 
  *     def __cinit__(self):             # <<<<<<<<<<<<<<
@@ -20597,7 +20597,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6BitSet___cinit__(struct __pyx_obj_4cdec_2sa_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":125
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":125
  *         self.b = new_BitSet()
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -20620,7 +20620,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_6BitSet_2__dealloc__(struct __pyx_obj_4cdec_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":126
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":126
  * 
  *     def __dealloc__(self):
  *         free(self.b)             # <<<<<<<<<<<<<<
@@ -20629,7 +20629,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_6BitSet_2__dealloc__(struct __pyx_obj_4cdec_
  */
   free(__pyx_v_self->b);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":125
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":125
  *         self.b = new_BitSet()
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -20641,7 +20641,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_6BitSet_2__dealloc__(struct __pyx_obj_4cdec_
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":128
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":128
  *         free(self.b)
  * 
  *     def __iter__(self):             # <<<<<<<<<<<<<<
@@ -20674,7 +20674,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_4__iter__(struct __pyx_obj_4cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__iter__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":130
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":130
  *     def __iter__(self):
  *         cdef BitSetIterator it
  *         it = BitSetIterator()             # <<<<<<<<<<<<<<
@@ -20686,7 +20686,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_4__iter__(struct __pyx_obj_4cde
   __pyx_v_it = ((struct __pyx_obj_4cdec_2sa_3_sa_BitSetIterator *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":131
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":131
  *         cdef BitSetIterator it
  *         it = BitSetIterator()
  *         it.b = self.b             # <<<<<<<<<<<<<<
@@ -20696,7 +20696,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_4__iter__(struct __pyx_obj_4cde
   __pyx_t_2 = __pyx_v_self->b;
   __pyx_v_it->b = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":132
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":132
  *         it = BitSetIterator()
  *         it.b = self.b
  *         it.next_val = self.b.min_val             # <<<<<<<<<<<<<<
@@ -20706,7 +20706,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_4__iter__(struct __pyx_obj_4cde
   __pyx_t_3 = __pyx_v_self->b->min_val;
   __pyx_v_it->next_val = __pyx_t_3;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":133
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":133
  *         it.b = self.b
  *         it.next_val = self.b.min_val
  *         return it             # <<<<<<<<<<<<<<
@@ -20718,7 +20718,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_4__iter__(struct __pyx_obj_4cde
   __pyx_r = ((PyObject *)__pyx_v_it);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":128
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":128
  *         free(self.b)
  * 
  *     def __iter__(self):             # <<<<<<<<<<<<<<
@@ -20738,7 +20738,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_4__iter__(struct __pyx_obj_4cde
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":135
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":135
  *         return it
  * 
  *     def insert(self, i):             # <<<<<<<<<<<<<<
@@ -20769,7 +20769,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_6insert(struct __pyx_obj_4cdec_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("insert", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":136
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":136
  * 
  *     def insert(self, i):
  *         return bitset_insert(self.b, i)             # <<<<<<<<<<<<<<
@@ -20784,7 +20784,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_6insert(struct __pyx_obj_4cdec_
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":135
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":135
  *         return it
  * 
  *     def insert(self, i):             # <<<<<<<<<<<<<<
@@ -20803,7 +20803,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_6insert(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":138
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":138
  *         return bitset_insert(self.b, i)
  * 
  *     def findsucc(self, i):             # <<<<<<<<<<<<<<
@@ -20834,7 +20834,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_8findsucc(struct __pyx_obj_4cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("findsucc", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":139
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":139
  * 
  *     def findsucc(self, i):
  *         return bitset_findsucc(self.b, i)             # <<<<<<<<<<<<<<
@@ -20849,7 +20849,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_8findsucc(struct __pyx_obj_4cde
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":138
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":138
  *         return bitset_insert(self.b, i)
  * 
  *     def findsucc(self, i):             # <<<<<<<<<<<<<<
@@ -20868,7 +20868,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_8findsucc(struct __pyx_obj_4cde
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":141
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":141
  *         return bitset_findsucc(self.b, i)
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -20900,7 +20900,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_10__str__(struct __pyx_obj_4cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__str__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":142
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":142
  * 
  *     def __str__(self):
  *         return dec2bin(self.b.bitset)+"  ("+str(self.b.size)+","+str(self.b.min_val)+","+str(self.b.max_val)+")"             # <<<<<<<<<<<<<<
@@ -20968,7 +20968,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_10__str__(struct __pyx_obj_4cde
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":141
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":141
  *         return bitset_findsucc(self.b, i)
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -20989,7 +20989,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_10__str__(struct __pyx_obj_4cde
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":144
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":144
  *         return dec2bin(self.b.bitset)+"  ("+str(self.b.size)+","+str(self.b.min_val)+","+str(self.b.max_val)+")"
  * 
  *     def min(self):             # <<<<<<<<<<<<<<
@@ -21019,7 +21019,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_12min(struct __pyx_obj_4cdec_2s
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("min", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":145
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":145
  * 
  *     def min(self):
  *         return self.b.min_val             # <<<<<<<<<<<<<<
@@ -21033,7 +21033,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_12min(struct __pyx_obj_4cdec_2s
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":144
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":144
  *         return dec2bin(self.b.bitset)+"  ("+str(self.b.size)+","+str(self.b.min_val)+","+str(self.b.max_val)+")"
  * 
  *     def min(self):             # <<<<<<<<<<<<<<
@@ -21052,7 +21052,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_12min(struct __pyx_obj_4cdec_2s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":147
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":147
  *         return self.b.min_val
  * 
  *     def max(self):             # <<<<<<<<<<<<<<
@@ -21082,7 +21082,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_14max(struct __pyx_obj_4cdec_2s
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("max", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":148
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":148
  * 
  *     def max(self):
  *         return self.b.max_val             # <<<<<<<<<<<<<<
@@ -21096,7 +21096,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_14max(struct __pyx_obj_4cdec_2s
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":147
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":147
  *         return self.b.min_val
  * 
  *     def max(self):             # <<<<<<<<<<<<<<
@@ -21115,7 +21115,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6BitSet_14max(struct __pyx_obj_4cdec_2s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":150
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":150
  *         return self.b.max_val
  * 
  *     def __len__(self):             # <<<<<<<<<<<<<<
@@ -21141,7 +21141,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_6BitSet_16__len__(struct __pyx_obj_4cd
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":151
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":151
  * 
  *     def __len__(self):
  *         return self.b.size             # <<<<<<<<<<<<<<
@@ -21151,7 +21151,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_6BitSet_16__len__(struct __pyx_obj_4cd
   __pyx_r = __pyx_v_self->b->size;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":150
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":150
  *         return self.b.max_val
  * 
  *     def __len__(self):             # <<<<<<<<<<<<<<
@@ -21165,7 +21165,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_6BitSet_16__len__(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":153
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":153
  *         return self.b.size
  * 
  *     def __contains__(self, i):             # <<<<<<<<<<<<<<
@@ -21197,7 +21197,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6BitSet_18__contains__(struct __pyx_obj_4cdec
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__contains__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":154
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":154
  * 
  *     def __contains__(self, i):
  *         return bool(bitset_contains(self.b, i))             # <<<<<<<<<<<<<<
@@ -21212,7 +21212,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6BitSet_18__contains__(struct __pyx_obj_4cdec
   __pyx_r = (!(!__pyx_t_3));
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":153
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":153
  *         return self.b.size
  * 
  *     def __contains__(self, i):             # <<<<<<<<<<<<<<
@@ -21230,7 +21230,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6BitSet_18__contains__(struct __pyx_obj_4cdec
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":157
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":157
  * 
  * 
  * cdef str dec2bin(long i):             # <<<<<<<<<<<<<<
@@ -21252,7 +21252,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_dec2bin(long __pyx_v_i) {
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("dec2bin", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":158
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":158
  * 
  * cdef str dec2bin(long i):
  *     cdef str result = ""             # <<<<<<<<<<<<<<
@@ -21262,7 +21262,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_dec2bin(long __pyx_v_i) {
   __Pyx_INCREF(__pyx_kp_s__32);
   __pyx_v_result = __pyx_kp_s__32;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":160
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":160
  *     cdef str result = ""
  *     cdef unsigned d
  *     for d in range(MIN_BOTTOM_SIZE):             # <<<<<<<<<<<<<<
@@ -21273,7 +21273,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_dec2bin(long __pyx_v_i) {
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_v_d = __pyx_t_2;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":161
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":161
  *     cdef unsigned d
  *     for d in range(MIN_BOTTOM_SIZE):
  *         if i & LOWER_MASK[0] == 0:             # <<<<<<<<<<<<<<
@@ -21283,7 +21283,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_dec2bin(long __pyx_v_i) {
     __pyx_t_3 = (((__pyx_v_i & (__pyx_v_4cdec_2sa_3_sa_LOWER_MASK[0])) == 0) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":162
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":162
  *     for d in range(MIN_BOTTOM_SIZE):
  *         if i & LOWER_MASK[0] == 0:
  *             result = "0"+result             # <<<<<<<<<<<<<<
@@ -21298,7 +21298,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_dec2bin(long __pyx_v_i) {
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":164
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":164
  *             result = "0"+result
  *         else:
  *             result = "1"+result             # <<<<<<<<<<<<<<
@@ -21312,7 +21312,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_dec2bin(long __pyx_v_i) {
     }
     __pyx_L5:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":165
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":165
  *         else:
  *             result = "1"+result
  *         i = i >> 1             # <<<<<<<<<<<<<<
@@ -21322,7 +21322,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_dec2bin(long __pyx_v_i) {
     __pyx_v_i = (__pyx_v_i >> 1);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":166
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":166
  *             result = "1"+result
  *         i = i >> 1
  *     return result             # <<<<<<<<<<<<<<
@@ -21334,7 +21334,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_dec2bin(long __pyx_v_i) {
   __pyx_r = __pyx_v_result;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":157
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":157
  * 
  * 
  * cdef str dec2bin(long i):             # <<<<<<<<<<<<<<
@@ -21354,7 +21354,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_dec2bin(long __pyx_v_i) {
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":177
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":177
  *     void** bottom
  * 
  * cdef _VEB* new_VEB(int n):             # <<<<<<<<<<<<<<
@@ -21375,7 +21375,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("new_VEB", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":181
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":181
  *     cdef int num_bits, num_top_bits, i
  * 
  *     veb = <_VEB*> malloc(sizeof(_VEB))             # <<<<<<<<<<<<<<
@@ -21384,7 +21384,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
  */
   __pyx_v_veb = ((struct __pyx_t_4cdec_2sa_3_sa__VEB *)malloc((sizeof(struct __pyx_t_4cdec_2sa_3_sa__VEB))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":183
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":183
  *     veb = <_VEB*> malloc(sizeof(_VEB))
  * 
  *     num_bits = int(ceil(log(n) / log(2)))             # <<<<<<<<<<<<<<
@@ -21405,7 +21405,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
   }
   __pyx_v_num_bits = ((int)ceil((__pyx_t_1 / __pyx_t_2)));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":184
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":184
  * 
  *     num_bits = int(ceil(log(n) / log(2)))
  *     veb.num_bottom_bits = num_bits/2             # <<<<<<<<<<<<<<
@@ -21414,7 +21414,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
  */
   __pyx_v_veb->num_bottom_bits = __Pyx_div_long(__pyx_v_num_bits, 2);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":185
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":185
  *     num_bits = int(ceil(log(n) / log(2)))
  *     veb.num_bottom_bits = num_bits/2
  *     if veb.num_bottom_bits < MIN_BOTTOM_BITS:             # <<<<<<<<<<<<<<
@@ -21424,7 +21424,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
   __pyx_t_3 = ((__pyx_v_veb->num_bottom_bits < __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_BITS) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":186
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":186
  *     veb.num_bottom_bits = num_bits/2
  *     if veb.num_bottom_bits < MIN_BOTTOM_BITS:
  *         veb.num_bottom_bits = MIN_BOTTOM_BITS             # <<<<<<<<<<<<<<
@@ -21436,7 +21436,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":187
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":187
  *     if veb.num_bottom_bits < MIN_BOTTOM_BITS:
  *         veb.num_bottom_bits = MIN_BOTTOM_BITS
  *     veb.top_universe_size = (n >> veb.num_bottom_bits) + 1             # <<<<<<<<<<<<<<
@@ -21445,7 +21445,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
  */
   __pyx_v_veb->top_universe_size = ((__pyx_v_n >> __pyx_v_veb->num_bottom_bits) + 1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":189
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":189
  *     veb.top_universe_size = (n >> veb.num_bottom_bits) + 1
  * 
  *     veb.bottom = <void**> malloc(veb.top_universe_size * sizeof(void*))             # <<<<<<<<<<<<<<
@@ -21454,7 +21454,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
  */
   __pyx_v_veb->bottom = ((void **)malloc((__pyx_v_veb->top_universe_size * (sizeof(void *)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":190
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":190
  * 
  *     veb.bottom = <void**> malloc(veb.top_universe_size * sizeof(void*))
  *     memset(veb.bottom, 0, veb.top_universe_size * sizeof(void*))             # <<<<<<<<<<<<<<
@@ -21463,7 +21463,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
  */
   memset(__pyx_v_veb->bottom, 0, (__pyx_v_veb->top_universe_size * (sizeof(void *))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":192
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":192
  *     memset(veb.bottom, 0, veb.top_universe_size * sizeof(void*))
  * 
  *     if veb.top_universe_size > MIN_BOTTOM_SIZE:             # <<<<<<<<<<<<<<
@@ -21473,7 +21473,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
   __pyx_t_3 = ((__pyx_v_veb->top_universe_size > __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_SIZE) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":193
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":193
  * 
  *     if veb.top_universe_size > MIN_BOTTOM_SIZE:
  *         veb.top = new_VEB(veb.top_universe_size)             # <<<<<<<<<<<<<<
@@ -21485,7 +21485,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":195
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":195
  *         veb.top = new_VEB(veb.top_universe_size)
  *     else:
  *         veb.top = new_BitSet()             # <<<<<<<<<<<<<<
@@ -21496,7 +21496,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
   }
   __pyx_L4:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":197
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":197
  *         veb.top = new_BitSet()
  * 
  *     veb.max_val = -1             # <<<<<<<<<<<<<<
@@ -21505,7 +21505,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
  */
   __pyx_v_veb->max_val = -1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":198
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":198
  * 
  *     veb.max_val = -1
  *     veb.min_val = -1             # <<<<<<<<<<<<<<
@@ -21514,7 +21514,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
  */
   __pyx_v_veb->min_val = -1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":199
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":199
  *     veb.max_val = -1
  *     veb.min_val = -1
  *     veb.size = 0             # <<<<<<<<<<<<<<
@@ -21523,7 +21523,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
  */
   __pyx_v_veb->size = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":200
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":200
  *     veb.min_val = -1
  *     veb.size = 0
  *     return veb             # <<<<<<<<<<<<<<
@@ -21533,7 +21533,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
   __pyx_r = __pyx_v_veb;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":177
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":177
  *     void** bottom
  * 
  * cdef _VEB* new_VEB(int n):             # <<<<<<<<<<<<<<
@@ -21550,7 +21550,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__VEB *__pyx_f_4cdec_2sa_3_sa_new_VEB(int __
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":203
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":203
  * 
  * 
  * cdef int VEB_insert(_VEB* veb, int i):             # <<<<<<<<<<<<<<
@@ -21572,7 +21572,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
   int __pyx_t_4;
   __Pyx_RefNannySetupContext("VEB_insert", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":208
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":208
  *     cdef int a, b, tmp
  * 
  *     if veb.size == 0:             # <<<<<<<<<<<<<<
@@ -21582,7 +21582,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
   __pyx_t_1 = ((__pyx_v_veb->size == 0) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":209
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":209
  * 
  *     if veb.size == 0:
  *         veb.min_val = i             # <<<<<<<<<<<<<<
@@ -21591,7 +21591,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
  */
     __pyx_v_veb->min_val = __pyx_v_i;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":210
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":210
  *     if veb.size == 0:
  *         veb.min_val = i
  *         veb.max_val = i             # <<<<<<<<<<<<<<
@@ -21602,7 +21602,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
     goto __pyx_L3;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":211
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":211
  *         veb.min_val = i
  *         veb.max_val = i
  *     elif i == veb.min_val or i == veb.max_val:             # <<<<<<<<<<<<<<
@@ -21618,7 +21618,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
   }
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":212
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":212
  *         veb.max_val = i
  *     elif i == veb.min_val or i == veb.max_val:
  *         return 0             # <<<<<<<<<<<<<<
@@ -21630,7 +21630,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":214
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":214
  *         return 0
  *     else:
  *         if i < veb.min_val:             # <<<<<<<<<<<<<<
@@ -21640,7 +21640,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
     __pyx_t_3 = ((__pyx_v_i < __pyx_v_veb->min_val) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":215
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":215
  *     else:
  *         if i < veb.min_val:
  *             tmp = i             # <<<<<<<<<<<<<<
@@ -21649,7 +21649,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
  */
       __pyx_v_tmp = __pyx_v_i;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":216
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":216
  *         if i < veb.min_val:
  *             tmp = i
  *             i = veb.min_val             # <<<<<<<<<<<<<<
@@ -21659,7 +21659,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
       __pyx_t_4 = __pyx_v_veb->min_val;
       __pyx_v_i = __pyx_t_4;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":217
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":217
  *             tmp = i
  *             i = veb.min_val
  *             veb.min_val = tmp             # <<<<<<<<<<<<<<
@@ -21671,7 +21671,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
     }
     __pyx_L4:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":218
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":218
  *             i = veb.min_val
  *             veb.min_val = tmp
  *         a = i >> veb.num_bottom_bits             # <<<<<<<<<<<<<<
@@ -21680,7 +21680,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
  */
     __pyx_v_a = (__pyx_v_i >> __pyx_v_veb->num_bottom_bits);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":219
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":219
  *             veb.min_val = tmp
  *         a = i >> veb.num_bottom_bits
  *         b = i & LOWER_MASK[veb.num_bottom_bits-1]             # <<<<<<<<<<<<<<
@@ -21689,7 +21689,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
  */
     __pyx_v_b = (__pyx_v_i & (__pyx_v_4cdec_2sa_3_sa_LOWER_MASK[(__pyx_v_veb->num_bottom_bits - 1)]));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":220
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":220
  *         a = i >> veb.num_bottom_bits
  *         b = i & LOWER_MASK[veb.num_bottom_bits-1]
  *         if veb.bottom[a] == NULL:             # <<<<<<<<<<<<<<
@@ -21699,7 +21699,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
     __pyx_t_3 = (((__pyx_v_veb->bottom[__pyx_v_a]) == NULL) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":221
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":221
  *         b = i & LOWER_MASK[veb.num_bottom_bits-1]
  *         if veb.bottom[a] == NULL:
  *             if veb.top_universe_size > MIN_BOTTOM_SIZE:             # <<<<<<<<<<<<<<
@@ -21709,7 +21709,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
       __pyx_t_3 = ((__pyx_v_veb->top_universe_size > __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_SIZE) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":222
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":222
  *         if veb.bottom[a] == NULL:
  *             if veb.top_universe_size > MIN_BOTTOM_SIZE:
  *                 subv = <_VEB*> veb.top             # <<<<<<<<<<<<<<
@@ -21718,7 +21718,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
  */
         __pyx_v_subv = ((struct __pyx_t_4cdec_2sa_3_sa__VEB *)__pyx_v_veb->top);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":223
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":223
  *             if veb.top_universe_size > MIN_BOTTOM_SIZE:
  *                 subv = <_VEB*> veb.top
  *                 VEB_insert(subv, a)             # <<<<<<<<<<<<<<
@@ -21730,7 +21730,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
       }
       /*else*/ {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":225
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":225
  *                 VEB_insert(subv, a)
  *             else:
  *                 subb = <_BitSet*> veb.top             # <<<<<<<<<<<<<<
@@ -21739,7 +21739,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
  */
         __pyx_v_subb = ((struct __pyx_t_4cdec_2sa_3_sa__BitSet *)__pyx_v_veb->top);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":226
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":226
  *             else:
  *                 subb = <_BitSet*> veb.top
  *                 bitset_insert(subb, a)             # <<<<<<<<<<<<<<
@@ -21750,7 +21750,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
       }
       __pyx_L6:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":227
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":227
  *                 subb = <_BitSet*> veb.top
  *                 bitset_insert(subb, a)
  *             if veb.num_bottom_bits > MIN_BOTTOM_BITS:             # <<<<<<<<<<<<<<
@@ -21760,7 +21760,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
       __pyx_t_3 = ((__pyx_v_veb->num_bottom_bits > __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_BITS) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":228
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":228
  *                 bitset_insert(subb, a)
  *             if veb.num_bottom_bits > MIN_BOTTOM_BITS:
  *                 veb.bottom[a] = new_VEB(1 << veb.num_bottom_bits)             # <<<<<<<<<<<<<<
@@ -21772,7 +21772,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
       }
       /*else*/ {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":230
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":230
  *                 veb.bottom[a] = new_VEB(1 << veb.num_bottom_bits)
  *             else:
  *                 veb.bottom[a] = new_BitSet()             # <<<<<<<<<<<<<<
@@ -21786,7 +21786,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
     }
     __pyx_L5:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":231
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":231
  *             else:
  *                 veb.bottom[a] = new_BitSet()
  *         if veb.num_bottom_bits > MIN_BOTTOM_BITS:             # <<<<<<<<<<<<<<
@@ -21796,7 +21796,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
     __pyx_t_3 = ((__pyx_v_veb->num_bottom_bits > __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_BITS) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":232
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":232
  *                 veb.bottom[a] = new_BitSet()
  *         if veb.num_bottom_bits > MIN_BOTTOM_BITS:
  *             subv = <_VEB*> veb.bottom[a]             # <<<<<<<<<<<<<<
@@ -21805,7 +21805,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
  */
       __pyx_v_subv = ((struct __pyx_t_4cdec_2sa_3_sa__VEB *)(__pyx_v_veb->bottom[__pyx_v_a]));
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":233
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":233
  *         if veb.num_bottom_bits > MIN_BOTTOM_BITS:
  *             subv = <_VEB*> veb.bottom[a]
  *             if VEB_insert(subv, b) == 0:             # <<<<<<<<<<<<<<
@@ -21815,7 +21815,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
       __pyx_t_3 = ((__pyx_f_4cdec_2sa_3_sa_VEB_insert(__pyx_v_subv, __pyx_v_b) == 0) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":234
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":234
  *             subv = <_VEB*> veb.bottom[a]
  *             if VEB_insert(subv, b) == 0:
  *                 return 0             # <<<<<<<<<<<<<<
@@ -21829,7 +21829,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":236
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":236
  *                 return 0
  *         else:
  *             subb = <_BitSet*> veb.bottom[a]             # <<<<<<<<<<<<<<
@@ -21838,7 +21838,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
  */
       __pyx_v_subb = ((struct __pyx_t_4cdec_2sa_3_sa__BitSet *)(__pyx_v_veb->bottom[__pyx_v_a]));
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":237
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":237
  *         else:
  *             subb = <_BitSet*> veb.bottom[a]
  *             if bitset_insert(subb, b) == 0:             # <<<<<<<<<<<<<<
@@ -21848,7 +21848,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
       __pyx_t_3 = ((__pyx_f_4cdec_2sa_3_sa_bitset_insert(__pyx_v_subb, __pyx_v_b) == 0) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":238
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":238
  *             subb = <_BitSet*> veb.bottom[a]
  *             if bitset_insert(subb, b) == 0:
  *                 return 0             # <<<<<<<<<<<<<<
@@ -21861,7 +21861,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
     }
     __pyx_L8:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":240
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":240
  *                 return 0
  * 
  *         if i > veb.max_val:             # <<<<<<<<<<<<<<
@@ -21871,7 +21871,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
     __pyx_t_3 = ((__pyx_v_i > __pyx_v_veb->max_val) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":241
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":241
  * 
  *         if i > veb.max_val:
  *             veb.max_val = i             # <<<<<<<<<<<<<<
@@ -21885,7 +21885,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":242
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":242
  *         if i > veb.max_val:
  *             veb.max_val = i
  *     veb.size = veb.size + 1             # <<<<<<<<<<<<<<
@@ -21894,7 +21894,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
  */
   __pyx_v_veb->size = (__pyx_v_veb->size + 1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":243
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":243
  *             veb.max_val = i
  *     veb.size = veb.size + 1
  *     return 1             # <<<<<<<<<<<<<<
@@ -21904,7 +21904,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
   __pyx_r = 1;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":203
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":203
  * 
  * 
  * cdef int VEB_insert(_VEB* veb, int i):             # <<<<<<<<<<<<<<
@@ -21918,7 +21918,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_insert(struct __pyx_t_4cdec_2sa_3_sa__VEB
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":246
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":246
  * 
  * 
  * cdef del_VEB(_VEB* veb):             # <<<<<<<<<<<<<<
@@ -21938,7 +21938,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("del_VEB", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":249
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":249
  *     cdef int i
  * 
  *     if veb.top_universe_size > MIN_BOTTOM_SIZE:             # <<<<<<<<<<<<<<
@@ -21948,7 +21948,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
   __pyx_t_1 = ((__pyx_v_veb->top_universe_size > __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_SIZE) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":250
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":250
  * 
  *     if veb.top_universe_size > MIN_BOTTOM_SIZE:
  *         i = (<_VEB*> veb.top).min_val             # <<<<<<<<<<<<<<
@@ -21961,7 +21961,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":252
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":252
  *         i = (<_VEB*> veb.top).min_val
  *     else:
  *         i = (<_BitSet*> veb.top).min_val             # <<<<<<<<<<<<<<
@@ -21973,7 +21973,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":254
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":254
  *         i = (<_BitSet*> veb.top).min_val
  * 
  *     while i != -1:             # <<<<<<<<<<<<<<
@@ -21984,7 +21984,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
     __pyx_t_1 = ((__pyx_v_i != -1) != 0);
     if (!__pyx_t_1) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":255
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":255
  * 
  *     while i != -1:
  *         if veb.num_bottom_bits > MIN_BOTTOM_BITS:             # <<<<<<<<<<<<<<
@@ -21994,7 +21994,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
     __pyx_t_1 = ((__pyx_v_veb->num_bottom_bits > __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_BITS) != 0);
     if (__pyx_t_1) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":256
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":256
  *     while i != -1:
  *         if veb.num_bottom_bits > MIN_BOTTOM_BITS:
  *             del_VEB(<_VEB*> veb.bottom[i])             # <<<<<<<<<<<<<<
@@ -22008,7 +22008,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":258
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":258
  *             del_VEB(<_VEB*> veb.bottom[i])
  *         else:
  *             free(<_BitSet*> veb.bottom[i])             # <<<<<<<<<<<<<<
@@ -22019,7 +22019,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
     }
     __pyx_L6:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":260
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":260
  *             free(<_BitSet*> veb.bottom[i])
  * 
  *         if veb.top_universe_size > MIN_BOTTOM_SIZE:             # <<<<<<<<<<<<<<
@@ -22029,7 +22029,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
     __pyx_t_1 = ((__pyx_v_veb->top_universe_size > __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_SIZE) != 0);
     if (__pyx_t_1) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":261
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":261
  * 
  *         if veb.top_universe_size > MIN_BOTTOM_SIZE:
  *             i = VEB_findsucc(<_VEB*> veb.top, i)             # <<<<<<<<<<<<<<
@@ -22041,7 +22041,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":263
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":263
  *             i = VEB_findsucc(<_VEB*> veb.top, i)
  *         else:
  *             i = bitset_findsucc(<_BitSet*> veb.top, i)             # <<<<<<<<<<<<<<
@@ -22053,7 +22053,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
     __pyx_L7:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":265
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":265
  *             i = bitset_findsucc(<_BitSet*> veb.top, i)
  * 
  *     if veb.top_universe_size > MIN_BOTTOM_SIZE:             # <<<<<<<<<<<<<<
@@ -22063,7 +22063,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
   __pyx_t_1 = ((__pyx_v_veb->top_universe_size > __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_SIZE) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":266
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":266
  * 
  *     if veb.top_universe_size > MIN_BOTTOM_SIZE:
  *         del_VEB(<_VEB*> veb.top)             # <<<<<<<<<<<<<<
@@ -22077,7 +22077,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":268
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":268
  *         del_VEB(<_VEB*> veb.top)
  *     else:
  *         free(<_BitSet*> veb.top)             # <<<<<<<<<<<<<<
@@ -22088,7 +22088,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
   }
   __pyx_L8:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":269
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":269
  *     else:
  *         free(<_BitSet*> veb.top)
  *     free(veb.bottom)             # <<<<<<<<<<<<<<
@@ -22097,7 +22097,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
  */
   free(__pyx_v_veb->bottom);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":270
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":270
  *         free(<_BitSet*> veb.top)
  *     free(veb.bottom)
  *     free(veb)             # <<<<<<<<<<<<<<
@@ -22106,7 +22106,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
  */
   free(__pyx_v_veb);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":246
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":246
  * 
  * 
  * cdef del_VEB(_VEB* veb):             # <<<<<<<<<<<<<<
@@ -22127,7 +22127,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_del_VEB(struct __pyx_t_4cdec_2sa_3_sa__V
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":273
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":273
  * 
  * 
  * cdef int VEB_findsucc(_VEB* veb, int i):             # <<<<<<<<<<<<<<
@@ -22150,7 +22150,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
   int __pyx_t_3;
   __Pyx_RefNannySetupContext("VEB_findsucc", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":278
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":278
  *     cdef int a, b, j, c, found
  * 
  *     if veb.max_val == -1 or i>=veb.max_val:             # <<<<<<<<<<<<<<
@@ -22166,7 +22166,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
   }
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":279
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":279
  * 
  *     if veb.max_val == -1 or i>=veb.max_val:
  *         return -1             # <<<<<<<<<<<<<<
@@ -22177,7 +22177,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":280
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":280
  *     if veb.max_val == -1 or i>=veb.max_val:
  *         return -1
  *     if i < veb.min_val:             # <<<<<<<<<<<<<<
@@ -22187,7 +22187,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
   __pyx_t_3 = ((__pyx_v_i < __pyx_v_veb->min_val) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":281
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":281
  *         return -1
  *     if i < veb.min_val:
  *         return veb.min_val             # <<<<<<<<<<<<<<
@@ -22198,7 +22198,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":283
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":283
  *         return veb.min_val
  * 
  *     a = i >> veb.num_bottom_bits             # <<<<<<<<<<<<<<
@@ -22207,7 +22207,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
   __pyx_v_a = (__pyx_v_i >> __pyx_v_veb->num_bottom_bits);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":284
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":284
  * 
  *     a = i >> veb.num_bottom_bits
  *     b = i & LOWER_MASK[veb.num_bottom_bits-1]             # <<<<<<<<<<<<<<
@@ -22216,7 +22216,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
   __pyx_v_b = (__pyx_v_i & (__pyx_v_4cdec_2sa_3_sa_LOWER_MASK[(__pyx_v_veb->num_bottom_bits - 1)]));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":285
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":285
  *     a = i >> veb.num_bottom_bits
  *     b = i & LOWER_MASK[veb.num_bottom_bits-1]
  *     found = 0             # <<<<<<<<<<<<<<
@@ -22225,7 +22225,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
   __pyx_v_found = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":286
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":286
  *     b = i & LOWER_MASK[veb.num_bottom_bits-1]
  *     found = 0
  *     if veb.bottom[a] != NULL:             # <<<<<<<<<<<<<<
@@ -22235,7 +22235,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
   __pyx_t_3 = (((__pyx_v_veb->bottom[__pyx_v_a]) != NULL) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":287
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":287
  *     found = 0
  *     if veb.bottom[a] != NULL:
  *         if veb.num_bottom_bits > MIN_BOTTOM_BITS:             # <<<<<<<<<<<<<<
@@ -22245,7 +22245,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
     __pyx_t_3 = ((__pyx_v_veb->num_bottom_bits > __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_BITS) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":288
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":288
  *     if veb.bottom[a] != NULL:
  *         if veb.num_bottom_bits > MIN_BOTTOM_BITS:
  *             subv = <_VEB*> veb.bottom[a]             # <<<<<<<<<<<<<<
@@ -22254,7 +22254,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
       __pyx_v_subv = ((struct __pyx_t_4cdec_2sa_3_sa__VEB *)(__pyx_v_veb->bottom[__pyx_v_a]));
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":289
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":289
  *         if veb.num_bottom_bits > MIN_BOTTOM_BITS:
  *             subv = <_VEB*> veb.bottom[a]
  *             if subv.max_val > b:             # <<<<<<<<<<<<<<
@@ -22264,7 +22264,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
       __pyx_t_3 = ((__pyx_v_subv->max_val > __pyx_v_b) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":290
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":290
  *             subv = <_VEB*> veb.bottom[a]
  *             if subv.max_val > b:
  *                 j = (a << veb.num_bottom_bits) + VEB_findsucc(subv, b)             # <<<<<<<<<<<<<<
@@ -22273,7 +22273,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
         __pyx_v_j = ((__pyx_v_a << __pyx_v_veb->num_bottom_bits) + __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(__pyx_v_subv, __pyx_v_b));
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":291
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":291
  *             if subv.max_val > b:
  *                 j = (a << veb.num_bottom_bits) + VEB_findsucc(subv, b)
  *                 found = 1             # <<<<<<<<<<<<<<
@@ -22288,7 +22288,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":293
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":293
  *                 found = 1
  *         else:
  *             subb = <_BitSet*> veb.bottom[a]             # <<<<<<<<<<<<<<
@@ -22297,7 +22297,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
       __pyx_v_subb = ((struct __pyx_t_4cdec_2sa_3_sa__BitSet *)(__pyx_v_veb->bottom[__pyx_v_a]));
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":294
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":294
  *         else:
  *             subb = <_BitSet*> veb.bottom[a]
  *             if subb.max_val > b:             # <<<<<<<<<<<<<<
@@ -22307,7 +22307,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
       __pyx_t_3 = ((__pyx_v_subb->max_val > __pyx_v_b) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":295
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":295
  *             subb = <_BitSet*> veb.bottom[a]
  *             if subb.max_val > b:
  *                 j = (a << veb.num_bottom_bits) + bitset_findsucc(subb, b)             # <<<<<<<<<<<<<<
@@ -22316,7 +22316,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
         __pyx_v_j = ((__pyx_v_a << __pyx_v_veb->num_bottom_bits) + __pyx_f_4cdec_2sa_3_sa_bitset_findsucc(__pyx_v_subb, __pyx_v_b));
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":296
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":296
  *             if subb.max_val > b:
  *                 j = (a << veb.num_bottom_bits) + bitset_findsucc(subb, b)
  *                 found = 1             # <<<<<<<<<<<<<<
@@ -22333,7 +22333,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
   }
   __pyx_L5:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":297
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":297
  *                 j = (a << veb.num_bottom_bits) + bitset_findsucc(subb, b)
  *                 found = 1
  *     if found==0:             # <<<<<<<<<<<<<<
@@ -22343,7 +22343,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
   __pyx_t_3 = ((__pyx_v_found == 0) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":298
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":298
  *                 found = 1
  *     if found==0:
  *         if veb.top_universe_size > MIN_BOTTOM_SIZE:             # <<<<<<<<<<<<<<
@@ -22353,7 +22353,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
     __pyx_t_3 = ((__pyx_v_veb->top_universe_size > __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_SIZE) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":299
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":299
  *     if found==0:
  *         if veb.top_universe_size > MIN_BOTTOM_SIZE:
  *             subv = <_VEB*> veb.top             # <<<<<<<<<<<<<<
@@ -22362,7 +22362,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
       __pyx_v_subv = ((struct __pyx_t_4cdec_2sa_3_sa__VEB *)__pyx_v_veb->top);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":300
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":300
  *         if veb.top_universe_size > MIN_BOTTOM_SIZE:
  *             subv = <_VEB*> veb.top
  *             c = VEB_findsucc(subv, a)             # <<<<<<<<<<<<<<
@@ -22374,7 +22374,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":302
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":302
  *             c = VEB_findsucc(subv, a)
  *         else:
  *             subb = <_BitSet*> veb.top             # <<<<<<<<<<<<<<
@@ -22383,7 +22383,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
       __pyx_v_subb = ((struct __pyx_t_4cdec_2sa_3_sa__BitSet *)__pyx_v_veb->top);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":303
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":303
  *         else:
  *             subb = <_BitSet*> veb.top
  *             c = bitset_findsucc(subb, a)             # <<<<<<<<<<<<<<
@@ -22394,7 +22394,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
     }
     __pyx_L10:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":304
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":304
  *             subb = <_BitSet*> veb.top
  *             c = bitset_findsucc(subb, a)
  *         if veb.num_bottom_bits > MIN_BOTTOM_BITS:             # <<<<<<<<<<<<<<
@@ -22404,7 +22404,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
     __pyx_t_3 = ((__pyx_v_veb->num_bottom_bits > __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_BITS) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":305
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":305
  *             c = bitset_findsucc(subb, a)
  *         if veb.num_bottom_bits > MIN_BOTTOM_BITS:
  *             subv = <_VEB*> veb.bottom[c]             # <<<<<<<<<<<<<<
@@ -22413,7 +22413,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
       __pyx_v_subv = ((struct __pyx_t_4cdec_2sa_3_sa__VEB *)(__pyx_v_veb->bottom[__pyx_v_c]));
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":306
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":306
  *         if veb.num_bottom_bits > MIN_BOTTOM_BITS:
  *             subv = <_VEB*> veb.bottom[c]
  *             j = (c << veb.num_bottom_bits) + subv.min_val             # <<<<<<<<<<<<<<
@@ -22425,7 +22425,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":308
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":308
  *             j = (c << veb.num_bottom_bits) + subv.min_val
  *         else:
  *             subb = <_BitSet*> veb.bottom[c]             # <<<<<<<<<<<<<<
@@ -22434,7 +22434,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
       __pyx_v_subb = ((struct __pyx_t_4cdec_2sa_3_sa__BitSet *)(__pyx_v_veb->bottom[__pyx_v_c]));
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":309
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":309
  *         else:
  *             subb = <_BitSet*> veb.bottom[c]
  *             j = (c << veb.num_bottom_bits) + subb.min_val             # <<<<<<<<<<<<<<
@@ -22448,7 +22448,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
   }
   __pyx_L9:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":310
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":310
  *             subb = <_BitSet*> veb.bottom[c]
  *             j = (c << veb.num_bottom_bits) + subb.min_val
  *     return j             # <<<<<<<<<<<<<<
@@ -22458,7 +22458,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
   __pyx_r = __pyx_v_j;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":273
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":273
  * 
  * 
  * cdef int VEB_findsucc(_VEB* veb, int i):             # <<<<<<<<<<<<<<
@@ -22472,7 +22472,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(struct __pyx_t_4cdec_2sa_3_sa__VE
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":313
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":313
  * 
  * 
  * cdef int VEB_contains(_VEB* veb, int i):             # <<<<<<<<<<<<<<
@@ -22493,7 +22493,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
   int __pyx_t_4;
   __Pyx_RefNannySetupContext("VEB_contains", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":318
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":318
  *     cdef int a, b
  * 
  *     if veb.size == 0 or i < veb.min_val or i > veb.max_val:             # <<<<<<<<<<<<<<
@@ -22515,7 +22515,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
   }
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":319
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":319
  * 
  *     if veb.size == 0 or i < veb.min_val or i > veb.max_val:
  *         return 0             # <<<<<<<<<<<<<<
@@ -22526,7 +22526,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":321
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":321
  *         return 0
  * 
  *     if veb.min_val == i:             # <<<<<<<<<<<<<<
@@ -22536,7 +22536,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
   __pyx_t_2 = ((__pyx_v_veb->min_val == __pyx_v_i) != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":322
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":322
  * 
  *     if veb.min_val == i:
  *         return 1             # <<<<<<<<<<<<<<
@@ -22548,7 +22548,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":324
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":324
  *         return 1
  *     else:
  *         if veb.size == 1:             # <<<<<<<<<<<<<<
@@ -22558,7 +22558,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
     __pyx_t_2 = ((__pyx_v_veb->size == 1) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":325
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":325
  *     else:
  *         if veb.size == 1:
  *             return 0             # <<<<<<<<<<<<<<
@@ -22570,7 +22570,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
     }
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":327
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":327
  *             return 0
  * 
  *     a = i >> veb.num_bottom_bits             # <<<<<<<<<<<<<<
@@ -22579,7 +22579,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
   __pyx_v_a = (__pyx_v_i >> __pyx_v_veb->num_bottom_bits);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":328
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":328
  * 
  *     a = i >> veb.num_bottom_bits
  *     b = i & LOWER_MASK[veb.num_bottom_bits-1]             # <<<<<<<<<<<<<<
@@ -22588,7 +22588,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
   __pyx_v_b = (__pyx_v_i & (__pyx_v_4cdec_2sa_3_sa_LOWER_MASK[(__pyx_v_veb->num_bottom_bits - 1)]));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":329
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":329
  *     a = i >> veb.num_bottom_bits
  *     b = i & LOWER_MASK[veb.num_bottom_bits-1]
  *     if veb.bottom[a] == NULL:             # <<<<<<<<<<<<<<
@@ -22598,7 +22598,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
   __pyx_t_2 = (((__pyx_v_veb->bottom[__pyx_v_a]) == NULL) != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":330
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":330
  *     b = i & LOWER_MASK[veb.num_bottom_bits-1]
  *     if veb.bottom[a] == NULL:
  *         return 0             # <<<<<<<<<<<<<<
@@ -22610,7 +22610,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":332
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":332
  *         return 0
  *     else:
  *         if veb.num_bottom_bits > MIN_BOTTOM_BITS:             # <<<<<<<<<<<<<<
@@ -22620,7 +22620,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
     __pyx_t_2 = ((__pyx_v_veb->num_bottom_bits > __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_BITS) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":333
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":333
  *     else:
  *         if veb.num_bottom_bits > MIN_BOTTOM_BITS:
  *             subv = <_VEB*> veb.bottom[a]             # <<<<<<<<<<<<<<
@@ -22629,7 +22629,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
       __pyx_v_subv = ((struct __pyx_t_4cdec_2sa_3_sa__VEB *)(__pyx_v_veb->bottom[__pyx_v_a]));
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":334
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":334
  *         if veb.num_bottom_bits > MIN_BOTTOM_BITS:
  *             subv = <_VEB*> veb.bottom[a]
  *             return VEB_contains(subv, b)             # <<<<<<<<<<<<<<
@@ -22641,7 +22641,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":336
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":336
  *             return VEB_contains(subv, b)
  *         else:
  *             subb = <_BitSet*> veb.bottom[a]             # <<<<<<<<<<<<<<
@@ -22650,7 +22650,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
  */
       __pyx_v_subb = ((struct __pyx_t_4cdec_2sa_3_sa__BitSet *)(__pyx_v_veb->bottom[__pyx_v_a]));
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":337
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":337
  *         else:
  *             subb = <_BitSet*> veb.bottom[a]
  *             return bitset_contains(subb, b)             # <<<<<<<<<<<<<<
@@ -22662,7 +22662,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
     }
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":313
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":313
  * 
  * 
  * cdef int VEB_contains(_VEB* veb, int i):             # <<<<<<<<<<<<<<
@@ -22676,7 +22676,7 @@ static int __pyx_f_4cdec_2sa_3_sa_VEB_contains(struct __pyx_t_4cdec_2sa_3_sa__VE
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":344
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":344
  *     cdef int next_val
  * 
  *     def __next__(self):             # <<<<<<<<<<<<<<
@@ -22709,7 +22709,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11VEBIterator___next__(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__next__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":347
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":347
  *         cdef int ret_val
  * 
  *         if self.next_val == -1:             # <<<<<<<<<<<<<<
@@ -22719,7 +22719,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11VEBIterator___next__(struct __pyx_obj
   __pyx_t_1 = ((__pyx_v_self->next_val == -1) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":348
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":348
  * 
  *         if self.next_val == -1:
  *             raise StopIteration()             # <<<<<<<<<<<<<<
@@ -22733,7 +22733,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11VEBIterator___next__(struct __pyx_obj
     {__pyx_filename = __pyx_f[6]; __pyx_lineno = 348; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":349
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":349
  *         if self.next_val == -1:
  *             raise StopIteration()
  *         ret_val = self.next_val             # <<<<<<<<<<<<<<
@@ -22743,7 +22743,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11VEBIterator___next__(struct __pyx_obj
   __pyx_t_3 = __pyx_v_self->next_val;
   __pyx_v_ret_val = __pyx_t_3;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":350
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":350
  *             raise StopIteration()
  *         ret_val = self.next_val
  *         self.next_val = VEB_findsucc(self.v, ret_val)             # <<<<<<<<<<<<<<
@@ -22752,7 +22752,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11VEBIterator___next__(struct __pyx_obj
  */
   __pyx_v_self->next_val = __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(__pyx_v_self->v, __pyx_v_ret_val);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":351
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":351
  *         ret_val = self.next_val
  *         self.next_val = VEB_findsucc(self.v, ret_val)
  *         return ret_val             # <<<<<<<<<<<<<<
@@ -22766,7 +22766,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11VEBIterator___next__(struct __pyx_obj
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":344
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":344
  *     cdef int next_val
  * 
  *     def __next__(self):             # <<<<<<<<<<<<<<
@@ -22785,7 +22785,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11VEBIterator___next__(struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":360
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":360
  *     cdef int _first(self)
  * 
  *     def __cinit__(self, int size):             # <<<<<<<<<<<<<<
@@ -22850,7 +22850,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3VEB___cinit__(struct __pyx_obj_4cdec_2sa_3_s
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":361
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":361
  * 
  *     def __cinit__(self, int size):
  *         self.veb = new_VEB(size)             # <<<<<<<<<<<<<<
@@ -22859,7 +22859,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3VEB___cinit__(struct __pyx_obj_4cdec_2sa_3_s
  */
   __pyx_v_self->veb = __pyx_f_4cdec_2sa_3_sa_new_VEB(__pyx_v_size);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":360
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":360
  *     cdef int _first(self)
  * 
  *     def __cinit__(self, int size):             # <<<<<<<<<<<<<<
@@ -22873,7 +22873,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3VEB___cinit__(struct __pyx_obj_4cdec_2sa_3_s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":363
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":363
  *         self.veb = new_VEB(size)
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -22900,7 +22900,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_3VEB_2__dealloc__(struct __pyx_obj_4cdec_2sa
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":364
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":364
  * 
  *     def __dealloc__(self):
  *         del_VEB(self.veb)             # <<<<<<<<<<<<<<
@@ -22911,7 +22911,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_3VEB_2__dealloc__(struct __pyx_obj_4cdec_2sa
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":363
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":363
  *         self.veb = new_VEB(size)
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -22928,7 +22928,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_3VEB_2__dealloc__(struct __pyx_obj_4cdec_2sa
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":366
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":366
  *         del_VEB(self.veb)
  * 
  *     def __iter__(self):             # <<<<<<<<<<<<<<
@@ -22961,7 +22961,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_3VEB_4__iter__(struct __pyx_obj_4cdec_2
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__iter__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":368
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":368
  *     def __iter__(self):
  *         cdef VEBIterator it
  *         it = VEBIterator()             # <<<<<<<<<<<<<<
@@ -22973,7 +22973,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_3VEB_4__iter__(struct __pyx_obj_4cdec_2
   __pyx_v_it = ((struct __pyx_obj_4cdec_2sa_3_sa_VEBIterator *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":369
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":369
  *         cdef VEBIterator it
  *         it = VEBIterator()
  *         it.v = self.veb             # <<<<<<<<<<<<<<
@@ -22983,7 +22983,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_3VEB_4__iter__(struct __pyx_obj_4cdec_2
   __pyx_t_2 = __pyx_v_self->veb;
   __pyx_v_it->v = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":370
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":370
  *         it = VEBIterator()
  *         it.v = self.veb
  *         it.next_val = self.veb.min_val             # <<<<<<<<<<<<<<
@@ -22993,7 +22993,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_3VEB_4__iter__(struct __pyx_obj_4cdec_2
   __pyx_t_3 = __pyx_v_self->veb->min_val;
   __pyx_v_it->next_val = __pyx_t_3;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":371
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":371
  *         it.v = self.veb
  *         it.next_val = self.veb.min_val
  *         return it             # <<<<<<<<<<<<<<
@@ -23005,7 +23005,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_3VEB_4__iter__(struct __pyx_obj_4cdec_2
   __pyx_r = ((PyObject *)__pyx_v_it);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":366
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":366
  *         del_VEB(self.veb)
  * 
  *     def __iter__(self):             # <<<<<<<<<<<<<<
@@ -23025,7 +23025,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_3VEB_4__iter__(struct __pyx_obj_4cdec_2
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":373
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":373
  *         return it
  * 
  *     def insert(self, i):             # <<<<<<<<<<<<<<
@@ -23056,7 +23056,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_3VEB_6insert(struct __pyx_obj_4cdec_2sa
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("insert", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":374
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":374
  * 
  *     def insert(self, i):
  *         return VEB_insert(self.veb, i)             # <<<<<<<<<<<<<<
@@ -23071,7 +23071,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_3VEB_6insert(struct __pyx_obj_4cdec_2sa
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":373
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":373
  *         return it
  * 
  *     def insert(self, i):             # <<<<<<<<<<<<<<
@@ -23090,7 +23090,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_3VEB_6insert(struct __pyx_obj_4cdec_2sa
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":376
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":376
  *         return VEB_insert(self.veb, i)
  * 
  *     cdef int _insert(self, int i):             # <<<<<<<<<<<<<<
@@ -23103,7 +23103,7 @@ static int __pyx_f_4cdec_2sa_3_sa_3VEB__insert(struct __pyx_obj_4cdec_2sa_3_sa_V
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("_insert", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":377
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":377
  * 
  *     cdef int _insert(self, int i):
  *         return VEB_insert(self.veb, i)             # <<<<<<<<<<<<<<
@@ -23113,7 +23113,7 @@ static int __pyx_f_4cdec_2sa_3_sa_3VEB__insert(struct __pyx_obj_4cdec_2sa_3_sa_V
   __pyx_r = __pyx_f_4cdec_2sa_3_sa_VEB_insert(__pyx_v_self->veb, __pyx_v_i);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":376
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":376
  *         return VEB_insert(self.veb, i)
  * 
  *     cdef int _insert(self, int i):             # <<<<<<<<<<<<<<
@@ -23127,7 +23127,7 @@ static int __pyx_f_4cdec_2sa_3_sa_3VEB__insert(struct __pyx_obj_4cdec_2sa_3_sa_V
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":379
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":379
  *         return VEB_insert(self.veb, i)
  * 
  *     def findsucc(self, i):             # <<<<<<<<<<<<<<
@@ -23158,7 +23158,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_3VEB_8findsucc(struct __pyx_obj_4cdec_2
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("findsucc", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":380
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":380
  * 
  *     def findsucc(self, i):
  *         return VEB_findsucc(self.veb, i)             # <<<<<<<<<<<<<<
@@ -23173,7 +23173,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_3VEB_8findsucc(struct __pyx_obj_4cdec_2
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":379
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":379
  *         return VEB_insert(self.veb, i)
  * 
  *     def findsucc(self, i):             # <<<<<<<<<<<<<<
@@ -23192,7 +23192,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_3VEB_8findsucc(struct __pyx_obj_4cdec_2
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":382
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":382
  *         return VEB_findsucc(self.veb, i)
  * 
  *     cdef int _first(self):             # <<<<<<<<<<<<<<
@@ -23205,7 +23205,7 @@ static int __pyx_f_4cdec_2sa_3_sa_3VEB__first(struct __pyx_obj_4cdec_2sa_3_sa_VE
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("_first", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":383
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":383
  * 
  *     cdef int _first(self):
  *         return self.veb.min_val             # <<<<<<<<<<<<<<
@@ -23215,7 +23215,7 @@ static int __pyx_f_4cdec_2sa_3_sa_3VEB__first(struct __pyx_obj_4cdec_2sa_3_sa_VE
   __pyx_r = __pyx_v_self->veb->min_val;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":382
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":382
  *         return VEB_findsucc(self.veb, i)
  * 
  *     cdef int _first(self):             # <<<<<<<<<<<<<<
@@ -23229,7 +23229,7 @@ static int __pyx_f_4cdec_2sa_3_sa_3VEB__first(struct __pyx_obj_4cdec_2sa_3_sa_VE
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":385
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":385
  *         return self.veb.min_val
  * 
  *     cdef int _findsucc(self, int i):             # <<<<<<<<<<<<<<
@@ -23242,7 +23242,7 @@ static int __pyx_f_4cdec_2sa_3_sa_3VEB__findsucc(struct __pyx_obj_4cdec_2sa_3_sa
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("_findsucc", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":386
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":386
  * 
  *     cdef int _findsucc(self, int i):
  *         return VEB_findsucc(self.veb, i)             # <<<<<<<<<<<<<<
@@ -23252,7 +23252,7 @@ static int __pyx_f_4cdec_2sa_3_sa_3VEB__findsucc(struct __pyx_obj_4cdec_2sa_3_sa
   __pyx_r = __pyx_f_4cdec_2sa_3_sa_VEB_findsucc(__pyx_v_self->veb, __pyx_v_i);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":385
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":385
  *         return self.veb.min_val
  * 
  *     cdef int _findsucc(self, int i):             # <<<<<<<<<<<<<<
@@ -23266,7 +23266,7 @@ static int __pyx_f_4cdec_2sa_3_sa_3VEB__findsucc(struct __pyx_obj_4cdec_2sa_3_sa
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":388
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":388
  *         return VEB_findsucc(self.veb, i)
  * 
  *     def __len__(self):             # <<<<<<<<<<<<<<
@@ -23292,7 +23292,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_3VEB_10__len__(struct __pyx_obj_4cdec_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":389
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":389
  * 
  *     def __len__(self):
  *         return self.veb.size             # <<<<<<<<<<<<<<
@@ -23302,7 +23302,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_3VEB_10__len__(struct __pyx_obj_4cdec_
   __pyx_r = __pyx_v_self->veb->size;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":388
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":388
  *         return VEB_findsucc(self.veb, i)
  * 
  *     def __len__(self):             # <<<<<<<<<<<<<<
@@ -23316,7 +23316,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_3VEB_10__len__(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":391
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":391
  *         return self.veb.size
  * 
  *     def __contains__(self, i):             # <<<<<<<<<<<<<<
@@ -23345,7 +23345,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3VEB_12__contains__(struct __pyx_obj_4cdec_2s
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__contains__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":392
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":392
  * 
  *     def __contains__(self, i):
  *         return VEB_contains(self.veb, i)             # <<<<<<<<<<<<<<
@@ -23354,7 +23354,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3VEB_12__contains__(struct __pyx_obj_4cdec_2s
   __pyx_r = __pyx_f_4cdec_2sa_3_sa_VEB_contains(__pyx_v_self->veb, __pyx_t_1);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":391
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":391
  *         return self.veb.size
  * 
  *     def __contains__(self, i):             # <<<<<<<<<<<<<<
@@ -23370,7 +23370,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3VEB_12__contains__(struct __pyx_obj_4cdec_2s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":9
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":9
  *     cdef IntList lcp
  * 
  *     def __cinit__(self, SuffixArray sa):             # <<<<<<<<<<<<<<
@@ -23456,7 +23456,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":13
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":13
  *         cdef IntList rank
  * 
  *         logger.info("Constructing LCP array")             # <<<<<<<<<<<<<<
@@ -23473,7 +23473,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":14
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":14
  * 
  *         logger.info("Constructing LCP array")
  *         self.sa = sa             # <<<<<<<<<<<<<<
@@ -23486,7 +23486,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
   __Pyx_DECREF(((PyObject *)__pyx_v_self->sa));
   __pyx_v_self->sa = __pyx_v_sa;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":15
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":15
  *         logger.info("Constructing LCP array")
  *         self.sa = sa
  *         n = self.sa.sa.len             # <<<<<<<<<<<<<<
@@ -23496,7 +23496,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
   __pyx_t_3 = __pyx_v_self->sa->sa->len;
   __pyx_v_n = __pyx_t_3;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":16
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":16
  *         self.sa = sa
  *         n = self.sa.sa.len
  *         self.lcp = IntList(initial_len=n)             # <<<<<<<<<<<<<<
@@ -23518,7 +23518,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
   __pyx_v_self->lcp = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":18
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":18
  *         self.lcp = IntList(initial_len=n)
  * 
  *         rank = IntList(initial_len=n)             # <<<<<<<<<<<<<<
@@ -23537,7 +23537,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
   __pyx_v_rank = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":19
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":19
  * 
  *         rank = IntList(initial_len=n)
  *         for i from 0 <= i < n:             # <<<<<<<<<<<<<<
@@ -23547,7 +23547,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
   __pyx_t_3 = __pyx_v_n;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":20
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":20
  *         rank = IntList(initial_len=n)
  *         for i from 0 <= i < n:
  *             rank.arr[sa.sa.arr[i]] = i             # <<<<<<<<<<<<<<
@@ -23557,7 +23557,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
     (__pyx_v_rank->arr[(__pyx_v_sa->sa->arr[__pyx_v_i])]) = __pyx_v_i;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":22
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":22
  *             rank.arr[sa.sa.arr[i]] = i
  * 
  *         h = 0             # <<<<<<<<<<<<<<
@@ -23566,7 +23566,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
  */
   __pyx_v_h = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":23
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":23
  * 
  *         h = 0
  *         for i from 0 <= i < n:             # <<<<<<<<<<<<<<
@@ -23576,7 +23576,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
   __pyx_t_3 = __pyx_v_n;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":24
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":24
  *         h = 0
  *         for i from 0 <= i < n:
  *             k = rank.arr[i]             # <<<<<<<<<<<<<<
@@ -23585,7 +23585,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
  */
     __pyx_v_k = (__pyx_v_rank->arr[__pyx_v_i]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":25
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":25
  *         for i from 0 <= i < n:
  *             k = rank.arr[i]
  *             if k == 0:             # <<<<<<<<<<<<<<
@@ -23595,7 +23595,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
     __pyx_t_4 = ((__pyx_v_k == 0) != 0);
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":26
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":26
  *             k = rank.arr[i]
  *             if k == 0:
  *                 self.lcp.arr[k] = -1             # <<<<<<<<<<<<<<
@@ -23607,7 +23607,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":28
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":28
  *                 self.lcp.arr[k] = -1
  *             else:
  *                 j = sa.sa.arr[k-1]             # <<<<<<<<<<<<<<
@@ -23616,7 +23616,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
  */
       __pyx_v_j = (__pyx_v_sa->sa->arr[(__pyx_v_k - 1)]);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":29
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":29
  *             else:
  *                 j = sa.sa.arr[k-1]
  *                 while i+h < n and j+h < n and sa.darray.data.arr[i+h] == sa.darray.data.arr[j+h]:             # <<<<<<<<<<<<<<
@@ -23639,7 +23639,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
         }
         if (!__pyx_t_5) break;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":30
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":30
  *                 j = sa.sa.arr[k-1]
  *                 while i+h < n and j+h < n and sa.darray.data.arr[i+h] == sa.darray.data.arr[j+h]:
  *                     h = h+1             # <<<<<<<<<<<<<<
@@ -23649,7 +23649,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
         __pyx_v_h = (__pyx_v_h + 1);
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":31
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":31
  *                 while i+h < n and j+h < n and sa.darray.data.arr[i+h] == sa.darray.data.arr[j+h]:
  *                     h = h+1
  *                 self.lcp.arr[k] = h             # <<<<<<<<<<<<<<
@@ -23660,7 +23660,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
     }
     __pyx_L7:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":32
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":32
  *                     h = h+1
  *                 self.lcp.arr[k] = h
  *             if h > 0:             # <<<<<<<<<<<<<<
@@ -23670,7 +23670,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
     __pyx_t_5 = ((__pyx_v_h > 0) != 0);
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":33
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":33
  *                 self.lcp.arr[k] = h
  *             if h > 0:
  *                 h = h-1             # <<<<<<<<<<<<<<
@@ -23683,7 +23683,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
     __pyx_L10:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":34
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":34
  *             if h > 0:
  *                 h = h-1
  *         logger.info("LCP array completed")             # <<<<<<<<<<<<<<
@@ -23700,7 +23700,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":9
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":9
  *     cdef IntList lcp
  * 
  *     def __cinit__(self, SuffixArray sa):             # <<<<<<<<<<<<<<
@@ -23723,7 +23723,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_3LCP___cinit__(struct __pyx_obj_4cdec_2sa_3_s
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":36
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":36
  *         logger.info("LCP array completed")
  * 
  *     def compute_stats(self, int max_n):             # <<<<<<<<<<<<<<
@@ -23825,7 +23825,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[9]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":48
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":48
  *         cdef VEB veb
  * 
  *         N = self.sa.sa.len             # <<<<<<<<<<<<<<
@@ -23835,7 +23835,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
   __pyx_t_1 = __pyx_cur_scope->__pyx_v_self->sa->sa->len;
   __pyx_cur_scope->__pyx_v_N = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":50
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":50
  *         N = self.sa.sa.len
  * 
  *         ngram_starts = []             # <<<<<<<<<<<<<<
@@ -23848,7 +23848,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
   __pyx_cur_scope->__pyx_v_ngram_starts = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":51
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":51
  * 
  *         ngram_starts = []
  *         for n from 0 <= n < max_n:             # <<<<<<<<<<<<<<
@@ -23858,7 +23858,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
   __pyx_t_1 = __pyx_cur_scope->__pyx_v_max_n;
   for (__pyx_cur_scope->__pyx_v_n = 0; __pyx_cur_scope->__pyx_v_n < __pyx_t_1; __pyx_cur_scope->__pyx_v_n++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":52
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":52
  *         ngram_starts = []
  *         for n from 0 <= n < max_n:
  *             ngram_starts.append(IntList(initial_len=N))             # <<<<<<<<<<<<<<
@@ -23878,7 +23878,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":54
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":54
  *             ngram_starts.append(IntList(initial_len=N))
  * 
  *         run_start = IntList(initial_len=max_n)             # <<<<<<<<<<<<<<
@@ -23898,7 +23898,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
   __pyx_cur_scope->__pyx_v_run_start = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":55
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":55
  * 
  *         run_start = IntList(initial_len=max_n)
  *         veb = VEB(N)             # <<<<<<<<<<<<<<
@@ -23919,7 +23919,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
   __pyx_cur_scope->__pyx_v_veb = ((struct __pyx_obj_4cdec_2sa_3_sa_VEB *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":57
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":57
  *         veb = VEB(N)
  * 
  *         for i from 0 <= i < N:             # <<<<<<<<<<<<<<
@@ -23929,7 +23929,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
   __pyx_t_1 = __pyx_cur_scope->__pyx_v_N;
   for (__pyx_cur_scope->__pyx_v_i = 0; __pyx_cur_scope->__pyx_v_i < __pyx_t_1; __pyx_cur_scope->__pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":58
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":58
  * 
  *         for i from 0 <= i < N:
  *             h = self.lcp.arr[i]             # <<<<<<<<<<<<<<
@@ -23938,7 +23938,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
  */
     __pyx_cur_scope->__pyx_v_h = (__pyx_cur_scope->__pyx_v_self->lcp->arr[__pyx_cur_scope->__pyx_v_i]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":59
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":59
  *         for i from 0 <= i < N:
  *             h = self.lcp.arr[i]
  *             if h < 0:             # <<<<<<<<<<<<<<
@@ -23948,7 +23948,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
     __pyx_t_5 = ((__pyx_cur_scope->__pyx_v_h < 0) != 0);
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":60
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":60
  *             h = self.lcp.arr[i]
  *             if h < 0:
  *                 h = 0             # <<<<<<<<<<<<<<
@@ -23960,7 +23960,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
     }
     __pyx_L8:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":61
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":61
  *             if h < 0:
  *                 h = 0
  *             for n from h <= n < max_n:             # <<<<<<<<<<<<<<
@@ -23970,7 +23970,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
     __pyx_t_6 = __pyx_cur_scope->__pyx_v_max_n;
     for (__pyx_cur_scope->__pyx_v_n = __pyx_cur_scope->__pyx_v_h; __pyx_cur_scope->__pyx_v_n < __pyx_t_6; __pyx_cur_scope->__pyx_v_n++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":62
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":62
  *                 h = 0
  *             for n from h <= n < max_n:
  *                 rs = run_start.arr[n]             # <<<<<<<<<<<<<<
@@ -23979,7 +23979,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
  */
       __pyx_cur_scope->__pyx_v_rs = (__pyx_cur_scope->__pyx_v_run_start->arr[__pyx_cur_scope->__pyx_v_n]);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":63
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":63
  *             for n from h <= n < max_n:
  *                 rs = run_start.arr[n]
  *                 run_start.arr[n] = i             # <<<<<<<<<<<<<<
@@ -23988,7 +23988,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
  */
       (__pyx_cur_scope->__pyx_v_run_start->arr[__pyx_cur_scope->__pyx_v_n]) = __pyx_cur_scope->__pyx_v_i;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":64
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":64
  *                 rs = run_start.arr[n]
  *                 run_start.arr[n] = i
  *                 freq = i - rs             # <<<<<<<<<<<<<<
@@ -23997,7 +23997,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
  */
       __pyx_cur_scope->__pyx_v_freq = (__pyx_cur_scope->__pyx_v_i - __pyx_cur_scope->__pyx_v_rs);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":65
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":65
  *                 run_start.arr[n] = i
  *                 freq = i - rs
  *                 if freq > 1000: # arbitrary, but see note below             # <<<<<<<<<<<<<<
@@ -24007,7 +24007,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
       __pyx_t_5 = ((__pyx_cur_scope->__pyx_v_freq > 1000) != 0);
       if (__pyx_t_5) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":66
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":66
  *                 freq = i - rs
  *                 if freq > 1000: # arbitrary, but see note below
  *                     veb._insert(freq)             # <<<<<<<<<<<<<<
@@ -24016,7 +24016,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
  */
         ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_VEB *)__pyx_cur_scope->__pyx_v_veb->__pyx_vtab)->_insert(__pyx_cur_scope->__pyx_v_veb, __pyx_cur_scope->__pyx_v_freq);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":67
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":67
  *                 if freq > 1000: # arbitrary, but see note below
  *                     veb._insert(freq)
  *                     ngram_start = ngram_starts[n]             # <<<<<<<<<<<<<<
@@ -24031,7 +24031,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
         __Pyx_GIVEREF(__pyx_t_2);
         __pyx_t_2 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":68
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":68
  *                     veb._insert(freq)
  *                     ngram_start = ngram_starts[n]
  *                     while ngram_start.arr[freq] > 0:             # <<<<<<<<<<<<<<
@@ -24042,7 +24042,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
           __pyx_t_5 = (((__pyx_cur_scope->__pyx_v_ngram_start->arr[__pyx_cur_scope->__pyx_v_freq]) > 0) != 0);
           if (!__pyx_t_5) break;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":69
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":69
  *                     ngram_start = ngram_starts[n]
  *                     while ngram_start.arr[freq] > 0:
  *                         freq = freq + 1 # cheating a bit, should be ok for sparse histogram             # <<<<<<<<<<<<<<
@@ -24052,7 +24052,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
           __pyx_cur_scope->__pyx_v_freq = (__pyx_cur_scope->__pyx_v_freq + 1);
         }
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":70
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":70
  *                     while ngram_start.arr[freq] > 0:
  *                         freq = freq + 1 # cheating a bit, should be ok for sparse histogram
  *                     ngram_start.arr[freq] = rs             # <<<<<<<<<<<<<<
@@ -24066,7 +24066,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
     }
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":71
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":71
  *                         freq = freq + 1 # cheating a bit, should be ok for sparse histogram
  *                     ngram_start.arr[freq] = rs
  *         i = veb.veb.min_val             # <<<<<<<<<<<<<<
@@ -24076,7 +24076,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
   __pyx_t_1 = __pyx_cur_scope->__pyx_v_veb->veb->min_val;
   __pyx_cur_scope->__pyx_v_i = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":72
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":72
  *                     ngram_start.arr[freq] = rs
  *         i = veb.veb.min_val
  *         while i != -1:             # <<<<<<<<<<<<<<
@@ -24087,7 +24087,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
     __pyx_t_5 = ((__pyx_cur_scope->__pyx_v_i != -1) != 0);
     if (!__pyx_t_5) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":73
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":73
  *         i = veb.veb.min_val
  *         while i != -1:
  *             ii = veb._findsucc(i)             # <<<<<<<<<<<<<<
@@ -24096,7 +24096,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
  */
     __pyx_cur_scope->__pyx_v_ii = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_VEB *)__pyx_cur_scope->__pyx_v_veb->__pyx_vtab)->_findsucc(__pyx_cur_scope->__pyx_v_veb, __pyx_cur_scope->__pyx_v_i);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":74
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":74
  *         while i != -1:
  *             ii = veb._findsucc(i)
  *             for n from 0 <= n < max_n:             # <<<<<<<<<<<<<<
@@ -24106,7 +24106,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
     __pyx_t_1 = __pyx_cur_scope->__pyx_v_max_n;
     for (__pyx_cur_scope->__pyx_v_n = 0; __pyx_cur_scope->__pyx_v_n < __pyx_t_1; __pyx_cur_scope->__pyx_v_n++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":75
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":75
  *             ii = veb._findsucc(i)
  *             for n from 0 <= n < max_n:
  *                 ngram_start = ngram_starts[n]             # <<<<<<<<<<<<<<
@@ -24121,7 +24121,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
       __Pyx_GIVEREF(__pyx_t_2);
       __pyx_t_2 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":76
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":76
  *             for n from 0 <= n < max_n:
  *                 ngram_start = ngram_starts[n]
  *                 iii = i             # <<<<<<<<<<<<<<
@@ -24130,7 +24130,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
  */
       __pyx_cur_scope->__pyx_v_iii = __pyx_cur_scope->__pyx_v_i;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":77
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":77
  *                 ngram_start = ngram_starts[n]
  *                 iii = i
  *                 rs = ngram_start.arr[iii]             # <<<<<<<<<<<<<<
@@ -24139,7 +24139,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
  */
       __pyx_cur_scope->__pyx_v_rs = (__pyx_cur_scope->__pyx_v_ngram_start->arr[__pyx_cur_scope->__pyx_v_iii]);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":78
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":78
  *                 iii = i
  *                 rs = ngram_start.arr[iii]
  *                 while (ii==-1 or iii < ii) and rs != 0:             # <<<<<<<<<<<<<<
@@ -24162,7 +24162,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
         }
         if (!__pyx_t_7) break;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":79
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":79
  *                 rs = ngram_start.arr[iii]
  *                 while (ii==-1 or iii < ii) and rs != 0:
  *                     j = self.sa.sa.arr[rs]             # <<<<<<<<<<<<<<
@@ -24171,7 +24171,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
  */
         __pyx_cur_scope->__pyx_v_j = (__pyx_cur_scope->__pyx_v_self->sa->sa->arr[__pyx_cur_scope->__pyx_v_rs]);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":80
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":80
  *                 while (ii==-1 or iii < ii) and rs != 0:
  *                     j = self.sa.sa.arr[rs]
  *                     valid = 1             # <<<<<<<<<<<<<<
@@ -24180,7 +24180,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
  */
         __pyx_cur_scope->__pyx_v_valid = 1;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":81
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":81
  *                     j = self.sa.sa.arr[rs]
  *                     valid = 1
  *                     for k from 0 <= k < n+1:             # <<<<<<<<<<<<<<
@@ -24190,7 +24190,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
         __pyx_t_9 = (__pyx_cur_scope->__pyx_v_n + 1);
         for (__pyx_cur_scope->__pyx_v_k = 0; __pyx_cur_scope->__pyx_v_k < __pyx_t_9; __pyx_cur_scope->__pyx_v_k++) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":82
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":82
  *                     valid = 1
  *                     for k from 0 <= k < n+1:
  *                         if self.sa.darray.data.arr[j+k] < 2:             # <<<<<<<<<<<<<<
@@ -24200,7 +24200,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
           __pyx_t_7 = (((__pyx_cur_scope->__pyx_v_self->sa->darray->data->arr[(__pyx_cur_scope->__pyx_v_j + __pyx_cur_scope->__pyx_v_k)]) < 2) != 0);
           if (__pyx_t_7) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":83
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":83
  *                     for k from 0 <= k < n+1:
  *                         if self.sa.darray.data.arr[j+k] < 2:
  *                             valid = 0             # <<<<<<<<<<<<<<
@@ -24213,7 +24213,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
           __pyx_L22:;
         }
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":84
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":84
  *                         if self.sa.darray.data.arr[j+k] < 2:
  *                             valid = 0
  *                     if valid:             # <<<<<<<<<<<<<<
@@ -24223,7 +24223,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
         __pyx_t_7 = (__pyx_cur_scope->__pyx_v_valid != 0);
         if (__pyx_t_7) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":85
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":85
  *                             valid = 0
  *                     if valid:
  *                         ngram = tuple([self.sa.darray.data.arr[j+k] for k in range(n+1)])             # <<<<<<<<<<<<<<
@@ -24248,7 +24248,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
           __Pyx_GIVEREF(__pyx_t_3);
           __pyx_t_3 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":86
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":86
  *                     if valid:
  *                         ngram = tuple([self.sa.darray.data.arr[j+k] for k in range(n+1)])
  *                         yield i, n+1, ngram             # <<<<<<<<<<<<<<
@@ -24285,7 +24285,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
         }
         __pyx_L23:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":87
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":87
  *                         ngram = tuple([self.sa.darray.data.arr[j+k] for k in range(n+1)])
  *                         yield i, n+1, ngram
  *                     iii = iii + 1             # <<<<<<<<<<<<<<
@@ -24294,7 +24294,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
  */
         __pyx_cur_scope->__pyx_v_iii = (__pyx_cur_scope->__pyx_v_iii + 1);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":88
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":88
  *                         yield i, n+1, ngram
  *                     iii = iii + 1
  *                     rs = ngram_start.arr[iii]             # <<<<<<<<<<<<<<
@@ -24304,7 +24304,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
       }
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":89
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":89
  *                     iii = iii + 1
  *                     rs = ngram_start.arr[iii]
  *             i = ii             # <<<<<<<<<<<<<<
@@ -24312,7 +24312,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
     __pyx_cur_scope->__pyx_v_i = __pyx_cur_scope->__pyx_v_ii;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":36
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":36
  *         logger.info("LCP array completed")
  * 
  *     def compute_stats(self, int max_n):             # <<<<<<<<<<<<<<
@@ -24336,7 +24336,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_3LCP_4generator1(__pyx_GeneratorObject
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":12
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":12
  *     cdef dict id2sym
  * 
  *     def __cinit__(self):             # <<<<<<<<<<<<<<
@@ -24369,7 +24369,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_8Alphabet___cinit__(struct __pyx_obj_4cdec_2s
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":13
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":13
  * 
  *     def __cinit__(self):
  *         self.terminals = StringMap()             # <<<<<<<<<<<<<<
@@ -24384,7 +24384,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_8Alphabet___cinit__(struct __pyx_obj_4cdec_2s
   __pyx_v_self->terminals = ((struct __pyx_obj_4cdec_2sa_3_sa_StringMap *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":14
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":14
  *     def __cinit__(self):
  *         self.terminals = StringMap()
  *         self.nonterminals = StringMap()             # <<<<<<<<<<<<<<
@@ -24399,7 +24399,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_8Alphabet___cinit__(struct __pyx_obj_4cdec_2s
   __pyx_v_self->nonterminals = ((struct __pyx_obj_4cdec_2sa_3_sa_StringMap *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":15
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":15
  *         self.terminals = StringMap()
  *         self.nonterminals = StringMap()
  *         self.id2sym = {}             # <<<<<<<<<<<<<<
@@ -24414,7 +24414,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_8Alphabet___cinit__(struct __pyx_obj_4cdec_2s
   __pyx_v_self->id2sym = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":16
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":16
  *         self.nonterminals = StringMap()
  *         self.id2sym = {}
  *         self.first_nonterminal = -1             # <<<<<<<<<<<<<<
@@ -24423,7 +24423,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_8Alphabet___cinit__(struct __pyx_obj_4cdec_2s
  */
   __pyx_v_self->first_nonterminal = -1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":12
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":12
  *     cdef dict id2sym
  * 
  *     def __cinit__(self):             # <<<<<<<<<<<<<<
@@ -24443,7 +24443,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_8Alphabet___cinit__(struct __pyx_obj_4cdec_2s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":18
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":18
  *         self.first_nonterminal = -1
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -24470,7 +24470,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_8Alphabet_2__dealloc__(CYTHON_UNUSED struct
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":21
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":21
  *         pass
  * 
  *     cdef int isvar(self, int sym):             # <<<<<<<<<<<<<<
@@ -24483,7 +24483,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_isvar(CYTHON_UNUSED struct __pyx_obj
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("isvar", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":22
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":22
  * 
  *     cdef int isvar(self, int sym):
  *         return sym < 0             # <<<<<<<<<<<<<<
@@ -24493,7 +24493,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_isvar(CYTHON_UNUSED struct __pyx_obj
   __pyx_r = (__pyx_v_sym < 0);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":21
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":21
  *         pass
  * 
  *     cdef int isvar(self, int sym):             # <<<<<<<<<<<<<<
@@ -24507,7 +24507,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_isvar(CYTHON_UNUSED struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":24
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":24
  *         return sym < 0
  * 
  *     cdef int isword(self, int sym):             # <<<<<<<<<<<<<<
@@ -24520,7 +24520,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_isword(CYTHON_UNUSED struct __pyx_ob
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("isword", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":25
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":25
  * 
  *     cdef int isword(self, int sym):
  *         return sym >= 0             # <<<<<<<<<<<<<<
@@ -24530,7 +24530,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_isword(CYTHON_UNUSED struct __pyx_ob
   __pyx_r = (__pyx_v_sym >= 0);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":24
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":24
  *         return sym < 0
  * 
  *     cdef int isword(self, int sym):             # <<<<<<<<<<<<<<
@@ -24544,7 +24544,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_isword(CYTHON_UNUSED struct __pyx_ob
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":27
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":27
  *         return sym >= 0
  * 
  *     cdef int getindex(self, int sym):             # <<<<<<<<<<<<<<
@@ -24557,7 +24557,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_getindex(CYTHON_UNUSED struct __pyx_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("getindex", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":28
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":28
  * 
  *     cdef int getindex(self, int sym):
  *         return -sym & INDEX_MASK             # <<<<<<<<<<<<<<
@@ -24567,7 +24567,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_getindex(CYTHON_UNUSED struct __pyx_
   __pyx_r = ((-__pyx_v_sym) & __pyx_v_4cdec_2sa_3_sa_INDEX_MASK);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":27
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":27
  *         return sym >= 0
  * 
  *     cdef int getindex(self, int sym):             # <<<<<<<<<<<<<<
@@ -24581,7 +24581,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_getindex(CYTHON_UNUSED struct __pyx_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":30
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":30
  *         return -sym & INDEX_MASK
  * 
  *     cdef int setindex(self, int sym, int ind):             # <<<<<<<<<<<<<<
@@ -24594,7 +24594,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_setindex(CYTHON_UNUSED struct __pyx_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("setindex", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":31
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":31
  * 
  *     cdef int setindex(self, int sym, int ind):
  *         return -(-sym & ~INDEX_MASK | ind)             # <<<<<<<<<<<<<<
@@ -24604,7 +24604,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_setindex(CYTHON_UNUSED struct __pyx_
   __pyx_r = (-(((-__pyx_v_sym) & (~__pyx_v_4cdec_2sa_3_sa_INDEX_MASK)) | __pyx_v_ind));
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":30
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":30
  *         return -sym & INDEX_MASK
  * 
  *     cdef int setindex(self, int sym, int ind):             # <<<<<<<<<<<<<<
@@ -24618,7 +24618,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_setindex(CYTHON_UNUSED struct __pyx_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":33
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":33
  *         return -(-sym & ~INDEX_MASK | ind)
  * 
  *     cdef int clearindex(self, int sym):             # <<<<<<<<<<<<<<
@@ -24631,7 +24631,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_clearindex(CYTHON_UNUSED struct __py
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("clearindex", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":34
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":34
  * 
  *     cdef int clearindex(self, int sym):
  *         return -(-sym& ~INDEX_MASK)             # <<<<<<<<<<<<<<
@@ -24641,7 +24641,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_clearindex(CYTHON_UNUSED struct __py
   __pyx_r = (-((-__pyx_v_sym) & (~__pyx_v_4cdec_2sa_3_sa_INDEX_MASK)));
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":33
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":33
  *         return -(-sym & ~INDEX_MASK | ind)
  * 
  *     cdef int clearindex(self, int sym):             # <<<<<<<<<<<<<<
@@ -24655,7 +24655,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_clearindex(CYTHON_UNUSED struct __py
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":36
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":36
  *         return -(-sym& ~INDEX_MASK)
  * 
  *     cdef int match(self, int sym1, int sym2):             # <<<<<<<<<<<<<<
@@ -24668,7 +24668,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_match(struct __pyx_obj_4cdec_2sa_3_s
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("match", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":37
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":37
  * 
  *     cdef int match(self, int sym1, int sym2):
  *         return self.clearindex(sym1) == self.clearindex(sym2);             # <<<<<<<<<<<<<<
@@ -24678,7 +24678,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_match(struct __pyx_obj_4cdec_2sa_3_s
   __pyx_r = (((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alphabet *)__pyx_v_self->__pyx_vtab)->clearindex(__pyx_v_self, __pyx_v_sym1) == ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alphabet *)__pyx_v_self->__pyx_vtab)->clearindex(__pyx_v_self, __pyx_v_sym2));
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":36
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":36
  *         return -(-sym& ~INDEX_MASK)
  * 
  *     cdef int match(self, int sym1, int sym2):             # <<<<<<<<<<<<<<
@@ -24692,7 +24692,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_match(struct __pyx_obj_4cdec_2sa_3_s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":39
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":39
  *         return self.clearindex(sym1) == self.clearindex(sym2);
  * 
  *     cdef char* tocat(self, int sym):             # <<<<<<<<<<<<<<
@@ -24705,7 +24705,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_8Alphabet_tocat(struct __pyx_obj_4cdec_2sa_3
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("tocat", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":40
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":40
  * 
  *     cdef char* tocat(self, int sym):
  *         return self.nonterminals.word((-sym >> INDEX_SHIFT)-1)             # <<<<<<<<<<<<<<
@@ -24715,7 +24715,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_8Alphabet_tocat(struct __pyx_obj_4cdec_2sa_3
   __pyx_r = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_StringMap *)__pyx_v_self->nonterminals->__pyx_vtab)->word(__pyx_v_self->nonterminals, (((-__pyx_v_sym) >> __pyx_v_4cdec_2sa_3_sa_INDEX_SHIFT) - 1));
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":39
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":39
  *         return self.clearindex(sym1) == self.clearindex(sym2);
  * 
  *     cdef char* tocat(self, int sym):             # <<<<<<<<<<<<<<
@@ -24729,7 +24729,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_8Alphabet_tocat(struct __pyx_obj_4cdec_2sa_3
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":42
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":42
  *         return self.nonterminals.word((-sym >> INDEX_SHIFT)-1)
  * 
  *     cdef int fromcat(self, char *s):             # <<<<<<<<<<<<<<
@@ -24744,7 +24744,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromcat(struct __pyx_obj_4cdec_2sa_3
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("fromcat", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":44
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":44
  *     cdef int fromcat(self, char *s):
  *         cdef int i
  *         i = self.nonterminals.index(s)             # <<<<<<<<<<<<<<
@@ -24753,7 +24753,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromcat(struct __pyx_obj_4cdec_2sa_3
  */
   __pyx_v_i = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_StringMap *)__pyx_v_self->nonterminals->__pyx_vtab)->index(__pyx_v_self->nonterminals, __pyx_v_s);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":45
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":45
  *         cdef int i
  *         i = self.nonterminals.index(s)
  *         if self.first_nonterminal == -1:             # <<<<<<<<<<<<<<
@@ -24763,7 +24763,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromcat(struct __pyx_obj_4cdec_2sa_3
   __pyx_t_1 = ((__pyx_v_self->first_nonterminal == -1) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":46
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":46
  *         i = self.nonterminals.index(s)
  *         if self.first_nonterminal == -1:
  *             self.first_nonterminal = i             # <<<<<<<<<<<<<<
@@ -24775,7 +24775,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromcat(struct __pyx_obj_4cdec_2sa_3
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":47
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":47
  *         if self.first_nonterminal == -1:
  *             self.first_nonterminal = i
  *         if i > self.last_nonterminal:             # <<<<<<<<<<<<<<
@@ -24785,7 +24785,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromcat(struct __pyx_obj_4cdec_2sa_3
   __pyx_t_1 = ((__pyx_v_i > __pyx_v_self->last_nonterminal) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":48
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":48
  *             self.first_nonterminal = i
  *         if i > self.last_nonterminal:
  *             self.last_nonterminal = i             # <<<<<<<<<<<<<<
@@ -24797,7 +24797,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromcat(struct __pyx_obj_4cdec_2sa_3
   }
   __pyx_L4:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":49
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":49
  *         if i > self.last_nonterminal:
  *             self.last_nonterminal = i
  *         return -(i+1 << INDEX_SHIFT)             # <<<<<<<<<<<<<<
@@ -24807,7 +24807,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromcat(struct __pyx_obj_4cdec_2sa_3
   __pyx_r = (-((__pyx_v_i + 1) << __pyx_v_4cdec_2sa_3_sa_INDEX_SHIFT));
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":42
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":42
  *         return self.nonterminals.word((-sym >> INDEX_SHIFT)-1)
  * 
  *     cdef int fromcat(self, char *s):             # <<<<<<<<<<<<<<
@@ -24821,7 +24821,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromcat(struct __pyx_obj_4cdec_2sa_3
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":51
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":51
  *         return -(i+1 << INDEX_SHIFT)
  * 
  *     cdef char* tostring(self, int sym):             # <<<<<<<<<<<<<<
@@ -24844,7 +24844,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_8Alphabet_tostring(struct __pyx_obj_4cdec_2s
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("tostring", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":53
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":53
  *     cdef char* tostring(self, int sym):
  *         cdef int ind
  *         if self.isvar(sym):             # <<<<<<<<<<<<<<
@@ -24854,7 +24854,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_8Alphabet_tostring(struct __pyx_obj_4cdec_2s
   __pyx_t_1 = (((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alphabet *)__pyx_v_self->__pyx_vtab)->isvar(__pyx_v_self, __pyx_v_sym) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":54
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":54
  *         cdef int ind
  *         if self.isvar(sym):
  *             if sym in self.id2sym:             # <<<<<<<<<<<<<<
@@ -24872,7 +24872,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_8Alphabet_tostring(struct __pyx_obj_4cdec_2s
     __pyx_t_3 = (__pyx_t_1 != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":55
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":55
  *         if self.isvar(sym):
  *             if sym in self.id2sym:
  *                 return self.id2sym[sym]             # <<<<<<<<<<<<<<
@@ -24894,7 +24894,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_8Alphabet_tostring(struct __pyx_obj_4cdec_2s
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":56
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":56
  *             if sym in self.id2sym:
  *                 return self.id2sym[sym]
  *             ind = self.getindex(sym)             # <<<<<<<<<<<<<<
@@ -24903,7 +24903,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_8Alphabet_tostring(struct __pyx_obj_4cdec_2s
  */
     __pyx_v_ind = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alphabet *)__pyx_v_self->__pyx_vtab)->getindex(__pyx_v_self, __pyx_v_sym);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":57
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":57
  *                 return self.id2sym[sym]
  *             ind = self.getindex(sym)
  *             if ind > 0:             # <<<<<<<<<<<<<<
@@ -24913,7 +24913,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_8Alphabet_tostring(struct __pyx_obj_4cdec_2s
     __pyx_t_3 = ((__pyx_v_ind > 0) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":58
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":58
  *             ind = self.getindex(sym)
  *             if ind > 0:
  *                 self.id2sym[sym] = "[%s,%d]" % (self.tocat(sym), ind)             # <<<<<<<<<<<<<<
@@ -24948,7 +24948,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_8Alphabet_tostring(struct __pyx_obj_4cdec_2s
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":60
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":60
  *                 self.id2sym[sym] = "[%s,%d]" % (self.tocat(sym), ind)
  *             else:
  *                 self.id2sym[sym] = "[%s]" % self.tocat(sym)             # <<<<<<<<<<<<<<
@@ -24972,7 +24972,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_8Alphabet_tostring(struct __pyx_obj_4cdec_2s
     }
     __pyx_L5:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":61
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":61
  *             else:
  *                 self.id2sym[sym] = "[%s]" % self.tocat(sym)
  *             return self.id2sym[sym]             # <<<<<<<<<<<<<<
@@ -24995,7 +24995,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_8Alphabet_tostring(struct __pyx_obj_4cdec_2s
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":63
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":63
  *             return self.id2sym[sym]
  *         else:
  *             return self.terminals.word(sym)             # <<<<<<<<<<<<<<
@@ -25006,7 +25006,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_8Alphabet_tostring(struct __pyx_obj_4cdec_2s
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":51
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":51
  *         return -(i+1 << INDEX_SHIFT)
  * 
  *     cdef char* tostring(self, int sym):             # <<<<<<<<<<<<<<
@@ -25026,7 +25026,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_8Alphabet_tostring(struct __pyx_obj_4cdec_2s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":65
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":65
  *             return self.terminals.word(sym)
  * 
  *     cdef int fromstring(self, char *s, bint terminal):             # <<<<<<<<<<<<<<
@@ -25054,7 +25054,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("fromstring", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":69
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":69
  *         cdef char *comma
  *         cdef int n
  *         n = strlen(s)             # <<<<<<<<<<<<<<
@@ -25063,7 +25063,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
  */
   __pyx_v_n = strlen(__pyx_v_s);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":71
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":71
  *         n = strlen(s)
  *         cdef char *sep
  *         sep = strstr(s,"_SEP_")             # <<<<<<<<<<<<<<
@@ -25072,7 +25072,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
  */
   __pyx_v_sep = strstr(__pyx_v_s, __pyx_k_SEP);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":72
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":72
  *         cdef char *sep
  *         sep = strstr(s,"_SEP_")
  *         if n >= 3 and s[0] == c'[' and s[n-1] == c']' and sep == NULL:             # <<<<<<<<<<<<<<
@@ -25100,7 +25100,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
   }
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":73
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":73
  *         sep = strstr(s,"_SEP_")
  *         if n >= 3 and s[0] == c'[' and s[n-1] == c']' and sep == NULL:
  *             if terminal:             # <<<<<<<<<<<<<<
@@ -25110,7 +25110,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
     __pyx_t_2 = (__pyx_v_terminal != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":74
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":74
  *         if n >= 3 and s[0] == c'[' and s[n-1] == c']' and sep == NULL:
  *             if terminal:
  *                 s1 = "\\"+s             # <<<<<<<<<<<<<<
@@ -25125,7 +25125,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
       __pyx_v_s1 = __pyx_t_7;
       __pyx_t_7 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":75
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":75
  *             if terminal:
  *                 s1 = "\\"+s
  *                 return self.terminals.index(s1)             # <<<<<<<<<<<<<<
@@ -25137,7 +25137,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":76
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":76
  *                 s1 = "\\"+s
  *                 return self.terminals.index(s1)
  *             s[n-1] = c'\0'             # <<<<<<<<<<<<<<
@@ -25146,7 +25146,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
  */
     (__pyx_v_s[(__pyx_v_n - 1)]) = '\x00';
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":77
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":77
  *                 return self.terminals.index(s1)
  *             s[n-1] = c'\0'
  *             s = s + 1             # <<<<<<<<<<<<<<
@@ -25155,7 +25155,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
  */
     __pyx_v_s = (__pyx_v_s + 1);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":78
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":78
  *             s[n-1] = c'\0'
  *             s = s + 1
  *             comma = strrchr(s, c',')             # <<<<<<<<<<<<<<
@@ -25164,7 +25164,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
  */
     __pyx_v_comma = strrchr(__pyx_v_s, ',');
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":79
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":79
  *             s = s + 1
  *             comma = strrchr(s, c',')
  *             if comma != NULL:             # <<<<<<<<<<<<<<
@@ -25174,7 +25174,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
     __pyx_t_2 = ((__pyx_v_comma != NULL) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":80
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":80
  *             comma = strrchr(s, c',')
  *             if comma != NULL:
  *                 comma[0] = c'\0'             # <<<<<<<<<<<<<<
@@ -25183,7 +25183,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
  */
       (__pyx_v_comma[0]) = '\x00';
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":81
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":81
  *             if comma != NULL:
  *                 comma[0] = c'\0'
  *                 return self.setindex(self.fromcat(s), strtol(comma+1, NULL, 10))             # <<<<<<<<<<<<<<
@@ -25195,7 +25195,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":83
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":83
  *                 return self.setindex(self.fromcat(s), strtol(comma+1, NULL, 10))
  *             else:
  *                 return self.fromcat(s)             # <<<<<<<<<<<<<<
@@ -25208,7 +25208,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":85
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":85
  *                 return self.fromcat(s)
  *         else:
  *             return self.terminals.index(s)             # <<<<<<<<<<<<<<
@@ -25219,7 +25219,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":65
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":65
  *             return self.terminals.word(sym)
  * 
  *     cdef int fromstring(self, char *s, bint terminal):             # <<<<<<<<<<<<<<
@@ -25239,7 +25239,7 @@ static int __pyx_f_4cdec_2sa_3_sa_8Alphabet_fromstring(struct __pyx_obj_4cdec_2s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":8
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":8
  * 
  * cdef class Alphabet:
  *     cdef readonly StringMap terminals, nonterminals             # <<<<<<<<<<<<<<
@@ -25305,7 +25305,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_8Alphabet_12nonterminals___get__(struct
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":89
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":89
  * cdef Alphabet ALPHABET = Alphabet()
  * 
  * cdef char* sym_tostring(int sym):             # <<<<<<<<<<<<<<
@@ -25318,7 +25318,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_sym_tostring(int __pyx_v_sym) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("sym_tostring", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":90
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":90
  * 
  * cdef char* sym_tostring(int sym):
  *     return ALPHABET.tostring(sym)             # <<<<<<<<<<<<<<
@@ -25328,7 +25328,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_sym_tostring(int __pyx_v_sym) {
   __pyx_r = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alphabet *)__pyx_v_4cdec_2sa_3_sa_ALPHABET->__pyx_vtab)->tostring(__pyx_v_4cdec_2sa_3_sa_ALPHABET, __pyx_v_sym);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":89
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":89
  * cdef Alphabet ALPHABET = Alphabet()
  * 
  * cdef char* sym_tostring(int sym):             # <<<<<<<<<<<<<<
@@ -25342,7 +25342,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_sym_tostring(int __pyx_v_sym) {
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":92
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":92
  *     return ALPHABET.tostring(sym)
  * 
  * cdef char* sym_tocat(int sym):             # <<<<<<<<<<<<<<
@@ -25355,7 +25355,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_sym_tocat(int __pyx_v_sym) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("sym_tocat", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":93
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":93
  * 
  * cdef char* sym_tocat(int sym):
  *     return ALPHABET.tocat(sym)             # <<<<<<<<<<<<<<
@@ -25365,7 +25365,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_sym_tocat(int __pyx_v_sym) {
   __pyx_r = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alphabet *)__pyx_v_4cdec_2sa_3_sa_ALPHABET->__pyx_vtab)->tocat(__pyx_v_4cdec_2sa_3_sa_ALPHABET, __pyx_v_sym);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":92
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":92
  *     return ALPHABET.tostring(sym)
  * 
  * cdef char* sym_tocat(int sym):             # <<<<<<<<<<<<<<
@@ -25379,7 +25379,7 @@ static char *__pyx_f_4cdec_2sa_3_sa_sym_tocat(int __pyx_v_sym) {
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":95
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":95
  *     return ALPHABET.tocat(sym)
  * 
  * cdef int sym_isvar(int sym):             # <<<<<<<<<<<<<<
@@ -25392,7 +25392,7 @@ static int __pyx_f_4cdec_2sa_3_sa_sym_isvar(int __pyx_v_sym) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("sym_isvar", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":96
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":96
  * 
  * cdef int sym_isvar(int sym):
  *     return ALPHABET.isvar(sym)             # <<<<<<<<<<<<<<
@@ -25402,7 +25402,7 @@ static int __pyx_f_4cdec_2sa_3_sa_sym_isvar(int __pyx_v_sym) {
   __pyx_r = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alphabet *)__pyx_v_4cdec_2sa_3_sa_ALPHABET->__pyx_vtab)->isvar(__pyx_v_4cdec_2sa_3_sa_ALPHABET, __pyx_v_sym);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":95
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":95
  *     return ALPHABET.tocat(sym)
  * 
  * cdef int sym_isvar(int sym):             # <<<<<<<<<<<<<<
@@ -25416,7 +25416,7 @@ static int __pyx_f_4cdec_2sa_3_sa_sym_isvar(int __pyx_v_sym) {
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":98
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":98
  *     return ALPHABET.isvar(sym)
  * 
  * cdef int sym_getindex(int sym):             # <<<<<<<<<<<<<<
@@ -25429,7 +25429,7 @@ static int __pyx_f_4cdec_2sa_3_sa_sym_getindex(int __pyx_v_sym) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("sym_getindex", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":99
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":99
  * 
  * cdef int sym_getindex(int sym):
  *     return ALPHABET.getindex(sym)             # <<<<<<<<<<<<<<
@@ -25439,7 +25439,7 @@ static int __pyx_f_4cdec_2sa_3_sa_sym_getindex(int __pyx_v_sym) {
   __pyx_r = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alphabet *)__pyx_v_4cdec_2sa_3_sa_ALPHABET->__pyx_vtab)->getindex(__pyx_v_4cdec_2sa_3_sa_ALPHABET, __pyx_v_sym);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":98
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":98
  *     return ALPHABET.isvar(sym)
  * 
  * cdef int sym_getindex(int sym):             # <<<<<<<<<<<<<<
@@ -25453,7 +25453,7 @@ static int __pyx_f_4cdec_2sa_3_sa_sym_getindex(int __pyx_v_sym) {
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":101
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":101
  *     return ALPHABET.getindex(sym)
  * 
  * cdef int sym_setindex(int sym, int id):             # <<<<<<<<<<<<<<
@@ -25466,7 +25466,7 @@ static int __pyx_f_4cdec_2sa_3_sa_sym_setindex(int __pyx_v_sym, int __pyx_v_id)
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("sym_setindex", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":102
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":102
  * 
  * cdef int sym_setindex(int sym, int id):
  *     return ALPHABET.setindex(sym, id)             # <<<<<<<<<<<<<<
@@ -25476,7 +25476,7 @@ static int __pyx_f_4cdec_2sa_3_sa_sym_setindex(int __pyx_v_sym, int __pyx_v_id)
   __pyx_r = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alphabet *)__pyx_v_4cdec_2sa_3_sa_ALPHABET->__pyx_vtab)->setindex(__pyx_v_4cdec_2sa_3_sa_ALPHABET, __pyx_v_sym, __pyx_v_id);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":101
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":101
  *     return ALPHABET.getindex(sym)
  * 
  * cdef int sym_setindex(int sym, int id):             # <<<<<<<<<<<<<<
@@ -25490,7 +25490,7 @@ static int __pyx_f_4cdec_2sa_3_sa_sym_setindex(int __pyx_v_sym, int __pyx_v_id)
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":104
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":104
  *     return ALPHABET.setindex(sym, id)
  * 
  * cdef int sym_fromstring(char* string, bint terminal):             # <<<<<<<<<<<<<<
@@ -25503,7 +25503,7 @@ static int __pyx_f_4cdec_2sa_3_sa_sym_fromstring(char *__pyx_v_string, int __pyx
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("sym_fromstring", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":105
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":105
  * 
  * cdef int sym_fromstring(char* string, bint terminal):
  *     return ALPHABET.fromstring(string, terminal)             # <<<<<<<<<<<<<<
@@ -25513,7 +25513,7 @@ static int __pyx_f_4cdec_2sa_3_sa_sym_fromstring(char *__pyx_v_string, int __pyx
   __pyx_r = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alphabet *)__pyx_v_4cdec_2sa_3_sa_ALPHABET->__pyx_vtab)->fromstring(__pyx_v_4cdec_2sa_3_sa_ALPHABET, __pyx_v_string, __pyx_v_terminal);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":104
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":104
  *     return ALPHABET.setindex(sym, id)
  * 
  * cdef int sym_fromstring(char* string, bint terminal):             # <<<<<<<<<<<<<<
@@ -25527,7 +25527,7 @@ static int __pyx_f_4cdec_2sa_3_sa_sym_fromstring(char *__pyx_v_string, int __pyx
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":107
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":107
  *     return ALPHABET.fromstring(string, terminal)
  * 
  * def isvar(sym):             # <<<<<<<<<<<<<<
@@ -25559,7 +25559,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4isvar(CYTHON_UNUSED PyObject *__pyx_se
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("isvar", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":108
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":108
  * 
  * def isvar(sym):
  *     return sym_isvar(sym)             # <<<<<<<<<<<<<<
@@ -25574,7 +25574,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4isvar(CYTHON_UNUSED PyObject *__pyx_se
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":107
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":107
  *     return ALPHABET.fromstring(string, terminal)
  * 
  * def isvar(sym):             # <<<<<<<<<<<<<<
@@ -25593,7 +25593,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4isvar(CYTHON_UNUSED PyObject *__pyx_se
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":110
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":110
  *     return sym_isvar(sym)
  * 
  * def make_lattice(words):             # <<<<<<<<<<<<<<
@@ -25616,7 +25616,7 @@ static PyObject *__pyx_pw_4cdec_2sa_3_sa_7make_lattice(PyObject *__pyx_self, PyO
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_12make_lattice_2generator7(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":111
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":111
  * 
  * def make_lattice(words):
  *     word_ids = (sym_fromstring(word, True) for word in words)             # <<<<<<<<<<<<<<
@@ -25764,7 +25764,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_12make_lattice_2generator7(__pyx_Genera
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_12make_lattice_5generator8(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":112
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":112
  * def make_lattice(words):
  *     word_ids = (sym_fromstring(word, True) for word in words)
  *     return tuple(((word, None, 1), ) for word in word_ids)             # <<<<<<<<<<<<<<
@@ -25925,7 +25925,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_12make_lattice_5generator8(__pyx_Genera
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":110
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":110
  *     return sym_isvar(sym)
  * 
  * def make_lattice(words):             # <<<<<<<<<<<<<<
@@ -25953,7 +25953,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6make_lattice(CYTHON_UNUSED PyObject *_
   __Pyx_INCREF(__pyx_cur_scope->__pyx_v_words);
   __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_words);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":111
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":111
  * 
  * def make_lattice(words):
  *     word_ids = (sym_fromstring(word, True) for word in words)             # <<<<<<<<<<<<<<
@@ -25966,7 +25966,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6make_lattice(CYTHON_UNUSED PyObject *_
   __pyx_cur_scope->__pyx_v_word_ids = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":112
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":112
  * def make_lattice(words):
  *     word_ids = (sym_fromstring(word, True) for word in words)
  *     return tuple(((word, None, 1), ) for word in word_ids)             # <<<<<<<<<<<<<<
@@ -25988,7 +25988,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6make_lattice(CYTHON_UNUSED PyObject *_
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":110
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":110
  *     return sym_isvar(sym)
  * 
  * def make_lattice(words):             # <<<<<<<<<<<<<<
@@ -26009,7 +26009,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6make_lattice(CYTHON_UNUSED PyObject *_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":114
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":114
  *     return tuple(((word, None, 1), ) for word in word_ids)
  * 
  * def decode_lattice(lattice):             # <<<<<<<<<<<<<<
@@ -26032,7 +26032,7 @@ static PyObject *__pyx_pw_4cdec_2sa_3_sa_9decode_lattice(PyObject *__pyx_self, P
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_14decode_lattice_2generator9(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":115
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":115
  * 
  * def decode_lattice(lattice):
  *     return tuple((sym_tostring(sym), weight, dist) for (sym, weight, dist) in arc             # <<<<<<<<<<<<<<
@@ -26110,7 +26110,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_14decode_lattice_2generator9(__pyx_Gene
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":116
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":116
  * def decode_lattice(lattice):
  *     return tuple((sym_tostring(sym), weight, dist) for (sym, weight, dist) in arc
  *             for arc in node for node in lattice)             # <<<<<<<<<<<<<<
@@ -26119,7 +26119,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_14decode_lattice_2generator9(__pyx_Gene
  */
   if (unlikely(!__pyx_cur_scope->__pyx_v_arc)) { __Pyx_RaiseUnboundLocalError("arc"); {__pyx_filename = __pyx_f[10]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;} }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":115
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":115
  * 
  * def decode_lattice(lattice):
  *     return tuple((sym_tostring(sym), weight, dist) for (sym, weight, dist) in arc             # <<<<<<<<<<<<<<
@@ -26231,7 +26231,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_14decode_lattice_2generator9(__pyx_Gene
     __Pyx_GIVEREF(__pyx_t_7);
     __pyx_t_7 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":116
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":116
  * def decode_lattice(lattice):
  *     return tuple((sym_tostring(sym), weight, dist) for (sym, weight, dist) in arc
  *             for arc in node for node in lattice)             # <<<<<<<<<<<<<<
@@ -26319,7 +26319,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_14decode_lattice_2generator9(__pyx_Gene
         __Pyx_GIVEREF(__pyx_t_6);
         __pyx_t_6 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":115
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":115
  * 
  * def decode_lattice(lattice):
  *     return tuple((sym_tostring(sym), weight, dist) for (sym, weight, dist) in arc             # <<<<<<<<<<<<<<
@@ -26402,7 +26402,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_14decode_lattice_2generator9(__pyx_Gene
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":114
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":114
  *     return tuple(((word, None, 1), ) for word in word_ids)
  * 
  * def decode_lattice(lattice):             # <<<<<<<<<<<<<<
@@ -26430,7 +26430,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_8decode_lattice(CYTHON_UNUSED PyObject
   __Pyx_INCREF(__pyx_cur_scope->__pyx_v_lattice);
   __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_lattice);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":115
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":115
  * 
  * def decode_lattice(lattice):
  *     return tuple((sym_tostring(sym), weight, dist) for (sym, weight, dist) in arc             # <<<<<<<<<<<<<<
@@ -26452,7 +26452,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_8decode_lattice(CYTHON_UNUSED PyObject
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":114
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":114
  *     return tuple(((word, None, 1), ) for word in word_ids)
  * 
  * def decode_lattice(lattice):             # <<<<<<<<<<<<<<
@@ -26473,7 +26473,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_8decode_lattice(CYTHON_UNUSED PyObject
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":118
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":118
  *             for arc in node for node in lattice)
  * 
  * def decode_sentence(lattice):             # <<<<<<<<<<<<<<
@@ -26496,7 +26496,7 @@ static PyObject *__pyx_pw_4cdec_2sa_3_sa_11decode_sentence(PyObject *__pyx_self,
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_15decode_sentence_2generator10(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":119
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":119
  * 
  * def decode_sentence(lattice):
  *     return tuple(sym_tostring(sym) for ((sym, _, _),) in lattice)             # <<<<<<<<<<<<<<
@@ -26762,7 +26762,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_15decode_sentence_2generator10(__pyx_Ge
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":118
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":118
  *             for arc in node for node in lattice)
  * 
  * def decode_sentence(lattice):             # <<<<<<<<<<<<<<
@@ -26790,7 +26790,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_10decode_sentence(CYTHON_UNUSED PyObjec
   __Pyx_INCREF(__pyx_cur_scope->__pyx_v_lattice);
   __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_lattice);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":119
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":119
  * 
  * def decode_sentence(lattice):
  *     return tuple(sym_tostring(sym) for ((sym, _, _),) in lattice)             # <<<<<<<<<<<<<<
@@ -26812,7 +26812,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_10decode_sentence(CYTHON_UNUSED PyObjec
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":118
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":118
  *             for arc in node for node in lattice)
  * 
  * def decode_sentence(lattice):             # <<<<<<<<<<<<<<
@@ -26833,7 +26833,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_10decode_sentence(CYTHON_UNUSED PyObjec
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":121
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":121
  *     return tuple(sym_tostring(sym) for ((sym, _, _),) in lattice)
  * 
  * def encode_words(words):             # <<<<<<<<<<<<<<
@@ -26856,7 +26856,7 @@ static PyObject *__pyx_pw_4cdec_2sa_3_sa_13encode_words(PyObject *__pyx_self, Py
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_12encode_words_2generator11(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":122
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":122
  * 
  * def encode_words(words):
  *     return tuple(sym_fromstring(word, True) for word in words)             # <<<<<<<<<<<<<<
@@ -27003,7 +27003,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_12encode_words_2generator11(__pyx_Gener
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":121
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":121
  *     return tuple(sym_tostring(sym) for ((sym, _, _),) in lattice)
  * 
  * def encode_words(words):             # <<<<<<<<<<<<<<
@@ -27031,7 +27031,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_12encode_words(CYTHON_UNUSED PyObject *
   __Pyx_INCREF(__pyx_cur_scope->__pyx_v_words);
   __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_words);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":122
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":122
  * 
  * def encode_words(words):
  *     return tuple(sym_fromstring(word, True) for word in words)             # <<<<<<<<<<<<<<
@@ -27053,7 +27053,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_12encode_words(CYTHON_UNUSED PyObject *
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":121
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":121
  *     return tuple(sym_tostring(sym) for ((sym, _, _),) in lattice)
  * 
  * def encode_words(words):             # <<<<<<<<<<<<<<
@@ -27074,7 +27074,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_12encode_words(CYTHON_UNUSED PyObject *
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":124
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":124
  *     return tuple(sym_fromstring(word, True) for word in words)
  * 
  * def decode_words(syms):             # <<<<<<<<<<<<<<
@@ -27096,7 +27096,7 @@ static PyObject *__pyx_pw_4cdec_2sa_3_sa_15decode_words(PyObject *__pyx_self, Py
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_12decode_words_2generator12(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":125
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":125
  * 
  * def decode_words(syms):
  *     return tuple(sym_tostring(sym) for sym in syms)             # <<<<<<<<<<<<<<
@@ -27241,7 +27241,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_12decode_words_2generator12(__pyx_Gener
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":124
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":124
  *     return tuple(sym_fromstring(word, True) for word in words)
  * 
  * def decode_words(syms):             # <<<<<<<<<<<<<<
@@ -27268,7 +27268,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14decode_words(CYTHON_UNUSED PyObject *
   __Pyx_INCREF(__pyx_cur_scope->__pyx_v_syms);
   __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_syms);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":125
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":125
  * 
  * def decode_words(syms):
  *     return tuple(sym_tostring(sym) for sym in syms)             # <<<<<<<<<<<<<<
@@ -27288,7 +27288,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14decode_words(CYTHON_UNUSED PyObject *
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":124
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":124
  *     return tuple(sym_fromstring(word, True) for word in words)
  * 
  * def decode_words(syms):             # <<<<<<<<<<<<<<
@@ -27308,7 +27308,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14decode_words(CYTHON_UNUSED PyObject *
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":6
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":6
  * cdef class Phrase:
  * 
  *     def __cinit__(self, words):             # <<<<<<<<<<<<<<
@@ -27385,7 +27385,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":8
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":8
  *     def __cinit__(self, words):
  *         cdef int i, j, n, n_vars
  *         n_vars = 0             # <<<<<<<<<<<<<<
@@ -27394,7 +27394,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
  */
   __pyx_v_n_vars = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":9
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":9
  *         cdef int i, j, n, n_vars
  *         n_vars = 0
  *         n = len(words)             # <<<<<<<<<<<<<<
@@ -27404,7 +27404,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
   __pyx_t_1 = PyObject_Length(__pyx_v_words); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_n = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":10
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":10
  *         n_vars = 0
  *         n = len(words)
  *         self.syms = <int *>malloc(n*sizeof(int))             # <<<<<<<<<<<<<<
@@ -27413,7 +27413,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
  */
   __pyx_v_self->syms = ((int *)malloc((__pyx_v_n * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":11
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":11
  *         n = len(words)
  *         self.syms = <int *>malloc(n*sizeof(int))
  *         for i from 0 <= i < n:             # <<<<<<<<<<<<<<
@@ -27423,7 +27423,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
   __pyx_t_2 = __pyx_v_n;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":12
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":12
  *         self.syms = <int *>malloc(n*sizeof(int))
  *         for i from 0 <= i < n:
  *             self.syms[i] = words[i]             # <<<<<<<<<<<<<<
@@ -27436,7 +27436,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     (__pyx_v_self->syms[__pyx_v_i]) = __pyx_t_4;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":13
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":13
  *         for i from 0 <= i < n:
  *             self.syms[i] = words[i]
  *             if sym_isvar(self.syms[i]):             # <<<<<<<<<<<<<<
@@ -27446,7 +27446,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
     __pyx_t_5 = (__pyx_f_4cdec_2sa_3_sa_sym_isvar((__pyx_v_self->syms[__pyx_v_i])) != 0);
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":14
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":14
  *             self.syms[i] = words[i]
  *             if sym_isvar(self.syms[i]):
  *                 n_vars += 1             # <<<<<<<<<<<<<<
@@ -27459,7 +27459,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
     __pyx_L5:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":15
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":15
  *             if sym_isvar(self.syms[i]):
  *                 n_vars += 1
  *         self.n = n             # <<<<<<<<<<<<<<
@@ -27468,7 +27468,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
  */
   __pyx_v_self->n = __pyx_v_n;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":16
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":16
  *                 n_vars += 1
  *         self.n = n
  *         self.n_vars = n_vars             # <<<<<<<<<<<<<<
@@ -27477,7 +27477,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
  */
   __pyx_v_self->n_vars = __pyx_v_n_vars;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":17
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":17
  *         self.n = n
  *         self.n_vars = n_vars
  *         self.varpos = <int *>malloc(n_vars*sizeof(int))             # <<<<<<<<<<<<<<
@@ -27486,7 +27486,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
  */
   __pyx_v_self->varpos = ((int *)malloc((__pyx_v_n_vars * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":18
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":18
  *         self.n_vars = n_vars
  *         self.varpos = <int *>malloc(n_vars*sizeof(int))
  *         j = 0             # <<<<<<<<<<<<<<
@@ -27495,7 +27495,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
  */
   __pyx_v_j = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":19
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":19
  *         self.varpos = <int *>malloc(n_vars*sizeof(int))
  *         j = 0
  *         for i from 0 <= i < n:             # <<<<<<<<<<<<<<
@@ -27505,7 +27505,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
   __pyx_t_2 = __pyx_v_n;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":20
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":20
  *         j = 0
  *         for i from 0 <= i < n:
  *             if sym_isvar(self.syms[i]):             # <<<<<<<<<<<<<<
@@ -27515,7 +27515,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
     __pyx_t_5 = (__pyx_f_4cdec_2sa_3_sa_sym_isvar((__pyx_v_self->syms[__pyx_v_i])) != 0);
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":21
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":21
  *         for i from 0 <= i < n:
  *             if sym_isvar(self.syms[i]):
  *                 self.varpos[j] = i             # <<<<<<<<<<<<<<
@@ -27524,7 +27524,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
  */
       (__pyx_v_self->varpos[__pyx_v_j]) = __pyx_v_i;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":22
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":22
  *             if sym_isvar(self.syms[i]):
  *                 self.varpos[j] = i
  *                 j = j + 1             # <<<<<<<<<<<<<<
@@ -27537,7 +27537,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
     __pyx_L8:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":6
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":6
  * cdef class Phrase:
  * 
  *     def __cinit__(self, words):             # <<<<<<<<<<<<<<
@@ -27557,7 +27557,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase___cinit__(struct __pyx_obj_4cdec_2sa_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":24
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":24
  *                 j = j + 1
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -27580,7 +27580,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_6Phrase_2__dealloc__(struct __pyx_obj_4cdec_
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":25
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":25
  * 
  *     def __dealloc__(self):
  *         free(self.syms)             # <<<<<<<<<<<<<<
@@ -27589,7 +27589,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_6Phrase_2__dealloc__(struct __pyx_obj_4cdec_
  */
   free(__pyx_v_self->syms);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":26
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":26
  *     def __dealloc__(self):
  *         free(self.syms)
  *         free(self.varpos)             # <<<<<<<<<<<<<<
@@ -27598,7 +27598,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_6Phrase_2__dealloc__(struct __pyx_obj_4cdec_
  */
   free(__pyx_v_self->varpos);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":24
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":24
  *                 j = j + 1
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -27610,7 +27610,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_6Phrase_2__dealloc__(struct __pyx_obj_4cdec_
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":28
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":28
  *         free(self.varpos)
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -27645,7 +27645,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_4__str__(struct __pyx_obj_4cdec
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__str__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":29
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":29
  * 
  *     def __str__(self):
  *         strs = []             # <<<<<<<<<<<<<<
@@ -27657,7 +27657,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_4__str__(struct __pyx_obj_4cdec
   __pyx_v_strs = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":31
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":31
  *         strs = []
  *         cdef int i, s
  *         for i from 0 <= i < self.n:             # <<<<<<<<<<<<<<
@@ -27667,7 +27667,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_4__str__(struct __pyx_obj_4cdec
   __pyx_t_2 = __pyx_v_self->n;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":32
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":32
  *         cdef int i, s
  *         for i from 0 <= i < self.n:
  *             s = self.syms[i]             # <<<<<<<<<<<<<<
@@ -27676,7 +27676,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_4__str__(struct __pyx_obj_4cdec
  */
     __pyx_v_s = (__pyx_v_self->syms[__pyx_v_i]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":33
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":33
  *         for i from 0 <= i < self.n:
  *             s = self.syms[i]
  *             strs.append(sym_tostring(s))             # <<<<<<<<<<<<<<
@@ -27689,7 +27689,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_4__str__(struct __pyx_obj_4cdec
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":34
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":34
  *             s = self.syms[i]
  *             strs.append(sym_tostring(s))
  *         return ' '.join(strs)             # <<<<<<<<<<<<<<
@@ -27703,7 +27703,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_4__str__(struct __pyx_obj_4cdec
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":28
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":28
  *         free(self.varpos)
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -27723,7 +27723,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_4__str__(struct __pyx_obj_4cdec
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":36
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":36
  *         return ' '.join(strs)
  * 
  *     def handle(self):             # <<<<<<<<<<<<<<
@@ -27761,7 +27761,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_6handle(struct __pyx_obj_4cdec_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("handle", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":39
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":39
  *         """return a hashable representation that normalizes the ordering
  *         of the nonterminal indices"""
  *         norm = []             # <<<<<<<<<<<<<<
@@ -27773,7 +27773,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_6handle(struct __pyx_obj_4cdec_
   __pyx_v_norm = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":41
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":41
  *         norm = []
  *         cdef int i, j, s
  *         i = 1             # <<<<<<<<<<<<<<
@@ -27782,7 +27782,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_6handle(struct __pyx_obj_4cdec_
  */
   __pyx_v_i = 1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":42
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":42
  *         cdef int i, j, s
  *         i = 1
  *         j = 0             # <<<<<<<<<<<<<<
@@ -27791,7 +27791,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_6handle(struct __pyx_obj_4cdec_
  */
   __pyx_v_j = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":43
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":43
  *         i = 1
  *         j = 0
  *         for j from 0 <= j < self.n:             # <<<<<<<<<<<<<<
@@ -27801,7 +27801,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_6handle(struct __pyx_obj_4cdec_
   __pyx_t_2 = __pyx_v_self->n;
   for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_2; __pyx_v_j++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":44
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":44
  *         j = 0
  *         for j from 0 <= j < self.n:
  *             s = self.syms[j]             # <<<<<<<<<<<<<<
@@ -27810,7 +27810,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_6handle(struct __pyx_obj_4cdec_
  */
     __pyx_v_s = (__pyx_v_self->syms[__pyx_v_j]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":45
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":45
  *         for j from 0 <= j < self.n:
  *             s = self.syms[j]
  *             if sym_isvar(s):             # <<<<<<<<<<<<<<
@@ -27820,7 +27820,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_6handle(struct __pyx_obj_4cdec_
     __pyx_t_3 = (__pyx_f_4cdec_2sa_3_sa_sym_isvar(__pyx_v_s) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":46
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":46
  *             s = self.syms[j]
  *             if sym_isvar(s):
  *                 s = sym_setindex(s,i)             # <<<<<<<<<<<<<<
@@ -27829,7 +27829,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_6handle(struct __pyx_obj_4cdec_
  */
       __pyx_v_s = __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_v_s, __pyx_v_i);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":47
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":47
  *             if sym_isvar(s):
  *                 s = sym_setindex(s,i)
  *                 i = i + 1             # <<<<<<<<<<<<<<
@@ -27841,7 +27841,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_6handle(struct __pyx_obj_4cdec_
     }
     __pyx_L5:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":48
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":48
  *                 s = sym_setindex(s,i)
  *                 i = i + 1
  *             norm.append(s)             # <<<<<<<<<<<<<<
@@ -27854,7 +27854,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_6handle(struct __pyx_obj_4cdec_
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":49
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":49
  *                 i = i + 1
  *             norm.append(s)
  *         return tuple(norm)             # <<<<<<<<<<<<<<
@@ -27868,7 +27868,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_6handle(struct __pyx_obj_4cdec_
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":36
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":36
  *         return ' '.join(strs)
  * 
  *     def handle(self):             # <<<<<<<<<<<<<<
@@ -27888,7 +27888,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_6handle(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":51
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":51
  *         return tuple(norm)
  * 
  *     def strhandle(self):             # <<<<<<<<<<<<<<
@@ -27925,7 +27925,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_8strhandle(struct __pyx_obj_4cd
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("strhandle", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":52
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":52
  * 
  *     def strhandle(self):
  *         norm = []             # <<<<<<<<<<<<<<
@@ -27937,7 +27937,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_8strhandle(struct __pyx_obj_4cd
   __pyx_v_norm = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":54
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":54
  *         norm = []
  *         cdef int i, j, s
  *         i = 1             # <<<<<<<<<<<<<<
@@ -27946,7 +27946,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_8strhandle(struct __pyx_obj_4cd
  */
   __pyx_v_i = 1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":55
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":55
  *         cdef int i, j, s
  *         i = 1
  *         j = 0             # <<<<<<<<<<<<<<
@@ -27955,7 +27955,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_8strhandle(struct __pyx_obj_4cd
  */
   __pyx_v_j = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":56
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":56
  *         i = 1
  *         j = 0
  *         for j from 0 <= j < self.n:             # <<<<<<<<<<<<<<
@@ -27965,7 +27965,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_8strhandle(struct __pyx_obj_4cd
   __pyx_t_2 = __pyx_v_self->n;
   for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_2; __pyx_v_j++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":57
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":57
  *         j = 0
  *         for j from 0 <= j < self.n:
  *             s = self.syms[j]             # <<<<<<<<<<<<<<
@@ -27974,7 +27974,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_8strhandle(struct __pyx_obj_4cd
  */
     __pyx_v_s = (__pyx_v_self->syms[__pyx_v_j]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":58
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":58
  *         for j from 0 <= j < self.n:
  *             s = self.syms[j]
  *             if sym_isvar(s):             # <<<<<<<<<<<<<<
@@ -27984,7 +27984,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_8strhandle(struct __pyx_obj_4cd
     __pyx_t_3 = (__pyx_f_4cdec_2sa_3_sa_sym_isvar(__pyx_v_s) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":59
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":59
  *             s = self.syms[j]
  *             if sym_isvar(s):
  *                 s = sym_setindex(s,i)             # <<<<<<<<<<<<<<
@@ -27993,7 +27993,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_8strhandle(struct __pyx_obj_4cd
  */
       __pyx_v_s = __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_v_s, __pyx_v_i);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":60
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":60
  *             if sym_isvar(s):
  *                 s = sym_setindex(s,i)
  *                 i = i + 1             # <<<<<<<<<<<<<<
@@ -28005,7 +28005,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_8strhandle(struct __pyx_obj_4cd
     }
     __pyx_L5:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":61
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":61
  *                 s = sym_setindex(s,i)
  *                 i = i + 1
  *             norm.append(sym_tostring(s))             # <<<<<<<<<<<<<<
@@ -28018,7 +28018,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_8strhandle(struct __pyx_obj_4cd
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":62
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":62
  *                 i = i + 1
  *             norm.append(sym_tostring(s))
  *         return ' '.join(norm)             # <<<<<<<<<<<<<<
@@ -28032,7 +28032,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_8strhandle(struct __pyx_obj_4cd
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":51
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":51
  *         return tuple(norm)
  * 
  *     def strhandle(self):             # <<<<<<<<<<<<<<
@@ -28052,7 +28052,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_8strhandle(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":64
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":64
  *         return ' '.join(norm)
  * 
  *     def arity(self):             # <<<<<<<<<<<<<<
@@ -28082,7 +28082,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_10arity(struct __pyx_obj_4cdec_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("arity", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":65
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":65
  * 
  *     def arity(self):
  *         return self.n_vars             # <<<<<<<<<<<<<<
@@ -28096,7 +28096,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_10arity(struct __pyx_obj_4cdec_
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":64
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":64
  *         return ' '.join(norm)
  * 
  *     def arity(self):             # <<<<<<<<<<<<<<
@@ -28115,7 +28115,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_10arity(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":67
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":67
  *         return self.n_vars
  * 
  *     def getvarpos(self, i):             # <<<<<<<<<<<<<<
@@ -28148,7 +28148,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_12getvarpos(struct __pyx_obj_4c
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("getvarpos", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":68
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":68
  * 
  *     def getvarpos(self, i):
  *         if 0 <= i < self.n_vars:             # <<<<<<<<<<<<<<
@@ -28167,7 +28167,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_12getvarpos(struct __pyx_obj_4c
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":69
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":69
  *     def getvarpos(self, i):
  *         if 0 <= i < self.n_vars:
  *             return self.varpos[i]             # <<<<<<<<<<<<<<
@@ -28184,7 +28184,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_12getvarpos(struct __pyx_obj_4c
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":71
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":71
  *             return self.varpos[i]
  *         else:
  *             raise IndexError             # <<<<<<<<<<<<<<
@@ -28195,7 +28195,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_12getvarpos(struct __pyx_obj_4c
     {__pyx_filename = __pyx_f[7]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":67
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":67
  *         return self.n_vars
  * 
  *     def getvarpos(self, i):             # <<<<<<<<<<<<<<
@@ -28215,7 +28215,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_12getvarpos(struct __pyx_obj_4c
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":73
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":73
  *             raise IndexError
  * 
  *     def getvar(self, i):             # <<<<<<<<<<<<<<
@@ -28248,7 +28248,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_14getvar(struct __pyx_obj_4cdec
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("getvar", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":74
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":74
  * 
  *     def getvar(self, i):
  *         if 0 <= i < self.n_vars:             # <<<<<<<<<<<<<<
@@ -28267,7 +28267,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_14getvar(struct __pyx_obj_4cdec
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":75
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":75
  *     def getvar(self, i):
  *         if 0 <= i < self.n_vars:
  *             return self.syms[self.varpos[i]]             # <<<<<<<<<<<<<<
@@ -28284,7 +28284,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_14getvar(struct __pyx_obj_4cdec
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":77
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":77
  *             return self.syms[self.varpos[i]]
  *         else:
  *             raise IndexError             # <<<<<<<<<<<<<<
@@ -28295,7 +28295,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_14getvar(struct __pyx_obj_4cdec
     {__pyx_filename = __pyx_f[7]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":73
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":73
  *             raise IndexError
  * 
  *     def getvar(self, i):             # <<<<<<<<<<<<<<
@@ -28315,7 +28315,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_14getvar(struct __pyx_obj_4cdec
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":79
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":79
  *             raise IndexError
  * 
  *     cdef int chunkpos(self, int k):             # <<<<<<<<<<<<<<
@@ -28329,7 +28329,7 @@ int __pyx_f_4cdec_2sa_3_sa_6Phrase_chunkpos(struct __pyx_obj_4cdec_2sa_3_sa_Phra
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("chunkpos", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":80
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":80
  * 
  *     cdef int chunkpos(self, int k):
  *         if k == 0:             # <<<<<<<<<<<<<<
@@ -28339,7 +28339,7 @@ int __pyx_f_4cdec_2sa_3_sa_6Phrase_chunkpos(struct __pyx_obj_4cdec_2sa_3_sa_Phra
   __pyx_t_1 = ((__pyx_v_k == 0) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":81
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":81
  *     cdef int chunkpos(self, int k):
  *         if k == 0:
  *             return 0             # <<<<<<<<<<<<<<
@@ -28351,7 +28351,7 @@ int __pyx_f_4cdec_2sa_3_sa_6Phrase_chunkpos(struct __pyx_obj_4cdec_2sa_3_sa_Phra
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":83
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":83
  *             return 0
  *         else:
  *             return self.varpos[k-1]+1             # <<<<<<<<<<<<<<
@@ -28362,7 +28362,7 @@ int __pyx_f_4cdec_2sa_3_sa_6Phrase_chunkpos(struct __pyx_obj_4cdec_2sa_3_sa_Phra
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":79
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":79
  *             raise IndexError
  * 
  *     cdef int chunkpos(self, int k):             # <<<<<<<<<<<<<<
@@ -28376,7 +28376,7 @@ int __pyx_f_4cdec_2sa_3_sa_6Phrase_chunkpos(struct __pyx_obj_4cdec_2sa_3_sa_Phra
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":85
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":85
  *             return self.varpos[k-1]+1
  * 
  *     cdef int chunklen(self, int k):             # <<<<<<<<<<<<<<
@@ -28390,7 +28390,7 @@ int __pyx_f_4cdec_2sa_3_sa_6Phrase_chunklen(struct __pyx_obj_4cdec_2sa_3_sa_Phra
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("chunklen", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":86
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":86
  * 
  *     cdef int chunklen(self, int k):
  *         if self.n_vars == 0:             # <<<<<<<<<<<<<<
@@ -28400,7 +28400,7 @@ int __pyx_f_4cdec_2sa_3_sa_6Phrase_chunklen(struct __pyx_obj_4cdec_2sa_3_sa_Phra
   __pyx_t_1 = ((__pyx_v_self->n_vars == 0) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":87
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":87
  *     cdef int chunklen(self, int k):
  *         if self.n_vars == 0:
  *             return self.n             # <<<<<<<<<<<<<<
@@ -28411,7 +28411,7 @@ int __pyx_f_4cdec_2sa_3_sa_6Phrase_chunklen(struct __pyx_obj_4cdec_2sa_3_sa_Phra
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":88
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":88
  *         if self.n_vars == 0:
  *             return self.n
  *         elif k == 0:             # <<<<<<<<<<<<<<
@@ -28421,7 +28421,7 @@ int __pyx_f_4cdec_2sa_3_sa_6Phrase_chunklen(struct __pyx_obj_4cdec_2sa_3_sa_Phra
   __pyx_t_1 = ((__pyx_v_k == 0) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":89
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":89
  *             return self.n
  *         elif k == 0:
  *             return self.varpos[0]             # <<<<<<<<<<<<<<
@@ -28432,7 +28432,7 @@ int __pyx_f_4cdec_2sa_3_sa_6Phrase_chunklen(struct __pyx_obj_4cdec_2sa_3_sa_Phra
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":90
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":90
  *         elif k == 0:
  *             return self.varpos[0]
  *         elif k == self.n_vars:             # <<<<<<<<<<<<<<
@@ -28442,7 +28442,7 @@ int __pyx_f_4cdec_2sa_3_sa_6Phrase_chunklen(struct __pyx_obj_4cdec_2sa_3_sa_Phra
   __pyx_t_1 = ((__pyx_v_k == __pyx_v_self->n_vars) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":91
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":91
  *             return self.varpos[0]
  *         elif k == self.n_vars:
  *             return self.n-self.varpos[k-1]-1             # <<<<<<<<<<<<<<
@@ -28454,7 +28454,7 @@ int __pyx_f_4cdec_2sa_3_sa_6Phrase_chunklen(struct __pyx_obj_4cdec_2sa_3_sa_Phra
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":93
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":93
  *             return self.n-self.varpos[k-1]-1
  *         else:
  *             return self.varpos[k]-self.varpos[k-1]-1             # <<<<<<<<<<<<<<
@@ -28465,7 +28465,7 @@ int __pyx_f_4cdec_2sa_3_sa_6Phrase_chunklen(struct __pyx_obj_4cdec_2sa_3_sa_Phra
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":85
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":85
  *             return self.varpos[k-1]+1
  * 
  *     cdef int chunklen(self, int k):             # <<<<<<<<<<<<<<
@@ -28479,7 +28479,7 @@ int __pyx_f_4cdec_2sa_3_sa_6Phrase_chunklen(struct __pyx_obj_4cdec_2sa_3_sa_Phra
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":95
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":95
  *             return self.varpos[k]-self.varpos[k-1]-1
  * 
  *     def clen(self, k):             # <<<<<<<<<<<<<<
@@ -28510,7 +28510,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_16clen(struct __pyx_obj_4cdec_2
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("clen", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":96
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":96
  * 
  *     def clen(self, k):
  *          return self.chunklen(k)             # <<<<<<<<<<<<<<
@@ -28525,7 +28525,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_16clen(struct __pyx_obj_4cdec_2
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":95
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":95
  *             return self.varpos[k]-self.varpos[k-1]-1
  * 
  *     def clen(self, k):             # <<<<<<<<<<<<<<
@@ -28544,7 +28544,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_16clen(struct __pyx_obj_4cdec_2
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":98
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":98
  *          return self.chunklen(k)
  * 
  *     def getchunk(self, ci):             # <<<<<<<<<<<<<<
@@ -28580,7 +28580,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_18getchunk(struct __pyx_obj_4cd
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("getchunk", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":100
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":100
  *     def getchunk(self, ci):
  *         cdef int start, stop
  *         start = self.chunkpos(ci)             # <<<<<<<<<<<<<<
@@ -28590,7 +28590,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_18getchunk(struct __pyx_obj_4cd
   __pyx_t_1 = __Pyx_PyInt_As_int(__pyx_v_ci); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_start = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Phrase *)__pyx_v_self->__pyx_vtab)->chunkpos(__pyx_v_self, __pyx_t_1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":101
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":101
  *         cdef int start, stop
  *         start = self.chunkpos(ci)
  *         stop = start+self.chunklen(ci)             # <<<<<<<<<<<<<<
@@ -28600,7 +28600,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_18getchunk(struct __pyx_obj_4cd
   __pyx_t_1 = __Pyx_PyInt_As_int(__pyx_v_ci); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_stop = (__pyx_v_start + ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Phrase *)__pyx_v_self->__pyx_vtab)->chunklen(__pyx_v_self, __pyx_t_1));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":102
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":102
  *         start = self.chunkpos(ci)
  *         stop = start+self.chunklen(ci)
  *         chunk = []             # <<<<<<<<<<<<<<
@@ -28612,7 +28612,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_18getchunk(struct __pyx_obj_4cd
   __pyx_v_chunk = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":103
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":103
  *         stop = start+self.chunklen(ci)
  *         chunk = []
  *         for i from start <= i < stop:             # <<<<<<<<<<<<<<
@@ -28622,7 +28622,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_18getchunk(struct __pyx_obj_4cd
   __pyx_t_1 = __pyx_v_stop;
   for (__pyx_v_i = __pyx_v_start; __pyx_v_i < __pyx_t_1; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":104
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":104
  *         chunk = []
  *         for i from start <= i < stop:
  *             chunk.append(self.syms[i])             # <<<<<<<<<<<<<<
@@ -28635,7 +28635,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_18getchunk(struct __pyx_obj_4cd
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":105
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":105
  *         for i from start <= i < stop:
  *             chunk.append(self.syms[i])
  *         return chunk             # <<<<<<<<<<<<<<
@@ -28647,7 +28647,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_18getchunk(struct __pyx_obj_4cd
   __pyx_r = __pyx_v_chunk;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":98
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":98
  *          return self.chunklen(k)
  * 
  *     def getchunk(self, ci):             # <<<<<<<<<<<<<<
@@ -28667,7 +28667,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_18getchunk(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":107
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":107
  *         return chunk
  * 
  *     def __cmp__(self, other):             # <<<<<<<<<<<<<<
@@ -28706,7 +28706,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase_20__cmp__(struct __pyx_obj_4cdec_2sa_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cmp__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":110
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":110
  *         cdef Phrase otherp
  *         cdef int i
  *         otherp = other             # <<<<<<<<<<<<<<
@@ -28719,7 +28719,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase_20__cmp__(struct __pyx_obj_4cdec_2sa_
   __pyx_v_otherp = ((struct __pyx_obj_4cdec_2sa_3_sa_Phrase *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":111
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":111
  *         cdef int i
  *         otherp = other
  *         for i from 0 <= i < min(self.n, otherp.n):             # <<<<<<<<<<<<<<
@@ -28736,7 +28736,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase_20__cmp__(struct __pyx_obj_4cdec_2sa_
   __pyx_t_2 = __pyx_t_4;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":112
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":112
  *         otherp = other
  *         for i from 0 <= i < min(self.n, otherp.n):
  *             if self.syms[i] < otherp.syms[i]:             # <<<<<<<<<<<<<<
@@ -28746,7 +28746,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase_20__cmp__(struct __pyx_obj_4cdec_2sa_
     __pyx_t_5 = (((__pyx_v_self->syms[__pyx_v_i]) < (__pyx_v_otherp->syms[__pyx_v_i])) != 0);
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":113
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":113
  *         for i from 0 <= i < min(self.n, otherp.n):
  *             if self.syms[i] < otherp.syms[i]:
  *                 return -1             # <<<<<<<<<<<<<<
@@ -28757,7 +28757,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase_20__cmp__(struct __pyx_obj_4cdec_2sa_
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":114
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":114
  *             if self.syms[i] < otherp.syms[i]:
  *                 return -1
  *             elif self.syms[i] > otherp.syms[i]:             # <<<<<<<<<<<<<<
@@ -28767,7 +28767,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase_20__cmp__(struct __pyx_obj_4cdec_2sa_
     __pyx_t_5 = (((__pyx_v_self->syms[__pyx_v_i]) > (__pyx_v_otherp->syms[__pyx_v_i])) != 0);
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":115
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":115
  *                 return -1
  *             elif self.syms[i] > otherp.syms[i]:
  *                 return 1             # <<<<<<<<<<<<<<
@@ -28779,7 +28779,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase_20__cmp__(struct __pyx_obj_4cdec_2sa_
     }
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":116
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":116
  *             elif self.syms[i] > otherp.syms[i]:
  *                 return 1
  *         if self.n < otherp.n:             # <<<<<<<<<<<<<<
@@ -28789,7 +28789,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase_20__cmp__(struct __pyx_obj_4cdec_2sa_
   __pyx_t_5 = ((__pyx_v_self->n < __pyx_v_otherp->n) != 0);
   if (__pyx_t_5) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":117
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":117
  *                 return 1
  *         if self.n < otherp.n:
  *             return -1             # <<<<<<<<<<<<<<
@@ -28800,7 +28800,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase_20__cmp__(struct __pyx_obj_4cdec_2sa_
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":118
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":118
  *         if self.n < otherp.n:
  *             return -1
  *         elif self.n > otherp.n:             # <<<<<<<<<<<<<<
@@ -28810,7 +28810,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase_20__cmp__(struct __pyx_obj_4cdec_2sa_
   __pyx_t_5 = ((__pyx_v_self->n > __pyx_v_otherp->n) != 0);
   if (__pyx_t_5) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":119
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":119
  *             return -1
  *         elif self.n > otherp.n:
  *             return 1             # <<<<<<<<<<<<<<
@@ -28822,7 +28822,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase_20__cmp__(struct __pyx_obj_4cdec_2sa_
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":121
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":121
  *             return 1
  *         else:
  *             return 0             # <<<<<<<<<<<<<<
@@ -28833,7 +28833,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase_20__cmp__(struct __pyx_obj_4cdec_2sa_
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":107
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":107
  *         return chunk
  * 
  *     def __cmp__(self, other):             # <<<<<<<<<<<<<<
@@ -28853,7 +28853,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Phrase_20__cmp__(struct __pyx_obj_4cdec_2sa_
 }
 #endif /*!(#if PY_MAJOR_VERSION < 3)*/
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":123
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":123
  *             return 0
  * 
  *     def __hash__(self):             # <<<<<<<<<<<<<<
@@ -28883,7 +28883,7 @@ static Py_hash_t __pyx_pf_4cdec_2sa_3_sa_6Phrase_22__hash__(struct __pyx_obj_4cd
   int __pyx_t_2;
   __Pyx_RefNannySetupContext("__hash__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":126
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":126
  *         cdef int i
  *         cdef unsigned h
  *         h = 0             # <<<<<<<<<<<<<<
@@ -28892,7 +28892,7 @@ static Py_hash_t __pyx_pf_4cdec_2sa_3_sa_6Phrase_22__hash__(struct __pyx_obj_4cd
  */
   __pyx_v_h = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":127
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":127
  *         cdef unsigned h
  *         h = 0
  *         for i from 0 <= i < self.n:             # <<<<<<<<<<<<<<
@@ -28902,7 +28902,7 @@ static Py_hash_t __pyx_pf_4cdec_2sa_3_sa_6Phrase_22__hash__(struct __pyx_obj_4cd
   __pyx_t_1 = __pyx_v_self->n;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_1; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":128
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":128
  *         h = 0
  *         for i from 0 <= i < self.n:
  *             if self.syms[i] > 0:             # <<<<<<<<<<<<<<
@@ -28912,7 +28912,7 @@ static Py_hash_t __pyx_pf_4cdec_2sa_3_sa_6Phrase_22__hash__(struct __pyx_obj_4cd
     __pyx_t_2 = (((__pyx_v_self->syms[__pyx_v_i]) > 0) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":129
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":129
  *         for i from 0 <= i < self.n:
  *             if self.syms[i] > 0:
  *                 h = (h << 1) + self.syms[i]             # <<<<<<<<<<<<<<
@@ -28924,7 +28924,7 @@ static Py_hash_t __pyx_pf_4cdec_2sa_3_sa_6Phrase_22__hash__(struct __pyx_obj_4cd
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":131
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":131
  *                 h = (h << 1) + self.syms[i]
  *             else:
  *                 h = (h << 1) + -self.syms[i]             # <<<<<<<<<<<<<<
@@ -28936,7 +28936,7 @@ static Py_hash_t __pyx_pf_4cdec_2sa_3_sa_6Phrase_22__hash__(struct __pyx_obj_4cd
     __pyx_L5:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":132
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":132
  *             else:
  *                 h = (h << 1) + -self.syms[i]
  *         return h             # <<<<<<<<<<<<<<
@@ -28946,7 +28946,7 @@ static Py_hash_t __pyx_pf_4cdec_2sa_3_sa_6Phrase_22__hash__(struct __pyx_obj_4cd
   __pyx_r = __pyx_v_h;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":123
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":123
  *             return 0
  * 
  *     def __hash__(self):             # <<<<<<<<<<<<<<
@@ -28961,7 +28961,7 @@ static Py_hash_t __pyx_pf_4cdec_2sa_3_sa_6Phrase_22__hash__(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":134
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":134
  *         return h
  * 
  *     def __len__(self):             # <<<<<<<<<<<<<<
@@ -28987,7 +28987,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_6Phrase_24__len__(struct __pyx_obj_4cd
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__len__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":135
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":135
  * 
  *     def __len__(self):
  *         return self.n             # <<<<<<<<<<<<<<
@@ -28997,7 +28997,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_6Phrase_24__len__(struct __pyx_obj_4cd
   __pyx_r = __pyx_v_self->n;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":134
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":134
  *         return h
  * 
  *     def __len__(self):             # <<<<<<<<<<<<<<
@@ -29011,7 +29011,7 @@ static Py_ssize_t __pyx_pf_4cdec_2sa_3_sa_6Phrase_24__len__(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":137
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":137
  *         return self.n
  * 
  *     def __getitem__(self, i):             # <<<<<<<<<<<<<<
@@ -29042,7 +29042,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_26__getitem__(struct __pyx_obj_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__getitem__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":138
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":138
  * 
  *     def __getitem__(self, i):
  *         return self.syms[i]             # <<<<<<<<<<<<<<
@@ -29057,7 +29057,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_26__getitem__(struct __pyx_obj_
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":137
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":137
  *         return self.n
  * 
  *     def __getitem__(self, i):             # <<<<<<<<<<<<<<
@@ -29077,7 +29077,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_26__getitem__(struct __pyx_obj_
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_6Phrase_30generator2(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":140
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":140
  *         return self.syms[i]
  * 
  *     def __iter__(self):             # <<<<<<<<<<<<<<
@@ -29156,7 +29156,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_6Phrase_30generator2(__pyx_GeneratorObj
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":142
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":142
  *     def __iter__(self):
  *         cdef int i
  *         for i from 0 <= i < self.n:             # <<<<<<<<<<<<<<
@@ -29166,7 +29166,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_6Phrase_30generator2(__pyx_GeneratorObj
   __pyx_t_1 = __pyx_cur_scope->__pyx_v_self->n;
   for (__pyx_cur_scope->__pyx_v_i = 0; __pyx_cur_scope->__pyx_v_i < __pyx_t_1; __pyx_cur_scope->__pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":143
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":143
  *         cdef int i
  *         for i from 0 <= i < self.n:
  *             yield self.syms[i]             # <<<<<<<<<<<<<<
@@ -29188,7 +29188,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_6Phrase_30generator2(__pyx_GeneratorObj
     if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":140
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":140
  *         return self.syms[i]
  * 
  *     def __iter__(self):             # <<<<<<<<<<<<<<
@@ -29210,7 +29210,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_6Phrase_30generator2(__pyx_GeneratorObj
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":145
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":145
  *             yield self.syms[i]
  * 
  *     def subst(self, start, children):             # <<<<<<<<<<<<<<
@@ -29294,7 +29294,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_31subst(struct __pyx_obj_4cdec_
   __Pyx_RefNannySetupContext("subst", 0);
   __Pyx_INCREF(__pyx_v_start);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":147
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":147
  *     def subst(self, start, children):
  *         cdef int i
  *         for i from 0 <= i < self.n:             # <<<<<<<<<<<<<<
@@ -29304,7 +29304,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_31subst(struct __pyx_obj_4cdec_
   __pyx_t_1 = __pyx_v_self->n;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_1; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":148
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":148
  *         cdef int i
  *         for i from 0 <= i < self.n:
  *             if sym_isvar(self.syms[i]):             # <<<<<<<<<<<<<<
@@ -29314,7 +29314,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_31subst(struct __pyx_obj_4cdec_
     __pyx_t_2 = (__pyx_f_4cdec_2sa_3_sa_sym_isvar((__pyx_v_self->syms[__pyx_v_i])) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":149
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":149
  *         for i from 0 <= i < self.n:
  *             if sym_isvar(self.syms[i]):
  *                 start = start + children[sym_getindex(self.syms[i])-1]             # <<<<<<<<<<<<<<
@@ -29333,7 +29333,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_31subst(struct __pyx_obj_4cdec_
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":151
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":151
  *                 start = start + children[sym_getindex(self.syms[i])-1]
  *             else:
  *                 start = start + (self.syms[i],)             # <<<<<<<<<<<<<<
@@ -29356,7 +29356,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_31subst(struct __pyx_obj_4cdec_
     __pyx_L5:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":152
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":152
  *             else:
  *                 start = start + (self.syms[i],)
  *         return start             # <<<<<<<<<<<<<<
@@ -29368,7 +29368,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_31subst(struct __pyx_obj_4cdec_
   __pyx_r = __pyx_v_start;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":145
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":145
  *             yield self.syms[i]
  * 
  *     def subst(self, start, children):             # <<<<<<<<<<<<<<
@@ -29389,7 +29389,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_31subst(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":155
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":155
  * 
  *     property words:
  *         def __get__(self):             # <<<<<<<<<<<<<<
@@ -29426,7 +29426,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_5words___get__(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":156
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":156
  *     property words:
  *         def __get__(self):
  *             return [sym_tostring(w) for w in self if not sym_isvar(w)]             # <<<<<<<<<<<<<<
@@ -29490,7 +29490,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_5words___get__(struct __pyx_obj
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":155
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":155
  * 
  *     property words:
  *         def __get__(self):             # <<<<<<<<<<<<<<
@@ -29512,7 +29512,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_6Phrase_5words___get__(struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":160
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":160
  * cdef class Rule:
  * 
  *     def __cinit__(self, int lhs, Phrase f, Phrase e, scores=None, word_alignments=None):             # <<<<<<<<<<<<<<
@@ -29629,7 +29629,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_4Rule___cinit__(struct __pyx_obj_4cdec_2sa_3_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":161
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":161
  * 
  *     def __cinit__(self, int lhs, Phrase f, Phrase e, scores=None, word_alignments=None):
  *         if not sym_isvar(lhs): raise Exception('Invalid LHS symbol: %d' % lhs)             # <<<<<<<<<<<<<<
@@ -29656,7 +29656,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_4Rule___cinit__(struct __pyx_obj_4cdec_2sa_3_
     {__pyx_filename = __pyx_f[7]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":162
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":162
  *     def __cinit__(self, int lhs, Phrase f, Phrase e, scores=None, word_alignments=None):
  *         if not sym_isvar(lhs): raise Exception('Invalid LHS symbol: %d' % lhs)
  *         self.lhs = lhs             # <<<<<<<<<<<<<<
@@ -29665,7 +29665,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_4Rule___cinit__(struct __pyx_obj_4cdec_2sa_3_
  */
   __pyx_v_self->lhs = __pyx_v_lhs;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":163
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":163
  *         if not sym_isvar(lhs): raise Exception('Invalid LHS symbol: %d' % lhs)
  *         self.lhs = lhs
  *         self.f = f             # <<<<<<<<<<<<<<
@@ -29678,7 +29678,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_4Rule___cinit__(struct __pyx_obj_4cdec_2sa_3_
   __Pyx_DECREF(((PyObject *)__pyx_v_self->f));
   __pyx_v_self->f = __pyx_v_f;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":164
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":164
  *         self.lhs = lhs
  *         self.f = f
  *         self.e = e             # <<<<<<<<<<<<<<
@@ -29691,7 +29691,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_4Rule___cinit__(struct __pyx_obj_4cdec_2sa_3_
   __Pyx_DECREF(((PyObject *)__pyx_v_self->e));
   __pyx_v_self->e = __pyx_v_e;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":165
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":165
  *         self.f = f
  *         self.e = e
  *         self.word_alignments = word_alignments             # <<<<<<<<<<<<<<
@@ -29704,7 +29704,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_4Rule___cinit__(struct __pyx_obj_4cdec_2sa_3_
   __Pyx_DECREF(__pyx_v_self->word_alignments);
   __pyx_v_self->word_alignments = __pyx_v_word_alignments;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":166
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":166
  *         self.e = e
  *         self.word_alignments = word_alignments
  *         self.scores = scores             # <<<<<<<<<<<<<<
@@ -29720,7 +29720,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_4Rule___cinit__(struct __pyx_obj_4cdec_2sa_3_
   __pyx_v_self->scores = ((struct __pyx_obj_4cdec_2sa_3_sa_FeatureVector *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":160
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":160
  * cdef class Rule:
  * 
  *     def __cinit__(self, int lhs, Phrase f, Phrase e, scores=None, word_alignments=None):             # <<<<<<<<<<<<<<
@@ -29741,7 +29741,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_4Rule___cinit__(struct __pyx_obj_4cdec_2sa_3_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":168
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":168
  *         self.scores = scores
  * 
  *     def __hash__(self):             # <<<<<<<<<<<<<<
@@ -29773,7 +29773,7 @@ static Py_hash_t __pyx_pf_4cdec_2sa_3_sa_4Rule_2__hash__(struct __pyx_obj_4cdec_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__hash__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":169
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":169
  * 
  *     def __hash__(self):
  *         return hash((self.lhs, self.f, self.e))             # <<<<<<<<<<<<<<
@@ -29798,7 +29798,7 @@ static Py_hash_t __pyx_pf_4cdec_2sa_3_sa_4Rule_2__hash__(struct __pyx_obj_4cdec_
   __pyx_r = __pyx_t_3;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":168
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":168
  *         self.scores = scores
  * 
  *     def __hash__(self):             # <<<<<<<<<<<<<<
@@ -29818,7 +29818,7 @@ static Py_hash_t __pyx_pf_4cdec_2sa_3_sa_4Rule_2__hash__(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":171
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":171
  *         return hash((self.lhs, self.f, self.e))
  * 
  *     def __cmp__(self, Rule other):             # <<<<<<<<<<<<<<
@@ -29862,7 +29862,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_4Rule_4__cmp__(struct __pyx_obj_4cdec_2sa_3_s
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cmp__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":172
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":172
  * 
  *     def __cmp__(self, Rule other):
  *         return cmp((self.lhs, self.f, self.e, self.word_alignments),             # <<<<<<<<<<<<<<
@@ -29886,7 +29886,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_4Rule_4__cmp__(struct __pyx_obj_4cdec_2sa_3_s
   __Pyx_GIVEREF(__pyx_v_self->word_alignments);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":173
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":173
  *     def __cmp__(self, Rule other):
  *         return cmp((self.lhs, self.f, self.e, self.word_alignments),
  *                 (other.lhs, other.f, other.e, self.word_alignments))             # <<<<<<<<<<<<<<
@@ -29910,7 +29910,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_4Rule_4__cmp__(struct __pyx_obj_4cdec_2sa_3_s
   __Pyx_GIVEREF(__pyx_v_self->word_alignments);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":172
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":172
  * 
  *     def __cmp__(self, Rule other):
  *         return cmp((self.lhs, self.f, self.e, self.word_alignments),             # <<<<<<<<<<<<<<
@@ -29933,7 +29933,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_4Rule_4__cmp__(struct __pyx_obj_4cdec_2sa_3_s
   __pyx_r = __pyx_t_4;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":171
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":171
  *         return hash((self.lhs, self.f, self.e))
  * 
  *     def __cmp__(self, Rule other):             # <<<<<<<<<<<<<<
@@ -29954,7 +29954,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_4Rule_4__cmp__(struct __pyx_obj_4cdec_2sa_3_s
 }
 #endif /*!(#if PY_MAJOR_VERSION < 3)*/
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":175
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":175
  *                 (other.lhs, other.f, other.e, self.word_alignments))
  * 
  *     def fmerge(self, Phrase f):             # <<<<<<<<<<<<<<
@@ -29993,7 +29993,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4Rule_6fmerge(struct __pyx_obj_4cdec_2s
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("fmerge", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":176
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":176
  * 
  *     def fmerge(self, Phrase f):
  *         if self.f == f:             # <<<<<<<<<<<<<<
@@ -30005,7 +30005,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4Rule_6fmerge(struct __pyx_obj_4cdec_2s
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":177
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":177
  *     def fmerge(self, Phrase f):
  *         if self.f == f:
  *             self.f = f             # <<<<<<<<<<<<<<
@@ -30021,7 +30021,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4Rule_6fmerge(struct __pyx_obj_4cdec_2s
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":175
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":175
  *                 (other.lhs, other.f, other.e, self.word_alignments))
  * 
  *     def fmerge(self, Phrase f):             # <<<<<<<<<<<<<<
@@ -30042,7 +30042,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4Rule_6fmerge(struct __pyx_obj_4cdec_2s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":179
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":179
  *             self.f = f
  * 
  *     def arity(self):             # <<<<<<<<<<<<<<
@@ -30073,7 +30073,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4Rule_8arity(struct __pyx_obj_4cdec_2sa
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("arity", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":180
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":180
  * 
  *     def arity(self):
  *         return self.f.arity()             # <<<<<<<<<<<<<<
@@ -30090,7 +30090,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4Rule_8arity(struct __pyx_obj_4cdec_2sa
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":179
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":179
  *             self.f = f
  * 
  *     def arity(self):             # <<<<<<<<<<<<<<
@@ -30110,7 +30110,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4Rule_8arity(struct __pyx_obj_4cdec_2sa
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":182
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":182
  *         return self.f.arity()
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -30132,7 +30132,7 @@ static PyObject *__pyx_pw_4cdec_2sa_3_sa_4Rule_11__str__(PyObject *__pyx_v_self)
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_4Rule_7__str___2generator13(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":186
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":186
  *         fields = [sym_tostring(self.lhs), str(self.f), str(self.e), str(self.scores)]
  *         if self.word_alignments is not None:
  *             fields.append(' '.join('%d-%d' % a for a in self.alignments()))             # <<<<<<<<<<<<<<
@@ -30283,7 +30283,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_4Rule_7__str___2generator13(__pyx_Gener
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":182
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":182
  *         return self.f.arity()
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -30318,7 +30318,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4Rule_10__str__(struct __pyx_obj_4cdec_
   __Pyx_INCREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
   __Pyx_GIVEREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":184
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":184
  *     def __str__(self):
  *         cdef unsigned i
  *         fields = [sym_tostring(self.lhs), str(self.f), str(self.e), str(self.scores)]             # <<<<<<<<<<<<<<
@@ -30368,7 +30368,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4Rule_10__str__(struct __pyx_obj_4cdec_
   __pyx_v_fields = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":185
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":185
  *         cdef unsigned i
  *         fields = [sym_tostring(self.lhs), str(self.f), str(self.e), str(self.scores)]
  *         if self.word_alignments is not None:             # <<<<<<<<<<<<<<
@@ -30379,7 +30379,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4Rule_10__str__(struct __pyx_obj_4cdec_
   __pyx_t_7 = (__pyx_t_6 != 0);
   if (__pyx_t_7) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":186
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":186
  *         fields = [sym_tostring(self.lhs), str(self.f), str(self.e), str(self.scores)]
  *         if self.word_alignments is not None:
  *             fields.append(' '.join('%d-%d' % a for a in self.alignments()))             # <<<<<<<<<<<<<<
@@ -30397,7 +30397,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4Rule_10__str__(struct __pyx_obj_4cdec_
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":187
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":187
  *         if self.word_alignments is not None:
  *             fields.append(' '.join('%d-%d' % a for a in self.alignments()))
  *         return ' ||| '.join(fields)             # <<<<<<<<<<<<<<
@@ -30411,7 +30411,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4Rule_10__str__(struct __pyx_obj_4cdec_
   __pyx_t_5 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":182
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":182
  *         return self.f.arity()
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -30437,7 +30437,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4Rule_10__str__(struct __pyx_obj_4cdec_
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_4Rule_14generator3(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":189
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":189
  *         return ' ||| '.join(fields)
  * 
  *     def alignments(self):             # <<<<<<<<<<<<<<
@@ -30520,7 +30520,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_4Rule_14generator3(__pyx_GeneratorObjec
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[7]; __pyx_lineno = 189; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":190
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":190
  * 
  *     def alignments(self):
  *         for point in self.word_alignments:             # <<<<<<<<<<<<<<
@@ -30566,7 +30566,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_4Rule_14generator3(__pyx_GeneratorObjec
     __Pyx_GIVEREF(__pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":191
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":191
  *     def alignments(self):
  *         for point in self.word_alignments:
  *             yield point / ALIGNMENT_CODE, point % ALIGNMENT_CODE             # <<<<<<<<<<<<<<
@@ -30610,7 +30610,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_4Rule_14generator3(__pyx_GeneratorObjec
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rule.pxi":189
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rule.pxi":189
  *         return ' ||| '.join(fields)
  * 
  *     def alignments(self):             # <<<<<<<<<<<<<<
@@ -30701,7 +30701,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_4Rule_1e___get__(struct __pyx_obj_4cdec
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":21
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":21
  *     int arr_len
  * 
  * cdef _Trie_Node* new_trie_node():             # <<<<<<<<<<<<<<
@@ -30715,7 +30715,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_new_trie
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("new_trie_node", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":23
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":23
  * cdef _Trie_Node* new_trie_node():
  *     cdef _Trie_Node* node
  *     node = <_Trie_Node*> malloc(sizeof(_Trie_Node))             # <<<<<<<<<<<<<<
@@ -30724,7 +30724,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_new_trie
  */
   __pyx_v_node = ((struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *)malloc((sizeof(struct __pyx_t_4cdec_2sa_3_sa__Trie_Node))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":24
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":24
  *     cdef _Trie_Node* node
  *     node = <_Trie_Node*> malloc(sizeof(_Trie_Node))
  *     node.root = NULL             # <<<<<<<<<<<<<<
@@ -30733,7 +30733,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_new_trie
  */
   __pyx_v_node->root = NULL;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":25
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":25
  *     node = <_Trie_Node*> malloc(sizeof(_Trie_Node))
  *     node.root = NULL
  *     node.arr_len = 0             # <<<<<<<<<<<<<<
@@ -30742,7 +30742,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_new_trie
  */
   __pyx_v_node->arr_len = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":26
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":26
  *     node.root = NULL
  *     node.arr_len = 0
  *     node.arr = <int*> malloc(sizeof(0*sizeof(int)))             # <<<<<<<<<<<<<<
@@ -30751,7 +30751,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_new_trie
  */
   __pyx_v_node->arr = ((int *)malloc((sizeof((0 * (sizeof(int)))))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":27
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":27
  *     node.arr_len = 0
  *     node.arr = <int*> malloc(sizeof(0*sizeof(int)))
  *     return node             # <<<<<<<<<<<<<<
@@ -30761,7 +30761,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_new_trie
   __pyx_r = __pyx_v_node;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":21
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":21
  *     int arr_len
  * 
  * cdef _Trie_Node* new_trie_node():             # <<<<<<<<<<<<<<
@@ -30775,7 +30775,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_new_trie
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":29
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":29
  *     return node
  * 
  * cdef _Trie_Edge* new_trie_edge(int val):             # <<<<<<<<<<<<<<
@@ -30789,7 +30789,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Edge *__pyx_f_4cdec_2sa_3_sa_new_trie
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("new_trie_edge", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":31
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":31
  * cdef _Trie_Edge* new_trie_edge(int val):
  *     cdef _Trie_Edge* edge
  *     edge = <_Trie_Edge*> malloc(sizeof(_Trie_Edge))             # <<<<<<<<<<<<<<
@@ -30798,7 +30798,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Edge *__pyx_f_4cdec_2sa_3_sa_new_trie
  */
   __pyx_v_edge = ((struct __pyx_t_4cdec_2sa_3_sa__Trie_Edge *)malloc((sizeof(struct __pyx_t_4cdec_2sa_3_sa__Trie_Edge))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":32
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":32
  *     cdef _Trie_Edge* edge
  *     edge = <_Trie_Edge*> malloc(sizeof(_Trie_Edge))
  *     edge.node = new_trie_node()             # <<<<<<<<<<<<<<
@@ -30807,7 +30807,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Edge *__pyx_f_4cdec_2sa_3_sa_new_trie
  */
   __pyx_v_edge->node = __pyx_f_4cdec_2sa_3_sa_new_trie_node();
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":33
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":33
  *     edge = <_Trie_Edge*> malloc(sizeof(_Trie_Edge))
  *     edge.node = new_trie_node()
  *     edge.bigger = NULL             # <<<<<<<<<<<<<<
@@ -30816,7 +30816,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Edge *__pyx_f_4cdec_2sa_3_sa_new_trie
  */
   __pyx_v_edge->bigger = NULL;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":34
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":34
  *     edge.node = new_trie_node()
  *     edge.bigger = NULL
  *     edge.smaller = NULL             # <<<<<<<<<<<<<<
@@ -30825,7 +30825,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Edge *__pyx_f_4cdec_2sa_3_sa_new_trie
  */
   __pyx_v_edge->smaller = NULL;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":35
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":35
  *     edge.bigger = NULL
  *     edge.smaller = NULL
  *     edge.val = val             # <<<<<<<<<<<<<<
@@ -30834,7 +30834,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Edge *__pyx_f_4cdec_2sa_3_sa_new_trie
  */
   __pyx_v_edge->val = __pyx_v_val;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":36
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":36
  *     edge.smaller = NULL
  *     edge.val = val
  *     return edge             # <<<<<<<<<<<<<<
@@ -30844,7 +30844,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Edge *__pyx_f_4cdec_2sa_3_sa_new_trie
   __pyx_r = __pyx_v_edge;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":29
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":29
  *     return node
  * 
  * cdef _Trie_Edge* new_trie_edge(int val):             # <<<<<<<<<<<<<<
@@ -30858,7 +30858,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Edge *__pyx_f_4cdec_2sa_3_sa_new_trie
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":38
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":38
  *     return edge
  * 
  * cdef free_trie_node(_Trie_Node* node):             # <<<<<<<<<<<<<<
@@ -30876,7 +30876,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_free_trie_node(struct __pyx_t_4cdec_2sa_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("free_trie_node", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":39
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":39
  * 
  * cdef free_trie_node(_Trie_Node* node):
  *     if node != NULL:             # <<<<<<<<<<<<<<
@@ -30886,7 +30886,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_free_trie_node(struct __pyx_t_4cdec_2sa_
   __pyx_t_1 = ((__pyx_v_node != NULL) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":40
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":40
  * cdef free_trie_node(_Trie_Node* node):
  *     if node != NULL:
  *         free_trie_edge(node.root)             # <<<<<<<<<<<<<<
@@ -30897,7 +30897,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_free_trie_node(struct __pyx_t_4cdec_2sa_
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":41
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":41
  *     if node != NULL:
  *         free_trie_edge(node.root)
  *         free(node.arr)             # <<<<<<<<<<<<<<
@@ -30909,7 +30909,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_free_trie_node(struct __pyx_t_4cdec_2sa_
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":38
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":38
  *     return edge
  * 
  * cdef free_trie_node(_Trie_Node* node):             # <<<<<<<<<<<<<<
@@ -30930,7 +30930,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_free_trie_node(struct __pyx_t_4cdec_2sa_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":43
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":43
  *         free(node.arr)
  * 
  * cdef free_trie_edge(_Trie_Edge* edge):             # <<<<<<<<<<<<<<
@@ -30948,7 +30948,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_free_trie_edge(struct __pyx_t_4cdec_2sa_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("free_trie_edge", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":44
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":44
  * 
  * cdef free_trie_edge(_Trie_Edge* edge):
  *     if edge != NULL:             # <<<<<<<<<<<<<<
@@ -30958,7 +30958,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_free_trie_edge(struct __pyx_t_4cdec_2sa_
   __pyx_t_1 = ((__pyx_v_edge != NULL) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":45
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":45
  * cdef free_trie_edge(_Trie_Edge* edge):
  *     if edge != NULL:
  *         free_trie_node(edge.node)             # <<<<<<<<<<<<<<
@@ -30969,7 +30969,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_free_trie_edge(struct __pyx_t_4cdec_2sa_
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":46
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":46
  *     if edge != NULL:
  *         free_trie_node(edge.node)
  *         free_trie_edge(edge.bigger)             # <<<<<<<<<<<<<<
@@ -30980,7 +30980,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_free_trie_edge(struct __pyx_t_4cdec_2sa_
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":47
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":47
  *         free_trie_node(edge.node)
  *         free_trie_edge(edge.bigger)
  *         free_trie_edge(edge.smaller)             # <<<<<<<<<<<<<<
@@ -30994,7 +30994,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_free_trie_edge(struct __pyx_t_4cdec_2sa_
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":43
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":43
  *         free(node.arr)
  * 
  * cdef free_trie_edge(_Trie_Edge* edge):             # <<<<<<<<<<<<<<
@@ -31015,7 +31015,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_free_trie_edge(struct __pyx_t_4cdec_2sa_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":49
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":49
  *         free_trie_edge(edge.smaller)
  * 
  * cdef _Trie_Node* trie_find(_Trie_Node* node, int val):             # <<<<<<<<<<<<<<
@@ -31033,7 +31033,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_fin
   int __pyx_t_4;
   __Pyx_RefNannySetupContext("trie_find", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":51
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":51
  * cdef _Trie_Node* trie_find(_Trie_Node* node, int val):
  *     cdef _Trie_Edge* cur
  *     cur = node.root             # <<<<<<<<<<<<<<
@@ -31043,7 +31043,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_fin
   __pyx_t_1 = __pyx_v_node->root;
   __pyx_v_cur = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":52
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":52
  *     cdef _Trie_Edge* cur
  *     cur = node.root
  *     while cur != NULL and cur.val != val:             # <<<<<<<<<<<<<<
@@ -31060,7 +31060,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_fin
     }
     if (!__pyx_t_4) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":53
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":53
  *     cur = node.root
  *     while cur != NULL and cur.val != val:
  *         if val > cur.val:             # <<<<<<<<<<<<<<
@@ -31070,7 +31070,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_fin
     __pyx_t_4 = ((__pyx_v_val > __pyx_v_cur->val) != 0);
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":54
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":54
  *     while cur != NULL and cur.val != val:
  *         if val > cur.val:
  *             cur = cur.bigger             # <<<<<<<<<<<<<<
@@ -31082,7 +31082,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_fin
       goto __pyx_L5;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":55
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":55
  *         if val > cur.val:
  *             cur = cur.bigger
  *         elif val < cur.val:             # <<<<<<<<<<<<<<
@@ -31092,7 +31092,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_fin
     __pyx_t_4 = ((__pyx_v_val < __pyx_v_cur->val) != 0);
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":56
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":56
  *             cur = cur.bigger
  *         elif val < cur.val:
  *             cur = cur.smaller             # <<<<<<<<<<<<<<
@@ -31106,7 +31106,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_fin
     __pyx_L5:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":57
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":57
  *         elif val < cur.val:
  *             cur = cur.smaller
  *     if cur == NULL:             # <<<<<<<<<<<<<<
@@ -31116,7 +31116,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_fin
   __pyx_t_4 = ((__pyx_v_cur == NULL) != 0);
   if (__pyx_t_4) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":58
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":58
  *             cur = cur.smaller
  *     if cur == NULL:
  *         return NULL             # <<<<<<<<<<<<<<
@@ -31128,7 +31128,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_fin
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":60
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":60
  *         return NULL
  *     else:
  *         return cur.node             # <<<<<<<<<<<<<<
@@ -31139,7 +31139,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_fin
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":49
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":49
  *         free_trie_edge(edge.smaller)
  * 
  * cdef _Trie_Node* trie_find(_Trie_Node* node, int val):             # <<<<<<<<<<<<<<
@@ -31153,7 +31153,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_fin
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":62
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":62
  *         return cur.node
  * 
  * cdef trie_node_data_append(_Trie_Node* node, int val):             # <<<<<<<<<<<<<<
@@ -31167,7 +31167,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_data_append(struct __pyx_t_4cd
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("trie_node_data_append", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":64
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":64
  * cdef trie_node_data_append(_Trie_Node* node, int val):
  *     cdef int new_len
  *     new_len = node.arr_len + 1             # <<<<<<<<<<<<<<
@@ -31176,7 +31176,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_data_append(struct __pyx_t_4cd
  */
   __pyx_v_new_len = (__pyx_v_node->arr_len + 1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":65
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":65
  *     cdef int new_len
  *     new_len = node.arr_len + 1
  *     node.arr = <int*> realloc(node.arr, new_len*sizeof(int))             # <<<<<<<<<<<<<<
@@ -31185,7 +31185,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_data_append(struct __pyx_t_4cd
  */
   __pyx_v_node->arr = ((int *)realloc(__pyx_v_node->arr, (__pyx_v_new_len * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":66
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":66
  *     new_len = node.arr_len + 1
  *     node.arr = <int*> realloc(node.arr, new_len*sizeof(int))
  *     node.arr[node.arr_len] = val             # <<<<<<<<<<<<<<
@@ -31194,7 +31194,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_data_append(struct __pyx_t_4cd
  */
   (__pyx_v_node->arr[__pyx_v_node->arr_len]) = __pyx_v_val;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":67
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":67
  *     node.arr = <int*> realloc(node.arr, new_len*sizeof(int))
  *     node.arr[node.arr_len] = val
  *     node.arr_len = new_len             # <<<<<<<<<<<<<<
@@ -31203,7 +31203,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_data_append(struct __pyx_t_4cd
  */
   __pyx_v_node->arr_len = __pyx_v_new_len;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":62
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":62
  *         return cur.node
  * 
  * cdef trie_node_data_append(_Trie_Node* node, int val):             # <<<<<<<<<<<<<<
@@ -31218,7 +31218,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_data_append(struct __pyx_t_4cd
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":69
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":69
  *     node.arr_len = new_len
  * 
  * cdef trie_node_data_extend(_Trie_Node* node, int* vals, int num_vals):             # <<<<<<<<<<<<<<
@@ -31232,7 +31232,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_data_extend(struct __pyx_t_4cd
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("trie_node_data_extend", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":71
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":71
  * cdef trie_node_data_extend(_Trie_Node* node, int* vals, int num_vals):
  *     cdef int new_len
  *     new_len = node.arr_len + num_vals             # <<<<<<<<<<<<<<
@@ -31241,7 +31241,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_data_extend(struct __pyx_t_4cd
  */
   __pyx_v_new_len = (__pyx_v_node->arr_len + __pyx_v_num_vals);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":72
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":72
  *     cdef int new_len
  *     new_len = node.arr_len + num_vals
  *     node.arr = <int*> realloc(node.arr, new_len*sizeof(int))             # <<<<<<<<<<<<<<
@@ -31250,7 +31250,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_data_extend(struct __pyx_t_4cd
  */
   __pyx_v_node->arr = ((int *)realloc(__pyx_v_node->arr, (__pyx_v_new_len * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":73
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":73
  *     new_len = node.arr_len + num_vals
  *     node.arr = <int*> realloc(node.arr, new_len*sizeof(int))
  *     memcpy(node.arr + node.arr_len, vals, num_vals*sizeof(int))             # <<<<<<<<<<<<<<
@@ -31259,7 +31259,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_data_extend(struct __pyx_t_4cd
  */
   memcpy((__pyx_v_node->arr + __pyx_v_node->arr_len), __pyx_v_vals, (__pyx_v_num_vals * (sizeof(int))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":74
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":74
  *     node.arr = <int*> realloc(node.arr, new_len*sizeof(int))
  *     memcpy(node.arr + node.arr_len, vals, num_vals*sizeof(int))
  *     node.arr_len = new_len             # <<<<<<<<<<<<<<
@@ -31268,7 +31268,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_data_extend(struct __pyx_t_4cd
  */
   __pyx_v_node->arr_len = __pyx_v_new_len;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":69
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":69
  *     node.arr_len = new_len
  * 
  * cdef trie_node_data_extend(_Trie_Node* node, int* vals, int num_vals):             # <<<<<<<<<<<<<<
@@ -31283,7 +31283,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_data_extend(struct __pyx_t_4cd
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":77
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":77
  * 
  * 
  * cdef _Trie_Node* trie_insert(_Trie_Node* node, int val):             # <<<<<<<<<<<<<<
@@ -31300,7 +31300,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_ins
   int __pyx_t_3;
   __Pyx_RefNannySetupContext("trie_insert", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":79
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":79
  * cdef _Trie_Node* trie_insert(_Trie_Node* node, int val):
  *     cdef _Trie_Edge** cur
  *     cur = &node.root             # <<<<<<<<<<<<<<
@@ -31309,7 +31309,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_ins
  */
   __pyx_v_cur = (&__pyx_v_node->root);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":80
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":80
  *     cdef _Trie_Edge** cur
  *     cur = &node.root
  *     while cur[0] != NULL and cur[0].val != val:             # <<<<<<<<<<<<<<
@@ -31326,7 +31326,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_ins
     }
     if (!__pyx_t_3) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":81
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":81
  *     cur = &node.root
  *     while cur[0] != NULL and cur[0].val != val:
  *         if val > cur[0].val:             # <<<<<<<<<<<<<<
@@ -31336,7 +31336,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_ins
     __pyx_t_3 = ((__pyx_v_val > (__pyx_v_cur[0])->val) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":82
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":82
  *     while cur[0] != NULL and cur[0].val != val:
  *         if val > cur[0].val:
  *             cur = &cur[0].bigger             # <<<<<<<<<<<<<<
@@ -31347,7 +31347,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_ins
       goto __pyx_L5;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":83
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":83
  *         if val > cur[0].val:
  *             cur = &cur[0].bigger
  *         elif val < cur[0].val:             # <<<<<<<<<<<<<<
@@ -31357,7 +31357,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_ins
     __pyx_t_3 = ((__pyx_v_val < (__pyx_v_cur[0])->val) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":84
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":84
  *             cur = &cur[0].bigger
  *         elif val < cur[0].val:
  *             cur = &cur[0].smaller             # <<<<<<<<<<<<<<
@@ -31370,7 +31370,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_ins
     __pyx_L5:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":85
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":85
  *         elif val < cur[0].val:
  *             cur = &cur[0].smaller
  *     if cur[0] == NULL:             # <<<<<<<<<<<<<<
@@ -31380,7 +31380,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_ins
   __pyx_t_3 = (((__pyx_v_cur[0]) == NULL) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":86
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":86
  *             cur = &cur[0].smaller
  *     if cur[0] == NULL:
  *         cur[0] = new_trie_edge(val)             # <<<<<<<<<<<<<<
@@ -31392,7 +31392,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_ins
   }
   __pyx_L6:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":87
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":87
  *     if cur[0] == NULL:
  *         cur[0] = new_trie_edge(val)
  *     return cur[0].node             # <<<<<<<<<<<<<<
@@ -31402,7 +31402,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_ins
   __pyx_r = (__pyx_v_cur[0])->node;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":77
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":77
  * 
  * 
  * cdef _Trie_Node* trie_insert(_Trie_Node* node, int val):             # <<<<<<<<<<<<<<
@@ -31416,7 +31416,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_trie_ins
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":89
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":89
  *     return cur[0].node
  * 
  * cdef trie_node_to_map(_Trie_Node* node, result, prefix, int include_zeros):             # <<<<<<<<<<<<<<
@@ -31437,7 +31437,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_to_map(struct __pyx_t_4cdec_2s
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("trie_node_to_map", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":92
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":92
  *     cdef IntList arr
  * 
  *     if include_zeros or node.arr_len > 0:             # <<<<<<<<<<<<<<
@@ -31452,7 +31452,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_to_map(struct __pyx_t_4cdec_2s
   }
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":93
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":93
  * 
  *     if include_zeros or node.arr_len > 0:
  *         arr = IntList()             # <<<<<<<<<<<<<<
@@ -31464,7 +31464,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_to_map(struct __pyx_t_4cdec_2s
     __pyx_v_arr = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_3);
     __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":94
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":94
  *     if include_zeros or node.arr_len > 0:
  *         arr = IntList()
  *         free(arr.arr)             # <<<<<<<<<<<<<<
@@ -31473,7 +31473,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_to_map(struct __pyx_t_4cdec_2s
  */
     free(__pyx_v_arr->arr);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":95
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":95
  *         arr = IntList()
  *         free(arr.arr)
  *         arr.arr = <int*> malloc(node.arr_len * sizeof(int))             # <<<<<<<<<<<<<<
@@ -31482,7 +31482,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_to_map(struct __pyx_t_4cdec_2s
  */
     __pyx_v_arr->arr = ((int *)malloc((__pyx_v_node->arr_len * (sizeof(int)))));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":96
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":96
  *         free(arr.arr)
  *         arr.arr = <int*> malloc(node.arr_len * sizeof(int))
  *         memcpy(arr.arr, node.arr, node.arr_len * sizeof(int))             # <<<<<<<<<<<<<<
@@ -31491,7 +31491,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_to_map(struct __pyx_t_4cdec_2s
  */
     memcpy(__pyx_v_arr->arr, __pyx_v_node->arr, (__pyx_v_node->arr_len * (sizeof(int))));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":97
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":97
  *         arr.arr = <int*> malloc(node.arr_len * sizeof(int))
  *         memcpy(arr.arr, node.arr, node.arr_len * sizeof(int))
  *         arr.len = node.arr_len             # <<<<<<<<<<<<<<
@@ -31501,7 +31501,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_to_map(struct __pyx_t_4cdec_2s
     __pyx_t_4 = __pyx_v_node->arr_len;
     __pyx_v_arr->len = __pyx_t_4;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":98
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":98
  *         memcpy(arr.arr, node.arr, node.arr_len * sizeof(int))
  *         arr.len = node.arr_len
  *         arr.size = node.arr_len             # <<<<<<<<<<<<<<
@@ -31511,7 +31511,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_to_map(struct __pyx_t_4cdec_2s
     __pyx_t_4 = __pyx_v_node->arr_len;
     __pyx_v_arr->size = __pyx_t_4;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":99
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":99
  *         arr.len = node.arr_len
  *         arr.size = node.arr_len
  *         result[prefix] = arr             # <<<<<<<<<<<<<<
@@ -31523,7 +31523,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_to_map(struct __pyx_t_4cdec_2s
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":100
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":100
  *         arr.size = node.arr_len
  *         result[prefix] = arr
  *     trie_edge_to_map(node.root, result, prefix, include_zeros)             # <<<<<<<<<<<<<<
@@ -31534,7 +31534,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_to_map(struct __pyx_t_4cdec_2s
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":89
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":89
  *     return cur[0].node
  * 
  * cdef trie_node_to_map(_Trie_Node* node, result, prefix, int include_zeros):             # <<<<<<<<<<<<<<
@@ -31556,7 +31556,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_node_to_map(struct __pyx_t_4cdec_2s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":102
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":102
  *     trie_edge_to_map(node.root, result, prefix, include_zeros)
  * 
  * cdef trie_edge_to_map(_Trie_Edge* edge, result, prefix, int include_zeros):             # <<<<<<<<<<<<<<
@@ -31576,7 +31576,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_edge_to_map(struct __pyx_t_4cdec_2s
   __Pyx_RefNannySetupContext("trie_edge_to_map", 0);
   __Pyx_INCREF(__pyx_v_prefix);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":103
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":103
  * 
  * cdef trie_edge_to_map(_Trie_Edge* edge, result, prefix, int include_zeros):
  *     if edge != NULL:             # <<<<<<<<<<<<<<
@@ -31586,7 +31586,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_edge_to_map(struct __pyx_t_4cdec_2s
   __pyx_t_1 = ((__pyx_v_edge != NULL) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":104
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":104
  * cdef trie_edge_to_map(_Trie_Edge* edge, result, prefix, int include_zeros):
  *     if edge != NULL:
  *         trie_edge_to_map(edge.smaller, result, prefix, include_zeros)             # <<<<<<<<<<<<<<
@@ -31597,7 +31597,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_edge_to_map(struct __pyx_t_4cdec_2s
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":105
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":105
  *     if edge != NULL:
  *         trie_edge_to_map(edge.smaller, result, prefix, include_zeros)
  *         trie_edge_to_map(edge.bigger, result, prefix, include_zeros)             # <<<<<<<<<<<<<<
@@ -31608,7 +31608,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_edge_to_map(struct __pyx_t_4cdec_2s
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":106
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":106
  *         trie_edge_to_map(edge.smaller, result, prefix, include_zeros)
  *         trie_edge_to_map(edge.bigger, result, prefix, include_zeros)
  *         prefix = prefix + (edge.val,)             # <<<<<<<<<<<<<<
@@ -31628,7 +31628,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_edge_to_map(struct __pyx_t_4cdec_2s
     __Pyx_DECREF_SET(__pyx_v_prefix, __pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":107
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":107
  *         trie_edge_to_map(edge.bigger, result, prefix, include_zeros)
  *         prefix = prefix + (edge.val,)
  *         trie_node_to_map(edge.node, result, prefix, include_zeros)             # <<<<<<<<<<<<<<
@@ -31642,7 +31642,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_edge_to_map(struct __pyx_t_4cdec_2s
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":102
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":102
  *     trie_edge_to_map(node.root, result, prefix, include_zeros)
  * 
  * cdef trie_edge_to_map(_Trie_Edge* edge, result, prefix, int include_zeros):             # <<<<<<<<<<<<<<
@@ -31665,7 +31665,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_trie_edge_to_map(struct __pyx_t_4cdec_2s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":114
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":114
  *     cdef int V
  * 
  *     def __cinit__(self, int alphabet_size):             # <<<<<<<<<<<<<<
@@ -31730,7 +31730,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7TrieMap___cinit__(struct __pyx_obj_4cdec_2sa
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":115
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":115
  * 
  *     def __cinit__(self, int alphabet_size):
  *         self.V = alphabet_size             # <<<<<<<<<<<<<<
@@ -31739,7 +31739,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7TrieMap___cinit__(struct __pyx_obj_4cdec_2sa
  */
   __pyx_v_self->V = __pyx_v_alphabet_size;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":116
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":116
  *     def __cinit__(self, int alphabet_size):
  *         self.V = alphabet_size
  *         self.root = <_Trie_Node**> malloc(self.V * sizeof(_Trie_Node*))             # <<<<<<<<<<<<<<
@@ -31748,7 +31748,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7TrieMap___cinit__(struct __pyx_obj_4cdec_2sa
  */
   __pyx_v_self->root = ((struct __pyx_t_4cdec_2sa_3_sa__Trie_Node **)malloc((__pyx_v_self->V * (sizeof(struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":117
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":117
  *         self.V = alphabet_size
  *         self.root = <_Trie_Node**> malloc(self.V * sizeof(_Trie_Node*))
  *         memset(self.root, 0, self.V * sizeof(_Trie_Node*))             # <<<<<<<<<<<<<<
@@ -31757,7 +31757,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7TrieMap___cinit__(struct __pyx_obj_4cdec_2sa
  */
   memset(__pyx_v_self->root, 0, (__pyx_v_self->V * (sizeof(struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":114
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":114
  *     cdef int V
  * 
  *     def __cinit__(self, int alphabet_size):             # <<<<<<<<<<<<<<
@@ -31771,7 +31771,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7TrieMap___cinit__(struct __pyx_obj_4cdec_2sa
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":120
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":120
  * 
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -31801,7 +31801,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_7TrieMap_2__dealloc__(struct __pyx_obj_4cdec
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__dealloc__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":122
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":122
  *     def __dealloc__(self):
  *         cdef int i
  *         for i from 0 <= i < self.V:             # <<<<<<<<<<<<<<
@@ -31811,7 +31811,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_7TrieMap_2__dealloc__(struct __pyx_obj_4cdec
   __pyx_t_1 = __pyx_v_self->V;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_1; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":123
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":123
  *         cdef int i
  *         for i from 0 <= i < self.V:
  *             if self.root[i] != NULL:             # <<<<<<<<<<<<<<
@@ -31821,7 +31821,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_7TrieMap_2__dealloc__(struct __pyx_obj_4cdec
     __pyx_t_2 = (((__pyx_v_self->root[__pyx_v_i]) != NULL) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":124
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":124
  *         for i from 0 <= i < self.V:
  *             if self.root[i] != NULL:
  *                 free_trie_node(self.root[i])             # <<<<<<<<<<<<<<
@@ -31836,7 +31836,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_7TrieMap_2__dealloc__(struct __pyx_obj_4cdec
     __pyx_L5:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":125
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":125
  *             if self.root[i] != NULL:
  *                 free_trie_node(self.root[i])
  *         free(self.root)             # <<<<<<<<<<<<<<
@@ -31845,7 +31845,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_7TrieMap_2__dealloc__(struct __pyx_obj_4cdec
  */
   free(__pyx_v_self->root);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":120
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":120
  * 
  * 
  *     def __dealloc__(self):             # <<<<<<<<<<<<<<
@@ -31862,7 +31862,7 @@ static void __pyx_pf_4cdec_2sa_3_sa_7TrieMap_2__dealloc__(struct __pyx_obj_4cdec
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":128
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":128
  * 
  * 
  *     def insert(self, pattern):             # <<<<<<<<<<<<<<
@@ -31898,7 +31898,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_4insert(struct __pyx_obj_4cdec
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("insert", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":131
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":131
  *         cdef int* p
  *         cdef int i, l
  *         l = len(pattern)             # <<<<<<<<<<<<<<
@@ -31908,7 +31908,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_4insert(struct __pyx_obj_4cdec
   __pyx_t_1 = PyObject_Length(__pyx_v_pattern); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_l = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":132
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":132
  *         cdef int i, l
  *         l = len(pattern)
  *         p = <int*> malloc(l*sizeof(int))             # <<<<<<<<<<<<<<
@@ -31917,7 +31917,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_4insert(struct __pyx_obj_4cdec
  */
   __pyx_v_p = ((int *)malloc((__pyx_v_l * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":133
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":133
  *         l = len(pattern)
  *         p = <int*> malloc(l*sizeof(int))
  *         for i from 0 <= i < l:             # <<<<<<<<<<<<<<
@@ -31927,7 +31927,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_4insert(struct __pyx_obj_4cdec
   __pyx_t_2 = __pyx_v_l;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":134
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":134
  *         p = <int*> malloc(l*sizeof(int))
  *         for i from 0 <= i < l:
  *             p[i] = pattern[i]             # <<<<<<<<<<<<<<
@@ -31941,7 +31941,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_4insert(struct __pyx_obj_4cdec
     (__pyx_v_p[__pyx_v_i]) = __pyx_t_4;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":135
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":135
  *         for i from 0 <= i < l:
  *             p[i] = pattern[i]
  *         self._insert(p,l)             # <<<<<<<<<<<<<<
@@ -31950,7 +31950,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_4insert(struct __pyx_obj_4cdec
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_TrieMap *)__pyx_v_self->__pyx_vtab)->_insert(__pyx_v_self, __pyx_v_p, __pyx_v_l);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":136
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":136
  *             p[i] = pattern[i]
  *         self._insert(p,l)
  *         free(p)             # <<<<<<<<<<<<<<
@@ -31959,7 +31959,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_4insert(struct __pyx_obj_4cdec
  */
   free(__pyx_v_p);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":128
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":128
  * 
  * 
  *     def insert(self, pattern):             # <<<<<<<<<<<<<<
@@ -31980,7 +31980,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_4insert(struct __pyx_obj_4cdec
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":139
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":139
  * 
  * 
  *     cdef _Trie_Node* _insert(self, int* pattern, int pattern_len):             # <<<<<<<<<<<<<<
@@ -31997,7 +31997,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
   int __pyx_t_2;
   __Pyx_RefNannySetupContext("_insert", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":142
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":142
  *         cdef int i
  *         cdef _Trie_Node* node
  *         if self.root[pattern[0]] == NULL:             # <<<<<<<<<<<<<<
@@ -32007,7 +32007,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
   __pyx_t_1 = (((__pyx_v_self->root[(__pyx_v_pattern[0])]) == NULL) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":143
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":143
  *         cdef _Trie_Node* node
  *         if self.root[pattern[0]] == NULL:
  *             self.root[pattern[0]] = new_trie_node()             # <<<<<<<<<<<<<<
@@ -32019,7 +32019,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":144
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":144
  *         if self.root[pattern[0]] == NULL:
  *             self.root[pattern[0]] = new_trie_node()
  *         node = self.root[pattern[0]]             # <<<<<<<<<<<<<<
@@ -32028,7 +32028,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
  */
   __pyx_v_node = (__pyx_v_self->root[(__pyx_v_pattern[0])]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":145
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":145
  *             self.root[pattern[0]] = new_trie_node()
  *         node = self.root[pattern[0]]
  *         for i from 1 <= i < pattern_len:             # <<<<<<<<<<<<<<
@@ -32038,7 +32038,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
   __pyx_t_2 = __pyx_v_pattern_len;
   for (__pyx_v_i = 1; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":146
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":146
  *         node = self.root[pattern[0]]
  *         for i from 1 <= i < pattern_len:
  *             node = trie_insert(node, pattern[i])             # <<<<<<<<<<<<<<
@@ -32048,7 +32048,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
     __pyx_v_node = __pyx_f_4cdec_2sa_3_sa_trie_insert(__pyx_v_node, (__pyx_v_pattern[__pyx_v_i]));
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":147
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":147
  *         for i from 1 <= i < pattern_len:
  *             node = trie_insert(node, pattern[i])
  *         return node             # <<<<<<<<<<<<<<
@@ -32058,7 +32058,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
   __pyx_r = __pyx_v_node;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":139
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":139
  * 
  * 
  *     cdef _Trie_Node* _insert(self, int* pattern, int pattern_len):             # <<<<<<<<<<<<<<
@@ -32072,7 +32072,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":149
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":149
  *         return node
  * 
  *     def contains(self, pattern):             # <<<<<<<<<<<<<<
@@ -32110,7 +32110,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_6contains(struct __pyx_obj_4cd
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("contains", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":153
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":153
  *         cdef int i, l
  *         cdef _Trie_Node* node
  *         l = len(pattern)             # <<<<<<<<<<<<<<
@@ -32120,7 +32120,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_6contains(struct __pyx_obj_4cd
   __pyx_t_1 = PyObject_Length(__pyx_v_pattern); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_l = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":154
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":154
  *         cdef _Trie_Node* node
  *         l = len(pattern)
  *         p = <int*> malloc(l*sizeof(int))             # <<<<<<<<<<<<<<
@@ -32129,7 +32129,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_6contains(struct __pyx_obj_4cd
  */
   __pyx_v_p = ((int *)malloc((__pyx_v_l * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":155
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":155
  *         l = len(pattern)
  *         p = <int*> malloc(l*sizeof(int))
  *         for i from 0 <= i < l:             # <<<<<<<<<<<<<<
@@ -32139,7 +32139,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_6contains(struct __pyx_obj_4cd
   __pyx_t_2 = __pyx_v_l;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":156
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":156
  *         p = <int*> malloc(l*sizeof(int))
  *         for i from 0 <= i < l:
  *             p[i] = pattern[i]             # <<<<<<<<<<<<<<
@@ -32153,7 +32153,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_6contains(struct __pyx_obj_4cd
     (__pyx_v_p[__pyx_v_i]) = __pyx_t_4;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":157
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":157
  *         for i from 0 <= i < l:
  *             p[i] = pattern[i]
  *         node = self._contains(p,l)             # <<<<<<<<<<<<<<
@@ -32162,7 +32162,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_6contains(struct __pyx_obj_4cd
  */
   __pyx_v_node = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_TrieMap *)__pyx_v_self->__pyx_vtab)->_contains(__pyx_v_self, __pyx_v_p, __pyx_v_l);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":158
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":158
  *             p[i] = pattern[i]
  *         node = self._contains(p,l)
  *         free(p)             # <<<<<<<<<<<<<<
@@ -32171,7 +32171,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_6contains(struct __pyx_obj_4cd
  */
   free(__pyx_v_p);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":159
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":159
  *         node = self._contains(p,l)
  *         free(p)
  *         if node == NULL:             # <<<<<<<<<<<<<<
@@ -32181,7 +32181,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_6contains(struct __pyx_obj_4cd
   __pyx_t_5 = ((__pyx_v_node == NULL) != 0);
   if (__pyx_t_5) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":160
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":160
  *         free(p)
  *         if node == NULL:
  *             return False             # <<<<<<<<<<<<<<
@@ -32195,7 +32195,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_6contains(struct __pyx_obj_4cd
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":162
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":162
  *             return False
  *         else:
  *             return True             # <<<<<<<<<<<<<<
@@ -32208,7 +32208,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_6contains(struct __pyx_obj_4cd
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":149
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":149
  *         return node
  * 
  *     def contains(self, pattern):             # <<<<<<<<<<<<<<
@@ -32227,7 +32227,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_6contains(struct __pyx_obj_4cd
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":164
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":164
  *             return True
  * 
  *     cdef _Trie_Node* _contains(self, int* pattern, int pattern_len):             # <<<<<<<<<<<<<<
@@ -32245,7 +32245,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
   int __pyx_t_3;
   __Pyx_RefNannySetupContext("_contains", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":167
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":167
  *         cdef int i
  *         cdef _Trie_Node* node
  *         node = self.root[pattern[0]]             # <<<<<<<<<<<<<<
@@ -32254,7 +32254,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
  */
   __pyx_v_node = (__pyx_v_self->root[(__pyx_v_pattern[0])]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":168
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":168
  *         cdef _Trie_Node* node
  *         node = self.root[pattern[0]]
  *         i = 1             # <<<<<<<<<<<<<<
@@ -32263,7 +32263,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
  */
   __pyx_v_i = 1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":169
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":169
  *         node = self.root[pattern[0]]
  *         i = 1
  *         while node != NULL and i < pattern_len:             # <<<<<<<<<<<<<<
@@ -32280,7 +32280,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
     }
     if (!__pyx_t_3) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":170
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":170
  *         i = 1
  *         while node != NULL and i < pattern_len:
  *             node = trie_find(node, pattern[i])             # <<<<<<<<<<<<<<
@@ -32289,7 +32289,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
  */
     __pyx_v_node = __pyx_f_4cdec_2sa_3_sa_trie_find(__pyx_v_node, (__pyx_v_pattern[__pyx_v_i]));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":171
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":171
  *         while node != NULL and i < pattern_len:
  *             node = trie_find(node, pattern[i])
  *             i = i+1             # <<<<<<<<<<<<<<
@@ -32299,7 +32299,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
     __pyx_v_i = (__pyx_v_i + 1);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":172
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":172
  *             node = trie_find(node, pattern[i])
  *             i = i+1
  *         return node             # <<<<<<<<<<<<<<
@@ -32309,7 +32309,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
   __pyx_r = __pyx_v_node;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":164
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":164
  *             return True
  * 
  *     cdef _Trie_Node* _contains(self, int* pattern, int pattern_len):             # <<<<<<<<<<<<<<
@@ -32323,7 +32323,7 @@ static struct __pyx_t_4cdec_2sa_3_sa__Trie_Node *__pyx_f_4cdec_2sa_3_sa_7TrieMap
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":174
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":174
  *         return node
  * 
  *     def toMap(self, flag):             # <<<<<<<<<<<<<<
@@ -32359,7 +32359,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_8toMap(struct __pyx_obj_4cdec_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("toMap", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":177
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":177
  *         cdef int i, include_zeros
  * 
  *         if flag:             # <<<<<<<<<<<<<<
@@ -32369,7 +32369,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_8toMap(struct __pyx_obj_4cdec_
   __pyx_t_1 = __Pyx_PyObject_IsTrue(__pyx_v_flag); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":178
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":178
  * 
  *         if flag:
  *             include_zeros=1             # <<<<<<<<<<<<<<
@@ -32381,7 +32381,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_8toMap(struct __pyx_obj_4cdec_
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":180
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":180
  *             include_zeros=1
  *         else:
  *             include_zeros=0             # <<<<<<<<<<<<<<
@@ -32392,7 +32392,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_8toMap(struct __pyx_obj_4cdec_
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":181
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":181
  *         else:
  *             include_zeros=0
  *         result = {}             # <<<<<<<<<<<<<<
@@ -32404,7 +32404,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_8toMap(struct __pyx_obj_4cdec_
   __pyx_v_result = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":182
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":182
  *             include_zeros=0
  *         result = {}
  *         for i from 0 <= i < self.V:             # <<<<<<<<<<<<<<
@@ -32414,7 +32414,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_8toMap(struct __pyx_obj_4cdec_
   __pyx_t_3 = __pyx_v_self->V;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":183
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":183
  *         result = {}
  *         for i from 0 <= i < self.V:
  *             if self.root[i] != NULL:             # <<<<<<<<<<<<<<
@@ -32424,7 +32424,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_8toMap(struct __pyx_obj_4cdec_
     __pyx_t_1 = (((__pyx_v_self->root[__pyx_v_i]) != NULL) != 0);
     if (__pyx_t_1) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":184
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":184
  *         for i from 0 <= i < self.V:
  *             if self.root[i] != NULL:
  *                 trie_node_to_map(self.root[i], result, (i,), include_zeros)             # <<<<<<<<<<<<<<
@@ -32447,7 +32447,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_8toMap(struct __pyx_obj_4cdec_
     __pyx_L6:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":185
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":185
  *             if self.root[i] != NULL:
  *                 trie_node_to_map(self.root[i], result, (i,), include_zeros)
  *         return result             # <<<<<<<<<<<<<<
@@ -32459,7 +32459,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_8toMap(struct __pyx_obj_4cdec_
   __pyx_r = __pyx_v_result;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":174
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":174
  *         return node
  * 
  *     def toMap(self, flag):             # <<<<<<<<<<<<<<
@@ -32480,7 +32480,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7TrieMap_8toMap(struct __pyx_obj_4cdec_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":200
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":200
  *     cdef write_map(self, m, FILE* f)
  * 
  *     def __cinit__(self, fsarray=None, from_stats=None, from_binary=None,             # <<<<<<<<<<<<<<
@@ -32638,7 +32638,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14Precomputation___cinit__(struct __pyx_obj_4
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":204
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":204
  *             max_length=5, max_nonterminals=2,
  *             train_max_initial_size=10, train_min_gap_size=2):
  *         self.precompute_rank = precompute_rank             # <<<<<<<<<<<<<<
@@ -32648,7 +32648,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14Precomputation___cinit__(struct __pyx_obj_4
   __pyx_t_1 = __Pyx_PyInt_As_int(__pyx_v_precompute_rank); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 204; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_self->precompute_rank = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":205
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":205
  *             train_max_initial_size=10, train_min_gap_size=2):
  *         self.precompute_rank = precompute_rank
  *         self.precompute_secondary_rank = precompute_secondary_rank             # <<<<<<<<<<<<<<
@@ -32658,7 +32658,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14Precomputation___cinit__(struct __pyx_obj_4
   __pyx_t_1 = __Pyx_PyInt_As_int(__pyx_v_precompute_secondary_rank); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_self->precompute_secondary_rank = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":206
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":206
  *         self.precompute_rank = precompute_rank
  *         self.precompute_secondary_rank = precompute_secondary_rank
  *         self.max_length = max_length             # <<<<<<<<<<<<<<
@@ -32668,7 +32668,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14Precomputation___cinit__(struct __pyx_obj_4
   __pyx_t_1 = __Pyx_PyInt_As_int(__pyx_v_max_length); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 206; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_self->max_length = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":207
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":207
  *         self.precompute_secondary_rank = precompute_secondary_rank
  *         self.max_length = max_length
  *         self.max_nonterminals = max_nonterminals             # <<<<<<<<<<<<<<
@@ -32678,7 +32678,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14Precomputation___cinit__(struct __pyx_obj_4
   __pyx_t_1 = __Pyx_PyInt_As_int(__pyx_v_max_nonterminals); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 207; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_self->max_nonterminals = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":208
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":208
  *         self.max_length = max_length
  *         self.max_nonterminals = max_nonterminals
  *         self.train_max_initial_size = train_max_initial_size             # <<<<<<<<<<<<<<
@@ -32688,7 +32688,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14Precomputation___cinit__(struct __pyx_obj_4
   __pyx_t_1 = __Pyx_PyInt_As_int(__pyx_v_train_max_initial_size); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 208; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_self->train_max_initial_size = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":209
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":209
  *         self.max_nonterminals = max_nonterminals
  *         self.train_max_initial_size = train_max_initial_size
  *         self.train_min_gap_size = train_min_gap_size             # <<<<<<<<<<<<<<
@@ -32698,7 +32698,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14Precomputation___cinit__(struct __pyx_obj_4
   __pyx_t_1 = __Pyx_PyInt_As_int(__pyx_v_train_min_gap_size); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 209; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_self->train_min_gap_size = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":210
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":210
  *         self.train_max_initial_size = train_max_initial_size
  *         self.train_min_gap_size = train_min_gap_size
  *         if from_binary:             # <<<<<<<<<<<<<<
@@ -32708,7 +32708,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14Precomputation___cinit__(struct __pyx_obj_4
   __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_from_binary); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 210; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":211
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":211
  *         self.train_min_gap_size = train_min_gap_size
  *         if from_binary:
  *             self.read_binary(from_binary)             # <<<<<<<<<<<<<<
@@ -32730,7 +32730,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14Precomputation___cinit__(struct __pyx_obj_4
     goto __pyx_L3;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":212
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":212
  *         if from_binary:
  *             self.read_binary(from_binary)
  *         elif from_stats:             # <<<<<<<<<<<<<<
@@ -32740,7 +32740,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14Precomputation___cinit__(struct __pyx_obj_4
   __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_from_stats); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 212; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":213
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":213
  *             self.read_binary(from_binary)
  *         elif from_stats:
  *             self.precompute(from_stats, fsarray)             # <<<<<<<<<<<<<<
@@ -32766,7 +32766,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14Precomputation___cinit__(struct __pyx_obj_4
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":200
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":200
  *     cdef write_map(self, m, FILE* f)
  * 
  *     def __cinit__(self, fsarray=None, from_stats=None, from_binary=None,             # <<<<<<<<<<<<<<
@@ -32788,7 +32788,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14Precomputation___cinit__(struct __pyx_obj_4
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":216
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":216
  * 
  * 
  *     def read_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -32832,7 +32832,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_2read_binary(struct __
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("read_binary", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":218
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":218
  *     def read_binary(self, char* filename):
  *         cdef FILE* f
  *         f = fopen(filename, "r")             # <<<<<<<<<<<<<<
@@ -32841,7 +32841,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_2read_binary(struct __
  */
   __pyx_v_f = fopen(__pyx_v_filename, __pyx_k_r);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":219
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":219
  *         cdef FILE* f
  *         f = fopen(filename, "r")
  *         fread(&(self.precompute_rank), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -32850,7 +32850,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_2read_binary(struct __
  */
   fread((&__pyx_v_self->precompute_rank), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":220
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":220
  *         f = fopen(filename, "r")
  *         fread(&(self.precompute_rank), sizeof(int), 1, f)
  *         fread(&(self.precompute_secondary_rank), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -32859,7 +32859,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_2read_binary(struct __
  */
   fread((&__pyx_v_self->precompute_secondary_rank), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":221
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":221
  *         fread(&(self.precompute_rank), sizeof(int), 1, f)
  *         fread(&(self.precompute_secondary_rank), sizeof(int), 1, f)
  *         fread(&(self.max_length), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -32868,7 +32868,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_2read_binary(struct __
  */
   fread((&__pyx_v_self->max_length), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":222
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":222
  *         fread(&(self.precompute_secondary_rank), sizeof(int), 1, f)
  *         fread(&(self.max_length), sizeof(int), 1, f)
  *         fread(&(self.max_nonterminals), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -32877,7 +32877,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_2read_binary(struct __
  */
   fread((&__pyx_v_self->max_nonterminals), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":223
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":223
  *         fread(&(self.max_length), sizeof(int), 1, f)
  *         fread(&(self.max_nonterminals), sizeof(int), 1, f)
  *         fread(&(self.train_max_initial_size), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -32886,7 +32886,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_2read_binary(struct __
  */
   fread((&__pyx_v_self->train_max_initial_size), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":224
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":224
  *         fread(&(self.max_nonterminals), sizeof(int), 1, f)
  *         fread(&(self.train_max_initial_size), sizeof(int), 1, f)
  *         fread(&(self.train_min_gap_size), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -32895,7 +32895,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_2read_binary(struct __
  */
   fread((&__pyx_v_self->train_min_gap_size), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":225
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":225
  *         fread(&(self.train_max_initial_size), sizeof(int), 1, f)
  *         fread(&(self.train_min_gap_size), sizeof(int), 1, f)
  *         self.precomputed_index = self.read_map(f)             # <<<<<<<<<<<<<<
@@ -32910,7 +32910,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_2read_binary(struct __
   __pyx_v_self->precomputed_index = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":226
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":226
  *         fread(&(self.train_min_gap_size), sizeof(int), 1, f)
  *         self.precomputed_index = self.read_map(f)
  *         self.precomputed_collocations = self.read_map(f)             # <<<<<<<<<<<<<<
@@ -32925,7 +32925,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_2read_binary(struct __
   __pyx_v_self->precomputed_collocations = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":227
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":227
  *         self.precomputed_index = self.read_map(f)
  *         self.precomputed_collocations = self.read_map(f)
  *         fclose(f)             # <<<<<<<<<<<<<<
@@ -32934,7 +32934,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_2read_binary(struct __
  */
   fclose(__pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":216
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":216
  * 
  * 
  *     def read_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -32955,7 +32955,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_2read_binary(struct __
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":230
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":230
  * 
  * 
  *     def write_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -33000,7 +33000,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_4write_binary(struct _
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("write_binary", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":232
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":232
  *     def write_binary(self, char* filename):
  *         cdef FILE* f
  *         f = fopen(filename, "w")             # <<<<<<<<<<<<<<
@@ -33009,7 +33009,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_4write_binary(struct _
  */
   __pyx_v_f = fopen(__pyx_v_filename, __pyx_k_w);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":233
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":233
  *         cdef FILE* f
  *         f = fopen(filename, "w")
  *         fwrite(&(self.precompute_rank), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -33018,7 +33018,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_4write_binary(struct _
  */
   fwrite((&__pyx_v_self->precompute_rank), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":234
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":234
  *         f = fopen(filename, "w")
  *         fwrite(&(self.precompute_rank), sizeof(int), 1, f)
  *         fwrite(&(self.precompute_secondary_rank), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -33027,7 +33027,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_4write_binary(struct _
  */
   fwrite((&__pyx_v_self->precompute_secondary_rank), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":235
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":235
  *         fwrite(&(self.precompute_rank), sizeof(int), 1, f)
  *         fwrite(&(self.precompute_secondary_rank), sizeof(int), 1, f)
  *         fwrite(&(self.max_length), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -33036,7 +33036,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_4write_binary(struct _
  */
   fwrite((&__pyx_v_self->max_length), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":236
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":236
  *         fwrite(&(self.precompute_secondary_rank), sizeof(int), 1, f)
  *         fwrite(&(self.max_length), sizeof(int), 1, f)
  *         fwrite(&(self.max_nonterminals), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -33045,7 +33045,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_4write_binary(struct _
  */
   fwrite((&__pyx_v_self->max_nonterminals), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":237
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":237
  *         fwrite(&(self.max_length), sizeof(int), 1, f)
  *         fwrite(&(self.max_nonterminals), sizeof(int), 1, f)
  *         fwrite(&(self.train_max_initial_size), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -33054,7 +33054,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_4write_binary(struct _
  */
   fwrite((&__pyx_v_self->train_max_initial_size), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":238
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":238
  *         fwrite(&(self.max_nonterminals), sizeof(int), 1, f)
  *         fwrite(&(self.train_max_initial_size), sizeof(int), 1, f)
  *         fwrite(&(self.train_min_gap_size), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -33063,7 +33063,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_4write_binary(struct _
  */
   fwrite((&__pyx_v_self->train_min_gap_size), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":239
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":239
  *         fwrite(&(self.train_max_initial_size), sizeof(int), 1, f)
  *         fwrite(&(self.train_min_gap_size), sizeof(int), 1, f)
  *         self.write_map(self.precomputed_index, f)             # <<<<<<<<<<<<<<
@@ -33077,7 +33077,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_4write_binary(struct _
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":240
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":240
  *         fwrite(&(self.train_min_gap_size), sizeof(int), 1, f)
  *         self.write_map(self.precomputed_index, f)
  *         self.write_map(self.precomputed_collocations, f)             # <<<<<<<<<<<<<<
@@ -33091,7 +33091,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_4write_binary(struct _
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":241
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":241
  *         self.write_map(self.precomputed_index, f)
  *         self.write_map(self.precomputed_collocations, f)
  *         fclose(f)             # <<<<<<<<<<<<<<
@@ -33100,7 +33100,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_4write_binary(struct _
  */
   fclose(__pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":230
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":230
  * 
  * 
  *     def write_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -33122,7 +33122,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_4write_binary(struct _
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":244
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":244
  * 
  * 
  *     cdef write_map(self, m, FILE* f):             # <<<<<<<<<<<<<<
@@ -33153,7 +33153,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_write_map(CYTHON_UNUSED
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("write_map", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":248
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":248
  *         cdef IntList arr
  * 
  *         N = len(m)             # <<<<<<<<<<<<<<
@@ -33163,7 +33163,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_write_map(CYTHON_UNUSED
   __pyx_t_1 = PyObject_Length(__pyx_v_m); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 248; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_N = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":249
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":249
  * 
  *         N = len(m)
  *         fwrite(&(N), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -33172,7 +33172,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_write_map(CYTHON_UNUSED
  */
   fwrite((&__pyx_v_N), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":250
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":250
  *         N = len(m)
  *         fwrite(&(N), sizeof(int), 1, f)
  *         for pattern, val in m.iteritems():             # <<<<<<<<<<<<<<
@@ -33200,7 +33200,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_write_map(CYTHON_UNUSED
     __Pyx_XDECREF_SET(__pyx_v_val, __pyx_t_6);
     __pyx_t_6 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":251
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":251
  *         fwrite(&(N), sizeof(int), 1, f)
  *         for pattern, val in m.iteritems():
  *             N = len(pattern)             # <<<<<<<<<<<<<<
@@ -33210,7 +33210,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_write_map(CYTHON_UNUSED
     __pyx_t_8 = PyObject_Length(__pyx_v_pattern); if (unlikely(__pyx_t_8 == -1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __pyx_v_N = __pyx_t_8;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":252
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":252
  *         for pattern, val in m.iteritems():
  *             N = len(pattern)
  *             fwrite(&(N), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -33219,7 +33219,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_write_map(CYTHON_UNUSED
  */
     fwrite((&__pyx_v_N), (sizeof(int)), 1, __pyx_v_f);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":253
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":253
  *             N = len(pattern)
  *             fwrite(&(N), sizeof(int), 1, f)
  *             for word_id in pattern:             # <<<<<<<<<<<<<<
@@ -33264,7 +33264,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_write_map(CYTHON_UNUSED
       __Pyx_XDECREF_SET(__pyx_v_word_id, __pyx_t_5);
       __pyx_t_5 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":254
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":254
  *             fwrite(&(N), sizeof(int), 1, f)
  *             for word_id in pattern:
  *                 i = word_id             # <<<<<<<<<<<<<<
@@ -33274,7 +33274,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_write_map(CYTHON_UNUSED
       __pyx_t_7 = __Pyx_PyInt_As_int(__pyx_v_word_id); if (unlikely((__pyx_t_7 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __pyx_v_i = __pyx_t_7;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":255
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":255
  *             for word_id in pattern:
  *                 i = word_id
  *                 fwrite(&(i), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -33285,7 +33285,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_write_map(CYTHON_UNUSED
     }
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":256
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":256
  *                 i = word_id
  *                 fwrite(&(i), sizeof(int), 1, f)
  *             arr = val             # <<<<<<<<<<<<<<
@@ -33298,7 +33298,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_write_map(CYTHON_UNUSED
     __Pyx_XDECREF_SET(__pyx_v_arr, ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_6));
     __pyx_t_6 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":257
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":257
  *                 fwrite(&(i), sizeof(int), 1, f)
  *             arr = val
  *             arr.write_handle(f)             # <<<<<<<<<<<<<<
@@ -33309,7 +33309,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_write_map(CYTHON_UNUSED
   }
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":244
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":244
  * 
  * 
  *     cdef write_map(self, m, FILE* f):             # <<<<<<<<<<<<<<
@@ -33336,7 +33336,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_write_map(CYTHON_UNUSED
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":260
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":260
  * 
  * 
  *     cdef read_map(self, FILE* f):             # <<<<<<<<<<<<<<
@@ -33364,7 +33364,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_read_map(CYTHON_UNUSED
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("read_map", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":264
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":264
  *         cdef IntList arr
  * 
  *         m = {}             # <<<<<<<<<<<<<<
@@ -33376,7 +33376,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_read_map(CYTHON_UNUSED
   __pyx_v_m = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":265
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":265
  * 
  *         m = {}
  *         fread(&(N), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -33385,7 +33385,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_read_map(CYTHON_UNUSED
  */
   fread((&__pyx_v_N), (sizeof(int)), 1, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":266
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":266
  *         m = {}
  *         fread(&(N), sizeof(int), 1, f)
  *         for j from 0 <= j < N:             # <<<<<<<<<<<<<<
@@ -33395,7 +33395,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_read_map(CYTHON_UNUSED
   __pyx_t_2 = __pyx_v_N;
   for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_2; __pyx_v_j++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":267
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":267
  *         fread(&(N), sizeof(int), 1, f)
  *         for j from 0 <= j < N:
  *             fread(&(i), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -33404,7 +33404,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_read_map(CYTHON_UNUSED
  */
     fread((&__pyx_v_i), (sizeof(int)), 1, __pyx_v_f);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":268
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":268
  *         for j from 0 <= j < N:
  *             fread(&(i), sizeof(int), 1, f)
  *             key = ()             # <<<<<<<<<<<<<<
@@ -33414,7 +33414,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_read_map(CYTHON_UNUSED
     __Pyx_INCREF(__pyx_empty_tuple);
     __Pyx_XDECREF_SET(__pyx_v_key, __pyx_empty_tuple);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":269
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":269
  *             fread(&(i), sizeof(int), 1, f)
  *             key = ()
  *             for k from 0 <= k < i:             # <<<<<<<<<<<<<<
@@ -33424,7 +33424,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_read_map(CYTHON_UNUSED
     __pyx_t_3 = __pyx_v_i;
     for (__pyx_v_k = 0; __pyx_v_k < __pyx_t_3; __pyx_v_k++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":270
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":270
  *             key = ()
  *             for k from 0 <= k < i:
  *                 fread(&(word_id), sizeof(int), 1, f)             # <<<<<<<<<<<<<<
@@ -33433,7 +33433,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_read_map(CYTHON_UNUSED
  */
       fread((&__pyx_v_word_id), (sizeof(int)), 1, __pyx_v_f);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":271
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":271
  *             for k from 0 <= k < i:
  *                 fread(&(word_id), sizeof(int), 1, f)
  *                 key = key + (word_id,)             # <<<<<<<<<<<<<<
@@ -33454,7 +33454,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_read_map(CYTHON_UNUSED
       __pyx_t_1 = 0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":272
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":272
  *                 fread(&(word_id), sizeof(int), 1, f)
  *                 key = key + (word_id,)
  *             arr = IntList()             # <<<<<<<<<<<<<<
@@ -33466,7 +33466,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_read_map(CYTHON_UNUSED
     __Pyx_XDECREF_SET(__pyx_v_arr, ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1));
     __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":273
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":273
  *                 key = key + (word_id,)
  *             arr = IntList()
  *             arr.read_handle(f)             # <<<<<<<<<<<<<<
@@ -33475,7 +33475,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_read_map(CYTHON_UNUSED
  */
     ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_arr->__pyx_vtab)->read_handle(__pyx_v_arr, __pyx_v_f);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":274
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":274
  *             arr = IntList()
  *             arr.read_handle(f)
  *             m[key] = arr             # <<<<<<<<<<<<<<
@@ -33485,7 +33485,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_read_map(CYTHON_UNUSED
     if (unlikely(PyDict_SetItem(__pyx_v_m, __pyx_v_key, ((PyObject *)__pyx_v_arr)) < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 274; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":275
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":275
  *             arr.read_handle(f)
  *             m[key] = arr
  *         return m             # <<<<<<<<<<<<<<
@@ -33497,7 +33497,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_read_map(CYTHON_UNUSED
   __pyx_r = __pyx_v_m;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":260
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":260
  * 
  * 
  *     cdef read_map(self, FILE* f):             # <<<<<<<<<<<<<<
@@ -33520,7 +33520,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_14Precomputation_read_map(CYTHON_UNUSED
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":278
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":278
  * 
  * 
  *     def precompute(self, stats, SuffixArray sarray):             # <<<<<<<<<<<<<<
@@ -33672,7 +33672,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("precompute", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":280
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":280
  *     def precompute(self, stats, SuffixArray sarray):
  *         cdef int i, l, N, max_pattern_len, i1, l1, i2, l2, i3, l3, ptr1, ptr2, ptr3, is_super, sent_count, max_rank
  *         cdef DataArray darray = sarray.darray             # <<<<<<<<<<<<<<
@@ -33684,7 +33684,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_darray = ((struct __pyx_obj_4cdec_2sa_3_sa_DataArray *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":285
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":285
  *         cdef _Trie_Node* node
  * 
  *         data = darray.data             # <<<<<<<<<<<<<<
@@ -33696,7 +33696,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_data = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":287
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":287
  *         data = darray.data
  * 
  *         frequent_patterns = TrieMap(len(darray.id2word))             # <<<<<<<<<<<<<<
@@ -33720,7 +33720,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_frequent_patterns = ((struct __pyx_obj_4cdec_2sa_3_sa_TrieMap *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":288
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":288
  * 
  *         frequent_patterns = TrieMap(len(darray.id2word))
  *         super_frequent_patterns = TrieMap(len(darray.id2word))             # <<<<<<<<<<<<<<
@@ -33744,7 +33744,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_super_frequent_patterns = ((struct __pyx_obj_4cdec_2sa_3_sa_TrieMap *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":289
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":289
  *         frequent_patterns = TrieMap(len(darray.id2word))
  *         super_frequent_patterns = TrieMap(len(darray.id2word))
  *         collocations = TrieMap(len(darray.id2word))             # <<<<<<<<<<<<<<
@@ -33768,7 +33768,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_collocations = ((struct __pyx_obj_4cdec_2sa_3_sa_TrieMap *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":291
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":291
  *         collocations = TrieMap(len(darray.id2word))
  * 
  *         I_set = set()             # <<<<<<<<<<<<<<
@@ -33780,7 +33780,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_I_set = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":292
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":292
  * 
  *         I_set = set()
  *         J_set = set()             # <<<<<<<<<<<<<<
@@ -33792,7 +33792,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_J_set = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":293
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":293
  *         I_set = set()
  *         J_set = set()
  *         J2_set = set()             # <<<<<<<<<<<<<<
@@ -33804,7 +33804,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_J2_set = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":294
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":294
  *         J_set = set()
  *         J2_set = set()
  *         IJ_set = set()             # <<<<<<<<<<<<<<
@@ -33816,7 +33816,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_IJ_set = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":295
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":295
  *         J2_set = set()
  *         IJ_set = set()
  *         pattern_rank = {}             # <<<<<<<<<<<<<<
@@ -33828,7 +33828,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_pattern_rank = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":297
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":297
  *         pattern_rank = {}
  * 
  *         logger.info("Precomputing frequent intersections")             # <<<<<<<<<<<<<<
@@ -33845,7 +33845,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":298
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":298
  * 
  *         logger.info("Precomputing frequent intersections")
  *         cdef float start_time = monitor_cpu()             # <<<<<<<<<<<<<<
@@ -33861,7 +33861,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_v_start_time = __pyx_t_4;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":300
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":300
  *         cdef float start_time = monitor_cpu()
  * 
  *         max_pattern_len = 0             # <<<<<<<<<<<<<<
@@ -33870,7 +33870,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
   __pyx_v_max_pattern_len = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":301
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":301
  * 
  *         max_pattern_len = 0
  *         for rank, (_, _, phrase) in enumerate(stats):             # <<<<<<<<<<<<<<
@@ -33985,7 +33985,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __pyx_t_3 = __pyx_t_6;
     __pyx_t_6 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":302
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":302
  *         max_pattern_len = 0
  *         for rank, (_, _, phrase) in enumerate(stats):
  *             if rank >= self.precompute_rank:             # <<<<<<<<<<<<<<
@@ -34000,7 +34000,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
     if (__pyx_t_12) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":303
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":303
  *         for rank, (_, _, phrase) in enumerate(stats):
  *             if rank >= self.precompute_rank:
  *                 break             # <<<<<<<<<<<<<<
@@ -34010,7 +34010,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       goto __pyx_L4_break;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":304
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":304
  *             if rank >= self.precompute_rank:
  *                 break
  *             max_pattern_len = max(max_pattern_len, len(phrase))             # <<<<<<<<<<<<<<
@@ -34026,7 +34026,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     }
     __pyx_v_max_pattern_len = __pyx_t_15;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":305
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":305
  *                 break
  *             max_pattern_len = max(max_pattern_len, len(phrase))
  *             frequent_patterns.insert(phrase)             # <<<<<<<<<<<<<<
@@ -34046,7 +34046,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":306
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":306
  *             max_pattern_len = max(max_pattern_len, len(phrase))
  *             frequent_patterns.insert(phrase)
  *             I_set.add(phrase)             # <<<<<<<<<<<<<<
@@ -34055,7 +34055,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
     __pyx_t_16 = PySet_Add(__pyx_v_I_set, __pyx_v_phrase); if (unlikely(__pyx_t_16 == -1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 306; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":307
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":307
  *             frequent_patterns.insert(phrase)
  *             I_set.add(phrase)
  *             pattern_rank[phrase] = rank             # <<<<<<<<<<<<<<
@@ -34064,7 +34064,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
     if (unlikely(PyDict_SetItem(__pyx_v_pattern_rank, __pyx_v_phrase, __pyx_v_rank) < 0)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 307; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":308
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":308
  *             I_set.add(phrase)
  *             pattern_rank[phrase] = rank
  *             if rank < self.precompute_secondary_rank:             # <<<<<<<<<<<<<<
@@ -34079,7 +34079,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     if (__pyx_t_12) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":309
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":309
  *             pattern_rank[phrase] = rank
  *             if rank < self.precompute_secondary_rank:
  *                 super_frequent_patterns.insert(phrase)             # <<<<<<<<<<<<<<
@@ -34099,7 +34099,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
       __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":310
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":310
  *             if rank < self.precompute_secondary_rank:
  *                 super_frequent_patterns.insert(phrase)
  *                 J_set.add(phrase)             # <<<<<<<<<<<<<<
@@ -34115,7 +34115,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":312
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":312
  *                 J_set.add(phrase)
  * 
  *         queue = IntList(increment=1000)             # <<<<<<<<<<<<<<
@@ -34131,7 +34131,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_queue = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":314
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":314
  *         queue = IntList(increment=1000)
  * 
  *         logger.info("    Computing inverted indexes...")             # <<<<<<<<<<<<<<
@@ -34148,7 +34148,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":315
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":315
  * 
  *         logger.info("    Computing inverted indexes...")
  *         N = len(data)             # <<<<<<<<<<<<<<
@@ -34158,7 +34158,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_t_2 = PyObject_Length(((PyObject *)__pyx_v_data)); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 315; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_N = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":316
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":316
  *         logger.info("    Computing inverted indexes...")
  *         N = len(data)
  *         for i from 0 <= i < N:             # <<<<<<<<<<<<<<
@@ -34168,7 +34168,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_t_14 = __pyx_v_N;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_14; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":317
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":317
  *         N = len(data)
  *         for i from 0 <= i < N:
  *             sa_word_id = data.arr[i]             # <<<<<<<<<<<<<<
@@ -34177,7 +34177,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
     __pyx_v_sa_word_id = (__pyx_v_data->arr[__pyx_v_i]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":318
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":318
  *         for i from 0 <= i < N:
  *             sa_word_id = data.arr[i]
  *             if sa_word_id == 1:             # <<<<<<<<<<<<<<
@@ -34187,7 +34187,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __pyx_t_12 = ((__pyx_v_sa_word_id == 1) != 0);
     if (__pyx_t_12) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":319
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":319
  *             sa_word_id = data.arr[i]
  *             if sa_word_id == 1:
  *                 queue._append(-1)             # <<<<<<<<<<<<<<
@@ -34199,7 +34199,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":321
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":321
  *                 queue._append(-1)
  *             else:
  *                 for l from 1 <= l <= max_pattern_len:             # <<<<<<<<<<<<<<
@@ -34209,7 +34209,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __pyx_t_17 = __pyx_v_max_pattern_len;
       for (__pyx_v_l = 1; __pyx_v_l <= __pyx_t_17; __pyx_v_l++) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":322
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":322
  *             else:
  *                 for l from 1 <= l <= max_pattern_len:
  *                     node = frequent_patterns._contains(data.arr+i, l)             # <<<<<<<<<<<<<<
@@ -34218,7 +34218,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
         __pyx_v_node = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_TrieMap *)__pyx_v_frequent_patterns->__pyx_vtab)->_contains(__pyx_v_frequent_patterns, (__pyx_v_data->arr + __pyx_v_i), __pyx_v_l);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":323
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":323
  *                 for l from 1 <= l <= max_pattern_len:
  *                     node = frequent_patterns._contains(data.arr+i, l)
  *                     if node == NULL:             # <<<<<<<<<<<<<<
@@ -34228,7 +34228,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         __pyx_t_12 = ((__pyx_v_node == NULL) != 0);
         if (__pyx_t_12) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":324
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":324
  *                     node = frequent_patterns._contains(data.arr+i, l)
  *                     if node == NULL:
  *                         break             # <<<<<<<<<<<<<<
@@ -34238,7 +34238,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
           goto __pyx_L13_break;
         }
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":325
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":325
  *                     if node == NULL:
  *                         break
  *                     queue._append(i)             # <<<<<<<<<<<<<<
@@ -34247,7 +34247,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
         ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_queue->__pyx_vtab)->_append(__pyx_v_queue, __pyx_v_i);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":326
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":326
  *                         break
  *                     queue._append(i)
  *                     queue._append(l)             # <<<<<<<<<<<<<<
@@ -34256,7 +34256,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
         ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_queue->__pyx_vtab)->_append(__pyx_v_queue, __pyx_v_l);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":327
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":327
  *                     queue._append(i)
  *                     queue._append(l)
  *                     trie_node_data_append(node, i)             # <<<<<<<<<<<<<<
@@ -34272,7 +34272,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __pyx_L11:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":329
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":329
  *                     trie_node_data_append(node, i)
  * 
  *         logger.info("    Computing collocations...")             # <<<<<<<<<<<<<<
@@ -34289,7 +34289,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":330
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":330
  * 
  *         logger.info("    Computing collocations...")
  *         N = len(queue)             # <<<<<<<<<<<<<<
@@ -34299,7 +34299,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_t_2 = PyObject_Length(((PyObject *)__pyx_v_queue)); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_N = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":331
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":331
  *         logger.info("    Computing collocations...")
  *         N = len(queue)
  *         ptr1 = 0             # <<<<<<<<<<<<<<
@@ -34308,7 +34308,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
   __pyx_v_ptr1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":332
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":332
  *         N = len(queue)
  *         ptr1 = 0
  *         sent_count = 0             # <<<<<<<<<<<<<<
@@ -34317,7 +34317,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
   __pyx_v_sent_count = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":333
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":333
  *         ptr1 = 0
  *         sent_count = 0
  *         while ptr1 < N:    # main loop             # <<<<<<<<<<<<<<
@@ -34328,7 +34328,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __pyx_t_12 = ((__pyx_v_ptr1 < __pyx_v_N) != 0);
     if (!__pyx_t_12) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":334
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":334
  *         sent_count = 0
  *         while ptr1 < N:    # main loop
  *             i1 = queue.arr[ptr1]             # <<<<<<<<<<<<<<
@@ -34337,7 +34337,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
     __pyx_v_i1 = (__pyx_v_queue->arr[__pyx_v_ptr1]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":335
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":335
  *         while ptr1 < N:    # main loop
  *             i1 = queue.arr[ptr1]
  *             if i1 > -1:             # <<<<<<<<<<<<<<
@@ -34347,7 +34347,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __pyx_t_12 = ((__pyx_v_i1 > -1) != 0);
     if (__pyx_t_12) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":336
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":336
  *             i1 = queue.arr[ptr1]
  *             if i1 > -1:
  *                 l1 = queue.arr[ptr1+1]             # <<<<<<<<<<<<<<
@@ -34356,7 +34356,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
       __pyx_v_l1 = (__pyx_v_queue->arr[(__pyx_v_ptr1 + 1)]);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":337
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":337
  *             if i1 > -1:
  *                 l1 = queue.arr[ptr1+1]
  *                 ptr2 = ptr1 + 2             # <<<<<<<<<<<<<<
@@ -34365,7 +34365,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
       __pyx_v_ptr2 = (__pyx_v_ptr1 + 2);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":338
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":338
  *                 l1 = queue.arr[ptr1+1]
  *                 ptr2 = ptr1 + 2
  *                 while ptr2 < N:             # <<<<<<<<<<<<<<
@@ -34376,7 +34376,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         __pyx_t_12 = ((__pyx_v_ptr2 < __pyx_v_N) != 0);
         if (!__pyx_t_12) break;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":339
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":339
  *                 ptr2 = ptr1 + 2
  *                 while ptr2 < N:
  *                     i2 = queue.arr[ptr2]             # <<<<<<<<<<<<<<
@@ -34385,7 +34385,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
         __pyx_v_i2 = (__pyx_v_queue->arr[__pyx_v_ptr2]);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":340
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":340
  *                 while ptr2 < N:
  *                     i2 = queue.arr[ptr2]
  *                     if i2 == -1 or i2 - i1 >= self.train_max_initial_size:             # <<<<<<<<<<<<<<
@@ -34401,7 +34401,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         }
         if (__pyx_t_19) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":341
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":341
  *                     i2 = queue.arr[ptr2]
  *                     if i2 == -1 or i2 - i1 >= self.train_max_initial_size:
  *                         break             # <<<<<<<<<<<<<<
@@ -34411,7 +34411,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
           goto __pyx_L19_break;
         }
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":342
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":342
  *                     if i2 == -1 or i2 - i1 >= self.train_max_initial_size:
  *                         break
  *                     l2 = queue.arr[ptr2+1]             # <<<<<<<<<<<<<<
@@ -34420,7 +34420,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
         __pyx_v_l2 = (__pyx_v_queue->arr[(__pyx_v_ptr2 + 1)]);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":343
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":343
  *                         break
  *                     l2 = queue.arr[ptr2+1]
  *                     if (i2 - i1 - l1 >= self.train_min_gap_size and             # <<<<<<<<<<<<<<
@@ -34430,7 +34430,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         __pyx_t_19 = ((((__pyx_v_i2 - __pyx_v_i1) - __pyx_v_l1) >= __pyx_v_self->train_min_gap_size) != 0);
         if (__pyx_t_19) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":344
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":344
  *                     l2 = queue.arr[ptr2+1]
  *                     if (i2 - i1 - l1 >= self.train_min_gap_size and
  *                             i2 + l2 - i1 <= self.train_max_initial_size and             # <<<<<<<<<<<<<<
@@ -34440,7 +34440,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
           __pyx_t_12 = ((((__pyx_v_i2 + __pyx_v_l2) - __pyx_v_i1) <= __pyx_v_self->train_max_initial_size) != 0);
           if (__pyx_t_12) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":345
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":345
  *                     if (i2 - i1 - l1 >= self.train_min_gap_size and
  *                             i2 + l2 - i1 <= self.train_max_initial_size and
  *                             l1+l2+1 <= self.max_length):             # <<<<<<<<<<<<<<
@@ -34458,7 +34458,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         }
         if (__pyx_t_12) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":346
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":346
  *                             i2 + l2 - i1 <= self.train_max_initial_size and
  *                             l1+l2+1 <= self.max_length):
  *                         node = collocations._insert(data.arr+i1, l1)             # <<<<<<<<<<<<<<
@@ -34467,7 +34467,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
           __pyx_v_node = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_TrieMap *)__pyx_v_collocations->__pyx_vtab)->_insert(__pyx_v_collocations, (__pyx_v_data->arr + __pyx_v_i1), __pyx_v_l1);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":347
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":347
  *                             l1+l2+1 <= self.max_length):
  *                         node = collocations._insert(data.arr+i1, l1)
  *                         node = trie_insert(node, -1)             # <<<<<<<<<<<<<<
@@ -34476,7 +34476,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
           __pyx_v_node = __pyx_f_4cdec_2sa_3_sa_trie_insert(__pyx_v_node, -1);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":348
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":348
  *                         node = collocations._insert(data.arr+i1, l1)
  *                         node = trie_insert(node, -1)
  *                         for i from i2 <= i < i2+l2:             # <<<<<<<<<<<<<<
@@ -34486,7 +34486,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
           __pyx_t_14 = (__pyx_v_i2 + __pyx_v_l2);
           for (__pyx_v_i = __pyx_v_i2; __pyx_v_i < __pyx_t_14; __pyx_v_i++) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":349
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":349
  *                         node = trie_insert(node, -1)
  *                         for i from i2 <= i < i2+l2:
  *                             node = trie_insert(node, data.arr[i])             # <<<<<<<<<<<<<<
@@ -34496,7 +34496,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
             __pyx_v_node = __pyx_f_4cdec_2sa_3_sa_trie_insert(__pyx_v_node, (__pyx_v_data->arr[__pyx_v_i]));
           }
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":350
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":350
  *                         for i from i2 <= i < i2+l2:
  *                             node = trie_insert(node, data.arr[i])
  *                         trie_node_data_append(node, i1)             # <<<<<<<<<<<<<<
@@ -34507,7 +34507,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
           __Pyx_GOTREF(__pyx_t_1);
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":351
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":351
  *                             node = trie_insert(node, data.arr[i])
  *                         trie_node_data_append(node, i1)
  *                         trie_node_data_append(node, i2)             # <<<<<<<<<<<<<<
@@ -34518,7 +34518,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
           __Pyx_GOTREF(__pyx_t_1);
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":352
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":352
  *                         trie_node_data_append(node, i1)
  *                         trie_node_data_append(node, i2)
  *                         if super_frequent_patterns._contains(data.arr+i2, l2) != NULL:             # <<<<<<<<<<<<<<
@@ -34528,7 +34528,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
           __pyx_t_12 = ((((struct __pyx_vtabstruct_4cdec_2sa_3_sa_TrieMap *)__pyx_v_super_frequent_patterns->__pyx_vtab)->_contains(__pyx_v_super_frequent_patterns, (__pyx_v_data->arr + __pyx_v_i2), __pyx_v_l2) != NULL) != 0);
           if (__pyx_t_12) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":353
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":353
  *                         trie_node_data_append(node, i2)
  *                         if super_frequent_patterns._contains(data.arr+i2, l2) != NULL:
  *                             if super_frequent_patterns._contains(data.arr+i1, l1) != NULL:             # <<<<<<<<<<<<<<
@@ -34538,7 +34538,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
             __pyx_t_12 = ((((struct __pyx_vtabstruct_4cdec_2sa_3_sa_TrieMap *)__pyx_v_super_frequent_patterns->__pyx_vtab)->_contains(__pyx_v_super_frequent_patterns, (__pyx_v_data->arr + __pyx_v_i1), __pyx_v_l1) != NULL) != 0);
             if (__pyx_t_12) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":354
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":354
  *                         if super_frequent_patterns._contains(data.arr+i2, l2) != NULL:
  *                             if super_frequent_patterns._contains(data.arr+i1, l1) != NULL:
  *                                 is_super = 1             # <<<<<<<<<<<<<<
@@ -34550,7 +34550,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
             }
             /*else*/ {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":356
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":356
  *                                 is_super = 1
  *                             else:
  *                                 is_super = 0             # <<<<<<<<<<<<<<
@@ -34561,7 +34561,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
             }
             __pyx_L25:;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":357
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":357
  *                             else:
  *                                 is_super = 0
  *                             ptr3 = ptr2 + 2             # <<<<<<<<<<<<<<
@@ -34570,7 +34570,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
             __pyx_v_ptr3 = (__pyx_v_ptr2 + 2);
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":358
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":358
  *                                 is_super = 0
  *                             ptr3 = ptr2 + 2
  *                             while ptr3 < N:             # <<<<<<<<<<<<<<
@@ -34581,7 +34581,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
               __pyx_t_12 = ((__pyx_v_ptr3 < __pyx_v_N) != 0);
               if (!__pyx_t_12) break;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":359
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":359
  *                             ptr3 = ptr2 + 2
  *                             while ptr3 < N:
  *                                 i3 = queue.arr[ptr3]             # <<<<<<<<<<<<<<
@@ -34590,7 +34590,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
               __pyx_v_i3 = (__pyx_v_queue->arr[__pyx_v_ptr3]);
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":360
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":360
  *                             while ptr3 < N:
  *                                 i3 = queue.arr[ptr3]
  *                                 if i3 == -1 or i3 - i1 >= self.train_max_initial_size:             # <<<<<<<<<<<<<<
@@ -34606,7 +34606,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
               }
               if (__pyx_t_20) {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":361
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":361
  *                                 i3 = queue.arr[ptr3]
  *                                 if i3 == -1 or i3 - i1 >= self.train_max_initial_size:
  *                                     break             # <<<<<<<<<<<<<<
@@ -34616,7 +34616,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
                 goto __pyx_L27_break;
               }
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":362
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":362
  *                                 if i3 == -1 or i3 - i1 >= self.train_max_initial_size:
  *                                     break
  *                                 l3 = queue.arr[ptr3+1]             # <<<<<<<<<<<<<<
@@ -34625,7 +34625,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
               __pyx_v_l3 = (__pyx_v_queue->arr[(__pyx_v_ptr3 + 1)]);
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":363
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":363
  *                                     break
  *                                 l3 = queue.arr[ptr3+1]
  *                                 if (i3 - i2 - l2 >= self.train_min_gap_size and             # <<<<<<<<<<<<<<
@@ -34635,7 +34635,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
               __pyx_t_20 = ((((__pyx_v_i3 - __pyx_v_i2) - __pyx_v_l2) >= __pyx_v_self->train_min_gap_size) != 0);
               if (__pyx_t_20) {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":364
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":364
  *                                 l3 = queue.arr[ptr3+1]
  *                                 if (i3 - i2 - l2 >= self.train_min_gap_size and
  *                                         i3 + l3 - i1 <= self.train_max_initial_size and             # <<<<<<<<<<<<<<
@@ -34645,7 +34645,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
                 __pyx_t_12 = ((((__pyx_v_i3 + __pyx_v_l3) - __pyx_v_i1) <= __pyx_v_self->train_max_initial_size) != 0);
                 if (__pyx_t_12) {
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":365
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":365
  *                                 if (i3 - i2 - l2 >= self.train_min_gap_size and
  *                                         i3 + l3 - i1 <= self.train_max_initial_size and
  *                                         l1+l2+l3+2 <= self.max_length):             # <<<<<<<<<<<<<<
@@ -34663,7 +34663,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
               }
               if (__pyx_t_12) {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":366
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":366
  *                                         i3 + l3 - i1 <= self.train_max_initial_size and
  *                                         l1+l2+l3+2 <= self.max_length):
  *                                     if is_super or super_frequent_patterns._contains(data.arr+i3, l3) != NULL:             # <<<<<<<<<<<<<<
@@ -34678,7 +34678,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
                 }
                 if (__pyx_t_20) {
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":367
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":367
  *                                         l1+l2+l3+2 <= self.max_length):
  *                                     if is_super or super_frequent_patterns._contains(data.arr+i3, l3) != NULL:
  *                                         node = collocations._insert(data.arr+i1, l1)             # <<<<<<<<<<<<<<
@@ -34687,7 +34687,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
                   __pyx_v_node = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_TrieMap *)__pyx_v_collocations->__pyx_vtab)->_insert(__pyx_v_collocations, (__pyx_v_data->arr + __pyx_v_i1), __pyx_v_l1);
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":368
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":368
  *                                     if is_super or super_frequent_patterns._contains(data.arr+i3, l3) != NULL:
  *                                         node = collocations._insert(data.arr+i1, l1)
  *                                         node = trie_insert(node, -1)             # <<<<<<<<<<<<<<
@@ -34696,7 +34696,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
                   __pyx_v_node = __pyx_f_4cdec_2sa_3_sa_trie_insert(__pyx_v_node, -1);
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":369
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":369
  *                                         node = collocations._insert(data.arr+i1, l1)
  *                                         node = trie_insert(node, -1)
  *                                         for i from i2 <= i < i2+l2:             # <<<<<<<<<<<<<<
@@ -34706,7 +34706,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
                   __pyx_t_14 = (__pyx_v_i2 + __pyx_v_l2);
                   for (__pyx_v_i = __pyx_v_i2; __pyx_v_i < __pyx_t_14; __pyx_v_i++) {
 
-                    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":370
+                    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":370
  *                                         node = trie_insert(node, -1)
  *                                         for i from i2 <= i < i2+l2:
  *                                             node = trie_insert(node, data.arr[i])             # <<<<<<<<<<<<<<
@@ -34716,7 +34716,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
                     __pyx_v_node = __pyx_f_4cdec_2sa_3_sa_trie_insert(__pyx_v_node, (__pyx_v_data->arr[__pyx_v_i]));
                   }
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":371
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":371
  *                                         for i from i2 <= i < i2+l2:
  *                                             node = trie_insert(node, data.arr[i])
  *                                         node = trie_insert(node, -1)             # <<<<<<<<<<<<<<
@@ -34725,7 +34725,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
                   __pyx_v_node = __pyx_f_4cdec_2sa_3_sa_trie_insert(__pyx_v_node, -1);
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":372
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":372
  *                                             node = trie_insert(node, data.arr[i])
  *                                         node = trie_insert(node, -1)
  *                                         for i from i3 <= i < i3+l3:             # <<<<<<<<<<<<<<
@@ -34735,7 +34735,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
                   __pyx_t_14 = (__pyx_v_i3 + __pyx_v_l3);
                   for (__pyx_v_i = __pyx_v_i3; __pyx_v_i < __pyx_t_14; __pyx_v_i++) {
 
-                    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":373
+                    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":373
  *                                         node = trie_insert(node, -1)
  *                                         for i from i3 <= i < i3+l3:
  *                                             node = trie_insert(node, data.arr[i])             # <<<<<<<<<<<<<<
@@ -34745,7 +34745,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
                     __pyx_v_node = __pyx_f_4cdec_2sa_3_sa_trie_insert(__pyx_v_node, (__pyx_v_data->arr[__pyx_v_i]));
                   }
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":374
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":374
  *                                         for i from i3 <= i < i3+l3:
  *                                             node = trie_insert(node, data.arr[i])
  *                                         trie_node_data_append(node, i1)             # <<<<<<<<<<<<<<
@@ -34756,7 +34756,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
                   __Pyx_GOTREF(__pyx_t_1);
                   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":375
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":375
  *                                             node = trie_insert(node, data.arr[i])
  *                                         trie_node_data_append(node, i1)
  *                                         trie_node_data_append(node, i2)             # <<<<<<<<<<<<<<
@@ -34767,7 +34767,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
                   __Pyx_GOTREF(__pyx_t_1);
                   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":376
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":376
  *                                         trie_node_data_append(node, i1)
  *                                         trie_node_data_append(node, i2)
  *                                         trie_node_data_append(node, i3)             # <<<<<<<<<<<<<<
@@ -34784,7 +34784,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
               }
               __pyx_L29:;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":377
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":377
  *                                         trie_node_data_append(node, i2)
  *                                         trie_node_data_append(node, i3)
  *                                 ptr3 = ptr3 + 2             # <<<<<<<<<<<<<<
@@ -34801,7 +34801,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         }
         __pyx_L21:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":378
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":378
  *                                         trie_node_data_append(node, i3)
  *                                 ptr3 = ptr3 + 2
  *                     ptr2 = ptr2 + 2             # <<<<<<<<<<<<<<
@@ -34812,7 +34812,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       }
       __pyx_L19_break:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":379
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":379
  *                                 ptr3 = ptr3 + 2
  *                     ptr2 = ptr2 + 2
  *                 ptr1 = ptr1 + 2             # <<<<<<<<<<<<<<
@@ -34824,7 +34824,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":381
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":381
  *                 ptr1 = ptr1 + 2
  *             else:
  *                 sent_count = sent_count + 1             # <<<<<<<<<<<<<<
@@ -34833,7 +34833,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
       __pyx_v_sent_count = (__pyx_v_sent_count + 1);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":382
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":382
  *             else:
  *                 sent_count = sent_count + 1
  *                 if sent_count % 10000 == 0:             # <<<<<<<<<<<<<<
@@ -34843,7 +34843,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __pyx_t_20 = ((__Pyx_mod_long(__pyx_v_sent_count, 10000) == 0) != 0);
       if (__pyx_t_20) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":383
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":383
  *                 sent_count = sent_count + 1
  *                 if sent_count % 10000 == 0:
  *                     logger.debug("        %d sentences", sent_count)             # <<<<<<<<<<<<<<
@@ -34874,7 +34874,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       }
       __pyx_L35:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":384
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":384
  *                 if sent_count % 10000 == 0:
  *                     logger.debug("        %d sentences", sent_count)
  *                 ptr1 = ptr1 + 1             # <<<<<<<<<<<<<<
@@ -34886,7 +34886,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __pyx_L17:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":386
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":386
  *                 ptr1 = ptr1 + 1
  * 
  *         self.precomputed_collocations = collocations.toMap(False)             # <<<<<<<<<<<<<<
@@ -34904,7 +34904,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_self->precomputed_collocations = __pyx_t_9;
   __pyx_t_9 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":387
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":387
  * 
  *         self.precomputed_collocations = collocations.toMap(False)
  *         self.precomputed_index = frequent_patterns.toMap(True)             # <<<<<<<<<<<<<<
@@ -34922,7 +34922,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_self->precomputed_index = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":389
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":389
  *         self.precomputed_index = frequent_patterns.toMap(True)
  * 
  *         x = 0             # <<<<<<<<<<<<<<
@@ -34932,7 +34932,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __Pyx_INCREF(__pyx_int_0);
   __pyx_v_x = __pyx_int_0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":390
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":390
  * 
  *         x = 0
  *         for pattern1 in J_set:             # <<<<<<<<<<<<<<
@@ -34958,7 +34958,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __Pyx_XDECREF_SET(__pyx_v_pattern1, __pyx_t_9);
     __pyx_t_9 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":391
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":391
  *         x = 0
  *         for pattern1 in J_set:
  *             for pattern2 in J_set:             # <<<<<<<<<<<<<<
@@ -34984,7 +34984,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __Pyx_XDECREF_SET(__pyx_v_pattern2, __pyx_t_3);
       __pyx_t_3 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":392
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":392
  *         for pattern1 in J_set:
  *             for pattern2 in J_set:
  *                 if len(pattern1) + len(pattern2) + 1 < self.max_length:             # <<<<<<<<<<<<<<
@@ -34996,7 +34996,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __pyx_t_20 = ((((__pyx_t_2 + __pyx_t_15) + 1) < __pyx_v_self->max_length) != 0);
       if (__pyx_t_20) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":393
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":393
  *             for pattern2 in J_set:
  *                 if len(pattern1) + len(pattern2) + 1 < self.max_length:
  *                     combined_pattern = pattern1 + (-1,) + pattern2             # <<<<<<<<<<<<<<
@@ -35011,7 +35011,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         __Pyx_XDECREF_SET(__pyx_v_combined_pattern, __pyx_t_8);
         __pyx_t_8 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":394
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":394
  *                 if len(pattern1) + len(pattern2) + 1 < self.max_length:
  *                     combined_pattern = pattern1 + (-1,) + pattern2
  *                     J2_set.add(combined_pattern)             # <<<<<<<<<<<<<<
@@ -35027,7 +35027,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":396
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":396
  *                     J2_set.add(combined_pattern)
  * 
  *         for pattern1 in I_set:             # <<<<<<<<<<<<<<
@@ -35053,7 +35053,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __Pyx_XDECREF_SET(__pyx_v_pattern1, __pyx_t_9);
     __pyx_t_9 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":397
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":397
  * 
  *         for pattern1 in I_set:
  *             for pattern2 in I_set:             # <<<<<<<<<<<<<<
@@ -35079,7 +35079,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __Pyx_XDECREF_SET(__pyx_v_pattern2, __pyx_t_8);
       __pyx_t_8 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":398
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":398
  *         for pattern1 in I_set:
  *             for pattern2 in I_set:
  *                 x = x+1             # <<<<<<<<<<<<<<
@@ -35091,7 +35091,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __Pyx_DECREF_SET(__pyx_v_x, __pyx_t_8);
       __pyx_t_8 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":399
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":399
  *             for pattern2 in I_set:
  *                 x = x+1
  *                 if len(pattern1) + len(pattern2) + 1 <= self.max_length:             # <<<<<<<<<<<<<<
@@ -35103,7 +35103,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __pyx_t_20 = ((((__pyx_t_15 + __pyx_t_2) + 1) <= __pyx_v_self->max_length) != 0);
       if (__pyx_t_20) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":400
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":400
  *                 x = x+1
  *                 if len(pattern1) + len(pattern2) + 1 <= self.max_length:
  *                     combined_pattern = pattern1 + (-1,) + pattern2             # <<<<<<<<<<<<<<
@@ -35118,7 +35118,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         __Pyx_XDECREF_SET(__pyx_v_combined_pattern, __pyx_t_3);
         __pyx_t_3 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":401
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":401
  *                 if len(pattern1) + len(pattern2) + 1 <= self.max_length:
  *                     combined_pattern = pattern1 + (-1,) + pattern2
  *                     IJ_set.add(combined_pattern)             # <<<<<<<<<<<<<<
@@ -35134,7 +35134,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":403
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":403
  *                     IJ_set.add(combined_pattern)
  * 
  *         for pattern1 in I_set:             # <<<<<<<<<<<<<<
@@ -35160,7 +35160,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __Pyx_XDECREF_SET(__pyx_v_pattern1, __pyx_t_9);
     __pyx_t_9 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":404
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":404
  * 
  *         for pattern1 in I_set:
  *             for pattern2 in J2_set:             # <<<<<<<<<<<<<<
@@ -35186,7 +35186,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __Pyx_XDECREF_SET(__pyx_v_pattern2, __pyx_t_3);
       __pyx_t_3 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":405
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":405
  *         for pattern1 in I_set:
  *             for pattern2 in J2_set:
  *                 x = x+2             # <<<<<<<<<<<<<<
@@ -35198,7 +35198,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __Pyx_DECREF_SET(__pyx_v_x, __pyx_t_3);
       __pyx_t_3 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":406
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":406
  *             for pattern2 in J2_set:
  *                 x = x+2
  *                 if len(pattern1) + len(pattern2) + 1<= self.max_length:             # <<<<<<<<<<<<<<
@@ -35210,7 +35210,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __pyx_t_20 = ((((__pyx_t_2 + __pyx_t_15) + 1) <= __pyx_v_self->max_length) != 0);
       if (__pyx_t_20) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":407
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":407
  *                 x = x+2
  *                 if len(pattern1) + len(pattern2) + 1<= self.max_length:
  *                     combined_pattern = pattern1 + (-1,) + pattern2             # <<<<<<<<<<<<<<
@@ -35225,7 +35225,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         __Pyx_XDECREF_SET(__pyx_v_combined_pattern, __pyx_t_8);
         __pyx_t_8 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":408
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":408
  *                 if len(pattern1) + len(pattern2) + 1<= self.max_length:
  *                     combined_pattern = pattern1 + (-1,) + pattern2
  *                     IJ_set.add(combined_pattern)             # <<<<<<<<<<<<<<
@@ -35234,7 +35234,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
         __pyx_t_16 = PySet_Add(__pyx_v_IJ_set, __pyx_v_combined_pattern); if (unlikely(__pyx_t_16 == -1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 408; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":409
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":409
  *                     combined_pattern = pattern1 + (-1,) + pattern2
  *                     IJ_set.add(combined_pattern)
  *                     combined_pattern = pattern2 + (-1,) + pattern1             # <<<<<<<<<<<<<<
@@ -35249,7 +35249,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         __Pyx_DECREF_SET(__pyx_v_combined_pattern, __pyx_t_3);
         __pyx_t_3 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":410
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":410
  *                     IJ_set.add(combined_pattern)
  *                     combined_pattern = pattern2 + (-1,) + pattern1
  *                     IJ_set.add(combined_pattern)             # <<<<<<<<<<<<<<
@@ -35265,7 +35265,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":412
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":412
  *                     IJ_set.add(combined_pattern)
  * 
  *         N = len(pattern_rank)             # <<<<<<<<<<<<<<
@@ -35275,7 +35275,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_t_15 = PyDict_Size(__pyx_v_pattern_rank); if (unlikely(__pyx_t_15 == -1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 412; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_N = __pyx_t_15;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":413
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":413
  * 
  *         N = len(pattern_rank)
  *         cost_by_rank = IntList(initial_len=N)             # <<<<<<<<<<<<<<
@@ -35294,7 +35294,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_cost_by_rank = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_9);
   __pyx_t_9 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":414
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":414
  *         N = len(pattern_rank)
  *         cost_by_rank = IntList(initial_len=N)
  *         count_by_rank = IntList(initial_len=N)             # <<<<<<<<<<<<<<
@@ -35313,7 +35313,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_v_count_by_rank = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":415
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":415
  *         cost_by_rank = IntList(initial_len=N)
  *         count_by_rank = IntList(initial_len=N)
  *         for pattern, arr in self.precomputed_collocations.iteritems():             # <<<<<<<<<<<<<<
@@ -35341,7 +35341,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __Pyx_XDECREF_SET(__pyx_v_arr, __pyx_t_3);
     __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":416
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":416
  *         count_by_rank = IntList(initial_len=N)
  *         for pattern, arr in self.precomputed_collocations.iteritems():
  *             if pattern not in IJ_set:             # <<<<<<<<<<<<<<
@@ -35352,7 +35352,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __pyx_t_12 = (__pyx_t_20 != 0);
     if (__pyx_t_12) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":417
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":417
  *         for pattern, arr in self.precomputed_collocations.iteritems():
  *             if pattern not in IJ_set:
  *                 s = ""             # <<<<<<<<<<<<<<
@@ -35362,7 +35362,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __Pyx_INCREF(__pyx_kp_s__32);
       __Pyx_XDECREF_SET(__pyx_v_s, __pyx_kp_s__32);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":418
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":418
  *             if pattern not in IJ_set:
  *                 s = ""
  *                 for word_id in pattern:             # <<<<<<<<<<<<<<
@@ -35407,7 +35407,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         __Pyx_XDECREF_SET(__pyx_v_word_id, __pyx_t_9);
         __pyx_t_9 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":419
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":419
  *                 s = ""
  *                 for word_id in pattern:
  *                     if word_id == -1:             # <<<<<<<<<<<<<<
@@ -35419,7 +35419,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
         if (__pyx_t_12) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":420
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":420
  *                 for word_id in pattern:
  *                     if word_id == -1:
  *                         s = s + "X "             # <<<<<<<<<<<<<<
@@ -35434,7 +35434,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         }
         /*else*/ {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":422
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":422
  *                         s = s + "X "
  *                     else:
  *                         s = s + darray.id2word[word_id] + " "             # <<<<<<<<<<<<<<
@@ -35456,7 +35456,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       }
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":423
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":423
  *                     else:
  *                         s = s + darray.id2word[word_id] + " "
  *                 logger.warn("ERROR: unexpected pattern %s in set of precomputed collocations", s)             # <<<<<<<<<<<<<<
@@ -35485,7 +35485,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":425
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":425
  *                 logger.warn("ERROR: unexpected pattern %s in set of precomputed collocations", s)
  *             else:
  *                 chunk = ()             # <<<<<<<<<<<<<<
@@ -35495,7 +35495,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __Pyx_INCREF(__pyx_empty_tuple);
       __Pyx_XDECREF_SET(__pyx_v_chunk, __pyx_empty_tuple);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":426
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":426
  *             else:
  *                 chunk = ()
  *                 max_rank = 0             # <<<<<<<<<<<<<<
@@ -35504,7 +35504,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
  */
       __pyx_v_max_rank = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":427
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":427
  *                 chunk = ()
  *                 max_rank = 0
  *                 arity = 0             # <<<<<<<<<<<<<<
@@ -35514,7 +35514,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __Pyx_INCREF(__pyx_int_0);
       __Pyx_XDECREF_SET(__pyx_v_arity, __pyx_int_0);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":428
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":428
  *                 max_rank = 0
  *                 arity = 0
  *                 for word_id in pattern:             # <<<<<<<<<<<<<<
@@ -35559,7 +35559,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         __Pyx_XDECREF_SET(__pyx_v_word_id, __pyx_t_3);
         __pyx_t_3 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":429
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":429
  *                 arity = 0
  *                 for word_id in pattern:
  *                     if word_id == -1:             # <<<<<<<<<<<<<<
@@ -35571,7 +35571,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
         if (__pyx_t_12) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":430
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":430
  *                 for word_id in pattern:
  *                     if word_id == -1:
  *                         max_rank = max(max_rank, pattern_rank[chunk])             # <<<<<<<<<<<<<<
@@ -35601,7 +35601,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
           __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
           __pyx_v_max_rank = __pyx_t_17;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":431
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":431
  *                     if word_id == -1:
  *                         max_rank = max(max_rank, pattern_rank[chunk])
  *                         arity = arity + 1             # <<<<<<<<<<<<<<
@@ -35613,7 +35613,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
           __Pyx_DECREF_SET(__pyx_v_arity, __pyx_t_9);
           __pyx_t_9 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":432
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":432
  *                         max_rank = max(max_rank, pattern_rank[chunk])
  *                         arity = arity + 1
  *                         chunk = ()             # <<<<<<<<<<<<<<
@@ -35626,7 +35626,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
         }
         /*else*/ {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":434
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":434
  *                         chunk = ()
  *                     else:
  *                         chunk = chunk + (word_id,)             # <<<<<<<<<<<<<<
@@ -35648,7 +35648,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       }
       __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":435
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":435
  *                     else:
  *                         chunk = chunk + (word_id,)
  *                 max_rank = max(max_rank, pattern_rank[chunk])             # <<<<<<<<<<<<<<
@@ -35678,7 +35678,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
       __pyx_v_max_rank = __pyx_t_17;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":436
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":436
  *                         chunk = chunk + (word_id,)
  *                 max_rank = max(max_rank, pattern_rank[chunk])
  *                 cost_by_rank.arr[max_rank] = cost_by_rank.arr[max_rank] + (4*len(arr))             # <<<<<<<<<<<<<<
@@ -35688,7 +35688,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
       __pyx_t_13 = PyObject_Length(__pyx_v_arr); if (unlikely(__pyx_t_13 == -1)) {__pyx_filename = __pyx_f[11]; __pyx_lineno = 436; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       (__pyx_v_cost_by_rank->arr[__pyx_v_max_rank]) = ((__pyx_v_cost_by_rank->arr[__pyx_v_max_rank]) + (4 * __pyx_t_13));
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":437
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":437
  *                 max_rank = max(max_rank, pattern_rank[chunk])
  *                 cost_by_rank.arr[max_rank] = cost_by_rank.arr[max_rank] + (4*len(arr))
  *                 count_by_rank.arr[max_rank] = count_by_rank.arr[max_rank] + (len(arr)/(arity+1))             # <<<<<<<<<<<<<<
@@ -35718,7 +35718,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":439
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":439
  *                 count_by_rank.arr[max_rank] = count_by_rank.arr[max_rank] + (len(arr)/(arity+1))
  * 
  *         cumul_cost = 0             # <<<<<<<<<<<<<<
@@ -35728,7 +35728,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __Pyx_INCREF(__pyx_int_0);
   __pyx_v_cumul_cost = __pyx_int_0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":440
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":440
  * 
  *         cumul_cost = 0
  *         cumul_count = 0             # <<<<<<<<<<<<<<
@@ -35738,7 +35738,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __Pyx_INCREF(__pyx_int_0);
   __pyx_v_cumul_count = __pyx_int_0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":441
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":441
  *         cumul_cost = 0
  *         cumul_count = 0
  *         for i from 0 <= i < N:             # <<<<<<<<<<<<<<
@@ -35748,7 +35748,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __pyx_t_14 = __pyx_v_N;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_14; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":442
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":442
  *         cumul_count = 0
  *         for i from 0 <= i < N:
  *             cumul_cost = cumul_cost + cost_by_rank.arr[i]             # <<<<<<<<<<<<<<
@@ -35763,7 +35763,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __Pyx_DECREF_SET(__pyx_v_cumul_cost, __pyx_t_7);
     __pyx_t_7 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":443
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":443
  *         for i from 0 <= i < N:
  *             cumul_cost = cumul_cost + cost_by_rank.arr[i]
  *             cumul_count = cumul_count + count_by_rank.arr[i]             # <<<<<<<<<<<<<<
@@ -35778,7 +35778,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __Pyx_DECREF_SET(__pyx_v_cumul_count, __pyx_t_1);
     __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":444
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":444
  *             cumul_cost = cumul_cost + cost_by_rank.arr[i]
  *             cumul_count = cumul_count + count_by_rank.arr[i]
  *             logger.debug("RANK %d\tCOUNT, COST: %d    %d\tCUMUL: %d, %d", i, count_by_rank.arr[i], cost_by_rank.arr[i], cumul_count, cumul_cost)             # <<<<<<<<<<<<<<
@@ -35823,7 +35823,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":446
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":446
  *             logger.debug("RANK %d\tCOUNT, COST: %d    %d\tCUMUL: %d, %d", i, count_by_rank.arr[i], cost_by_rank.arr[i], cumul_count, cumul_cost)
  * 
  *         num_found_patterns = len(self.precomputed_collocations)             # <<<<<<<<<<<<<<
@@ -35836,7 +35836,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_v_num_found_patterns = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":447
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":447
  * 
  *         num_found_patterns = len(self.precomputed_collocations)
  *         for pattern in IJ_set:             # <<<<<<<<<<<<<<
@@ -35862,7 +35862,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __Pyx_XDECREF_SET(__pyx_v_pattern, __pyx_t_8);
     __pyx_t_8 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":448
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":448
  *         num_found_patterns = len(self.precomputed_collocations)
  *         for pattern in IJ_set:
  *             if pattern not in self.precomputed_collocations:             # <<<<<<<<<<<<<<
@@ -35873,7 +35873,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
     __pyx_t_20 = (__pyx_t_12 != 0);
     if (__pyx_t_20) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":449
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":449
  *         for pattern in IJ_set:
  *             if pattern not in self.precomputed_collocations:
  *                 self.precomputed_collocations[pattern] = IntList()             # <<<<<<<<<<<<<<
@@ -35890,7 +35890,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   }
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":451
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":451
  *                 self.precomputed_collocations[pattern] = IntList()
  * 
  *         cdef float stop_time = monitor_cpu()             # <<<<<<<<<<<<<<
@@ -35906,7 +35906,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
   __pyx_v_stop_time = __pyx_t_4;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":452
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":452
  * 
  *         cdef float stop_time = monitor_cpu()
  *         logger.info("Precomputed collocations for %d patterns out of %d possible (upper bound %d)", num_found_patterns, len(self.precomputed_collocations), x)             # <<<<<<<<<<<<<<
@@ -35946,7 +35946,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":453
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":453
  *         cdef float stop_time = monitor_cpu()
  *         logger.info("Precomputed collocations for %d patterns out of %d possible (upper bound %d)", num_found_patterns, len(self.precomputed_collocations), x)
  *         logger.info("Precomputed inverted index for %d patterns ", len(self.precomputed_index))             # <<<<<<<<<<<<<<
@@ -35977,7 +35977,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":454
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":454
  *         logger.info("Precomputed collocations for %d patterns out of %d possible (upper bound %d)", num_found_patterns, len(self.precomputed_collocations), x)
  *         logger.info("Precomputed inverted index for %d patterns ", len(self.precomputed_index))
  *         logger.info("Precomputation took %f seconds", (stop_time - start_time))             # <<<<<<<<<<<<<<
@@ -36003,7 +36003,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0;
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":278
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":278
  * 
  * 
  *     def precompute(self, stats, SuffixArray sarray):             # <<<<<<<<<<<<<<
@@ -36058,7 +36058,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_14Precomputation_6precompute(struct __p
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":11
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":11
  *     cdef IntList ha
  * 
  *     def __cinit__(self, from_binary=None, from_text=None, side=None):             # <<<<<<<<<<<<<<
@@ -36155,7 +36155,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11SuffixArray___cinit__(struct __pyx_obj_4cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":12
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":12
  * 
  *     def __cinit__(self, from_binary=None, from_text=None, side=None):
  *         self.darray = DataArray()             # <<<<<<<<<<<<<<
@@ -36170,7 +36170,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11SuffixArray___cinit__(struct __pyx_obj_4cde
   __pyx_v_self->darray = ((struct __pyx_obj_4cdec_2sa_3_sa_DataArray *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":13
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":13
  *     def __cinit__(self, from_binary=None, from_text=None, side=None):
  *         self.darray = DataArray()
  *         self.sa = IntList()             # <<<<<<<<<<<<<<
@@ -36185,7 +36185,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11SuffixArray___cinit__(struct __pyx_obj_4cde
   __pyx_v_self->sa = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":14
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":14
  *         self.darray = DataArray()
  *         self.sa = IntList()
  *         self.ha = IntList()             # <<<<<<<<<<<<<<
@@ -36200,7 +36200,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11SuffixArray___cinit__(struct __pyx_obj_4cde
   __pyx_v_self->ha = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":15
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":15
  *         self.sa = IntList()
  *         self.ha = IntList()
  *         if from_binary:             # <<<<<<<<<<<<<<
@@ -36210,7 +36210,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11SuffixArray___cinit__(struct __pyx_obj_4cde
   __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_from_binary); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[12]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":16
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":16
  *         self.ha = IntList()
  *         if from_binary:
  *             self.read_binary(from_binary)             # <<<<<<<<<<<<<<
@@ -36232,7 +36232,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11SuffixArray___cinit__(struct __pyx_obj_4cde
     goto __pyx_L3;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":17
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":17
  *         if from_binary:
  *             self.read_binary(from_binary)
  *         elif from_text:             # <<<<<<<<<<<<<<
@@ -36242,7 +36242,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11SuffixArray___cinit__(struct __pyx_obj_4cde
   __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_from_text); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[12]; __pyx_lineno = 17; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":18
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":18
  *             self.read_binary(from_binary)
  *         elif from_text:
  *             self.read_text(from_text, side)             # <<<<<<<<<<<<<<
@@ -36268,7 +36268,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11SuffixArray___cinit__(struct __pyx_obj_4cde
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":11
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":11
  *     cdef IntList ha
  * 
  *     def __cinit__(self, from_binary=None, from_text=None, side=None):             # <<<<<<<<<<<<<<
@@ -36290,7 +36290,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11SuffixArray___cinit__(struct __pyx_obj_4cde
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":20
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":20
  *             self.read_text(from_text, side)
  * 
  *     def __getitem__(self, i):             # <<<<<<<<<<<<<<
@@ -36321,7 +36321,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_2__getitem__(struct __pyx
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__getitem__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":21
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":21
  * 
  *     def __getitem__(self, i):
  *         return self.sa.arr[i]             # <<<<<<<<<<<<<<
@@ -36336,7 +36336,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_2__getitem__(struct __pyx
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":20
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":20
  *             self.read_text(from_text, side)
  * 
  *     def __getitem__(self, i):             # <<<<<<<<<<<<<<
@@ -36355,7 +36355,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_2__getitem__(struct __pyx
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":23
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":23
  *         return self.sa.arr[i]
  * 
  *     def read_text(self, filename, side):             # <<<<<<<<<<<<<<
@@ -36458,7 +36458,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("read_text", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":29
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":29
  *         cdef IntList isa, word_count
  * 
  *         self.darray = DataArray(from_text=filename, side=side, use_sent_id=True)             # <<<<<<<<<<<<<<
@@ -36479,7 +36479,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __pyx_v_self->darray = ((struct __pyx_obj_4cdec_2sa_3_sa_DataArray *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":30
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":30
  * 
  *         self.darray = DataArray(from_text=filename, side=side, use_sent_id=True)
  *         N = len(self.darray)             # <<<<<<<<<<<<<<
@@ -36492,7 +36492,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_v_N = __pyx_t_3;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":31
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":31
  *         self.darray = DataArray(from_text=filename, side=side, use_sent_id=True)
  *         N = len(self.darray)
  *         V = len(self.darray.id2word)             # <<<<<<<<<<<<<<
@@ -36505,7 +36505,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_v_V = __pyx_t_3;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":33
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":33
  *         V = len(self.darray.id2word)
  * 
  *         self.sa = IntList(initial_len=N)             # <<<<<<<<<<<<<<
@@ -36527,7 +36527,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __pyx_v_self->sa = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":34
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":34
  * 
  *         self.sa = IntList(initial_len=N)
  *         self.ha = IntList(initial_len=V+1)             # <<<<<<<<<<<<<<
@@ -36549,7 +36549,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __pyx_v_self->ha = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":36
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":36
  *         self.ha = IntList(initial_len=V+1)
  * 
  *         isa = IntList(initial_len=N)             # <<<<<<<<<<<<<<
@@ -36568,7 +36568,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __pyx_v_isa = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":37
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":37
  * 
  *         isa = IntList(initial_len=N)
  *         word_count = IntList(initial_len=V+1)             # <<<<<<<<<<<<<<
@@ -36587,7 +36587,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __pyx_v_word_count = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":40
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":40
  * 
  *         '''Step 1: bucket sort data'''
  *         cdef float sort_start_time = monitor_cpu()             # <<<<<<<<<<<<<<
@@ -36603,7 +36603,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_v_sort_start_time = __pyx_t_4;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":41
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":41
  *         '''Step 1: bucket sort data'''
  *         cdef float sort_start_time = monitor_cpu()
  *         cdef float start_time = sort_start_time             # <<<<<<<<<<<<<<
@@ -36612,7 +36612,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
   __pyx_v_start_time = __pyx_v_sort_start_time;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":42
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":42
  *         cdef float sort_start_time = monitor_cpu()
  *         cdef float start_time = sort_start_time
  *         for i from 0 <= i < N:             # <<<<<<<<<<<<<<
@@ -36622,7 +36622,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __pyx_t_5 = __pyx_v_N;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":43
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":43
  *         cdef float start_time = sort_start_time
  *         for i from 0 <= i < N:
  *             a_i = self.darray.data.arr[i]             # <<<<<<<<<<<<<<
@@ -36631,7 +36631,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
     __pyx_v_a_i = (__pyx_v_self->darray->data->arr[__pyx_v_i]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":44
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":44
  *         for i from 0 <= i < N:
  *             a_i = self.darray.data.arr[i]
  *             word_count.arr[a_i] = word_count.arr[a_i] + 1             # <<<<<<<<<<<<<<
@@ -36641,7 +36641,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
     (__pyx_v_word_count->arr[__pyx_v_a_i]) = ((__pyx_v_word_count->arr[__pyx_v_a_i]) + 1);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":46
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":46
  *             word_count.arr[a_i] = word_count.arr[a_i] + 1
  * 
  *         n = 0             # <<<<<<<<<<<<<<
@@ -36650,7 +36650,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
   __pyx_v_n = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":47
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":47
  * 
  *         n = 0
  *         for i from 0 <= i < V+1:             # <<<<<<<<<<<<<<
@@ -36660,7 +36660,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __pyx_t_6 = (__pyx_v_V + 1);
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_6; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":48
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":48
  *         n = 0
  *         for i from 0 <= i < V+1:
  *             self.ha.arr[i] = n             # <<<<<<<<<<<<<<
@@ -36669,7 +36669,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
     (__pyx_v_self->ha->arr[__pyx_v_i]) = __pyx_v_n;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":49
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":49
  *         for i from 0 <= i < V+1:
  *             self.ha.arr[i] = n
  *             n = n + word_count.arr[i]             # <<<<<<<<<<<<<<
@@ -36678,7 +36678,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
     __pyx_v_n = (__pyx_v_n + (__pyx_v_word_count->arr[__pyx_v_i]));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":50
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":50
  *             self.ha.arr[i] = n
  *             n = n + word_count.arr[i]
  *             word_count.arr[i] = 0             # <<<<<<<<<<<<<<
@@ -36688,7 +36688,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
     (__pyx_v_word_count->arr[__pyx_v_i]) = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":52
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":52
  *             word_count.arr[i] = 0
  * 
  *         for i from 0 <= i < N:             # <<<<<<<<<<<<<<
@@ -36698,7 +36698,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __pyx_t_5 = __pyx_v_N;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":53
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":53
  * 
  *         for i from 0 <= i < N:
  *             a_i = self.darray.data.arr[i]             # <<<<<<<<<<<<<<
@@ -36707,7 +36707,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
     __pyx_v_a_i = (__pyx_v_self->darray->data->arr[__pyx_v_i]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":54
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":54
  *         for i from 0 <= i < N:
  *             a_i = self.darray.data.arr[i]
  *             self.sa.arr[self.ha.arr[a_i] + word_count.arr[a_i]] = i             # <<<<<<<<<<<<<<
@@ -36716,7 +36716,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
     (__pyx_v_self->sa->arr[((__pyx_v_self->ha->arr[__pyx_v_a_i]) + (__pyx_v_word_count->arr[__pyx_v_a_i]))]) = __pyx_v_i;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":55
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":55
  *             a_i = self.darray.data.arr[i]
  *             self.sa.arr[self.ha.arr[a_i] + word_count.arr[a_i]] = i
  *             isa.arr[i] = self.ha.arr[a_i + 1] - 1 # bucket pointer is last index in bucket             # <<<<<<<<<<<<<<
@@ -36725,7 +36725,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
     (__pyx_v_isa->arr[__pyx_v_i]) = ((__pyx_v_self->ha->arr[(__pyx_v_a_i + 1)]) - 1);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":56
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":56
  *             self.sa.arr[self.ha.arr[a_i] + word_count.arr[a_i]] = i
  *             isa.arr[i] = self.ha.arr[a_i + 1] - 1 # bucket pointer is last index in bucket
  *             word_count.arr[a_i] = word_count.arr[a_i] + 1             # <<<<<<<<<<<<<<
@@ -36735,7 +36735,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
     (__pyx_v_word_count->arr[__pyx_v_a_i]) = ((__pyx_v_word_count->arr[__pyx_v_a_i]) + 1);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":59
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":59
  * 
  *         '''Determine size of initial runs'''
  *         current_run = 0             # <<<<<<<<<<<<<<
@@ -36744,7 +36744,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
   __pyx_v_current_run = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":60
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":60
  *         '''Determine size of initial runs'''
  *         current_run = 0
  *         for i from 0 <= i < V+1:             # <<<<<<<<<<<<<<
@@ -36754,7 +36754,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __pyx_t_6 = (__pyx_v_V + 1);
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_6; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":61
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":61
  *         current_run = 0
  *         for i from 0 <= i < V+1:
  *             if i < V and self.ha.arr[i+1] - self.ha.arr[i] == 1:             # <<<<<<<<<<<<<<
@@ -36770,7 +36770,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
     }
     if (__pyx_t_9) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":62
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":62
  *         for i from 0 <= i < V+1:
  *             if i < V and self.ha.arr[i+1] - self.ha.arr[i] == 1:
  *                 current_run = current_run + 1             # <<<<<<<<<<<<<<
@@ -36782,7 +36782,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":64
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":64
  *                 current_run = current_run + 1
  *             else:
  *                 if current_run > 0:             # <<<<<<<<<<<<<<
@@ -36792,7 +36792,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
       __pyx_t_9 = ((__pyx_v_current_run > 0) != 0);
       if (__pyx_t_9) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":65
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":65
  *             else:
  *                 if current_run > 0:
  *                     self.sa.arr[self.ha.arr[i] - current_run] = -current_run             # <<<<<<<<<<<<<<
@@ -36801,7 +36801,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
         (__pyx_v_self->sa->arr[((__pyx_v_self->ha->arr[__pyx_v_i]) - __pyx_v_current_run)]) = (-__pyx_v_current_run);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":66
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":66
  *                 if current_run > 0:
  *                     self.sa.arr[self.ha.arr[i] - current_run] = -current_run
  *                     current_run = 0             # <<<<<<<<<<<<<<
@@ -36816,7 +36816,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
     __pyx_L11:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":68
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":68
  *                     current_run = 0
  * 
  *         logger.info("    Bucket sort took %f seconds", (monitor_cpu() - sort_start_time))             # <<<<<<<<<<<<<<
@@ -36853,7 +36853,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":71
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":71
  * 
  *         '''Step 2: prefix-doubling sort'''
  *         h = 1             # <<<<<<<<<<<<<<
@@ -36862,7 +36862,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
   __pyx_v_h = 1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":72
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":72
  *         '''Step 2: prefix-doubling sort'''
  *         h = 1
  *         while self.sa.arr[0] != -N:             # <<<<<<<<<<<<<<
@@ -36873,7 +36873,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
     __pyx_t_9 = (((__pyx_v_self->sa->arr[0]) != (-__pyx_v_N)) != 0);
     if (!__pyx_t_9) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":73
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":73
  *         h = 1
  *         while self.sa.arr[0] != -N:
  *             sort_start_time = monitor_cpu()             # <<<<<<<<<<<<<<
@@ -36889,7 +36889,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __pyx_v_sort_start_time = __pyx_t_4;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":74
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":74
  *         while self.sa.arr[0] != -N:
  *             sort_start_time = monitor_cpu()
  *             logger.debug("    Refining, sort depth = %d", h)             # <<<<<<<<<<<<<<
@@ -36917,7 +36917,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":75
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":75
  *             sort_start_time = monitor_cpu()
  *             logger.debug("    Refining, sort depth = %d", h)
  *             i = 0             # <<<<<<<<<<<<<<
@@ -36926,7 +36926,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
     __pyx_v_i = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":76
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":76
  *             logger.debug("    Refining, sort depth = %d", h)
  *             i = 0
  *             skip = 0             # <<<<<<<<<<<<<<
@@ -36935,7 +36935,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
     __pyx_v_skip = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":77
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":77
  *             i = 0
  *             skip = 0
  *             while i < N:             # <<<<<<<<<<<<<<
@@ -36946,7 +36946,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
       __pyx_t_9 = ((__pyx_v_i < __pyx_v_N) != 0);
       if (!__pyx_t_9) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":78
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":78
  *             skip = 0
  *             while i < N:
  *                 if self.sa.arr[i] < 0:             # <<<<<<<<<<<<<<
@@ -36956,7 +36956,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
       __pyx_t_9 = (((__pyx_v_self->sa->arr[__pyx_v_i]) < 0) != 0);
       if (__pyx_t_9) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":79
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":79
  *             while i < N:
  *                 if self.sa.arr[i] < 0:
  *                     skip = skip + self.sa.arr[i]             # <<<<<<<<<<<<<<
@@ -36965,7 +36965,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
         __pyx_v_skip = (__pyx_v_skip + (__pyx_v_self->sa->arr[__pyx_v_i]));
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":80
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":80
  *                 if self.sa.arr[i] < 0:
  *                     skip = skip + self.sa.arr[i]
  *                     i = i - self.sa.arr[i]             # <<<<<<<<<<<<<<
@@ -36977,7 +36977,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
       }
       /*else*/ {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":82
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":82
  *                     i = i - self.sa.arr[i]
  *                 else:
  *                     if skip < 0:             # <<<<<<<<<<<<<<
@@ -36987,7 +36987,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
         __pyx_t_9 = ((__pyx_v_skip < 0) != 0);
         if (__pyx_t_9) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":83
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":83
  *                 else:
  *                     if skip < 0:
  *                         self.sa.arr[i+skip] = skip             # <<<<<<<<<<<<<<
@@ -36996,7 +36996,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
           (__pyx_v_self->sa->arr[(__pyx_v_i + __pyx_v_skip)]) = __pyx_v_skip;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":84
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":84
  *                     if skip < 0:
  *                         self.sa.arr[i+skip] = skip
  *                         skip = 0             # <<<<<<<<<<<<<<
@@ -37008,7 +37008,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
         }
         __pyx_L18:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":85
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":85
  *                         self.sa.arr[i+skip] = skip
  *                         skip = 0
  *                     j = isa.arr[self.sa.arr[i]]             # <<<<<<<<<<<<<<
@@ -37017,7 +37017,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
         __pyx_v_j = (__pyx_v_isa->arr[(__pyx_v_self->sa->arr[__pyx_v_i])]);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":86
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":86
  *                         skip = 0
  *                     j = isa.arr[self.sa.arr[i]]
  *                     self.q3sort(i, j, h, isa)             # <<<<<<<<<<<<<<
@@ -37052,7 +37052,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
         __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0;
         __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":87
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":87
  *                     j = isa.arr[self.sa.arr[i]]
  *                     self.q3sort(i, j, h, isa)
  *                     i = j+1             # <<<<<<<<<<<<<<
@@ -37064,7 +37064,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
       __pyx_L17:;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":88
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":88
  *                     self.q3sort(i, j, h, isa)
  *                     i = j+1
  *             if skip < 0:             # <<<<<<<<<<<<<<
@@ -37074,7 +37074,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
     __pyx_t_9 = ((__pyx_v_skip < 0) != 0);
     if (__pyx_t_9) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":89
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":89
  *                     i = j+1
  *             if skip < 0:
  *                 self.sa.arr[i+skip] = skip             # <<<<<<<<<<<<<<
@@ -37086,7 +37086,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
     }
     __pyx_L19:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":90
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":90
  *             if skip < 0:
  *                 self.sa.arr[i+skip] = skip
  *             h = h * 2             # <<<<<<<<<<<<<<
@@ -37095,7 +37095,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
     __pyx_v_h = (__pyx_v_h * 2);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":91
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":91
  *                 self.sa.arr[i+skip] = skip
  *             h = h * 2
  *             logger.debug("    Refinement took %f seconds", (monitor_cpu() - sort_start_time))             # <<<<<<<<<<<<<<
@@ -37133,7 +37133,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
     __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":94
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":94
  * 
  *         '''Step 3: read off suffix array from inverse suffix array'''
  *         logger.info("    Finalizing sort...")             # <<<<<<<<<<<<<<
@@ -37150,7 +37150,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
   __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":95
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":95
  *         '''Step 3: read off suffix array from inverse suffix array'''
  *         logger.info("    Finalizing sort...")
  *         for i from 0 <= i < N:             # <<<<<<<<<<<<<<
@@ -37160,7 +37160,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __pyx_t_5 = __pyx_v_N;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":96
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":96
  *         logger.info("    Finalizing sort...")
  *         for i from 0 <= i < N:
  *             j = isa.arr[i]             # <<<<<<<<<<<<<<
@@ -37169,7 +37169,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
  */
     __pyx_v_j = (__pyx_v_isa->arr[__pyx_v_i]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":97
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":97
  *         for i from 0 <= i < N:
  *             j = isa.arr[i]
  *             self.sa.arr[j] = i             # <<<<<<<<<<<<<<
@@ -37179,7 +37179,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
     (__pyx_v_self->sa->arr[__pyx_v_j]) = __pyx_v_i;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":98
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":98
  *             j = isa.arr[i]
  *             self.sa.arr[j] = i
  *         logger.info("Suffix array construction took %f seconds", (monitor_cpu() - start_time))             # <<<<<<<<<<<<<<
@@ -37216,7 +37216,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":23
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":23
  *         return self.sa.arr[i]
  * 
  *     def read_text(self, filename, side):             # <<<<<<<<<<<<<<
@@ -37243,7 +37243,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_4read_text(struct __pyx_o
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":100
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":100
  *         logger.info("Suffix array construction took %f seconds", (monitor_cpu() - start_time))
  * 
  *     def q3sort(self, int i, int j, int h, IntList isa, pad=""):             # <<<<<<<<<<<<<<
@@ -37370,7 +37370,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("q3sort", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":107
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":107
  *         cdef int k, midpoint, pval, phead, ptail, tmp
  * 
  *         if j-i < -1:             # <<<<<<<<<<<<<<
@@ -37380,7 +37380,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
   __pyx_t_1 = (((__pyx_v_j - __pyx_v_i) < -1) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":108
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":108
  * 
  *         if j-i < -1:
  *             raise Exception("Unexpected condition found in q3sort: sort from %d to %d" % (i,j))             # <<<<<<<<<<<<<<
@@ -37415,7 +37415,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
     {__pyx_filename = __pyx_f[12]; __pyx_lineno = 108; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":109
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":109
  *         if j-i < -1:
  *             raise Exception("Unexpected condition found in q3sort: sort from %d to %d" % (i,j))
  *         if j-i == -1:    # recursive base case -- empty interval             # <<<<<<<<<<<<<<
@@ -37425,7 +37425,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
   __pyx_t_1 = (((__pyx_v_j - __pyx_v_i) == -1) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":110
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":110
  *             raise Exception("Unexpected condition found in q3sort: sort from %d to %d" % (i,j))
  *         if j-i == -1:    # recursive base case -- empty interval
  *             return             # <<<<<<<<<<<<<<
@@ -37437,7 +37437,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":111
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":111
  *         if j-i == -1:    # recursive base case -- empty interval
  *             return
  *         if (j-i == 0):    # recursive base case -- singleton interval             # <<<<<<<<<<<<<<
@@ -37447,7 +37447,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
   __pyx_t_1 = (((__pyx_v_j - __pyx_v_i) == 0) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":112
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":112
  *             return
  *         if (j-i == 0):    # recursive base case -- singleton interval
  *             isa.arr[self.sa.arr[i]] = i             # <<<<<<<<<<<<<<
@@ -37456,7 +37456,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
     (__pyx_v_isa->arr[(__pyx_v_self->sa->arr[__pyx_v_i])]) = __pyx_v_i;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":113
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":113
  *         if (j-i == 0):    # recursive base case -- singleton interval
  *             isa.arr[self.sa.arr[i]] = i
  *             self.sa.arr[i] = -1             # <<<<<<<<<<<<<<
@@ -37465,7 +37465,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
     (__pyx_v_self->sa->arr[__pyx_v_i]) = -1;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":114
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":114
  *             isa.arr[self.sa.arr[i]] = i
  *             self.sa.arr[i] = -1
  *             return             # <<<<<<<<<<<<<<
@@ -37477,7 +37477,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":123
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":123
  *         # If the method of assigning word_id's is changed, this method
  *         # may need to be reconsidered as well.
  *         midpoint = (i+j)/2             # <<<<<<<<<<<<<<
@@ -37486,7 +37486,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
   __pyx_v_midpoint = __Pyx_div_long((__pyx_v_i + __pyx_v_j), 2);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":124
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":124
  *         # may need to be reconsidered as well.
  *         midpoint = (i+j)/2
  *         pval = isa.arr[self.sa.arr[midpoint] + h]             # <<<<<<<<<<<<<<
@@ -37495,7 +37495,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
   __pyx_v_pval = (__pyx_v_isa->arr[((__pyx_v_self->sa->arr[__pyx_v_midpoint]) + __pyx_v_h)]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":125
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":125
  *         midpoint = (i+j)/2
  *         pval = isa.arr[self.sa.arr[midpoint] + h]
  *         if i != midpoint:             # <<<<<<<<<<<<<<
@@ -37505,7 +37505,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
   __pyx_t_1 = ((__pyx_v_i != __pyx_v_midpoint) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":126
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":126
  *         pval = isa.arr[self.sa.arr[midpoint] + h]
  *         if i != midpoint:
  *             tmp = self.sa.arr[midpoint]             # <<<<<<<<<<<<<<
@@ -37514,7 +37514,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
     __pyx_v_tmp = (__pyx_v_self->sa->arr[__pyx_v_midpoint]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":127
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":127
  *         if i != midpoint:
  *             tmp = self.sa.arr[midpoint]
  *             self.sa.arr[midpoint] = self.sa.arr[i]             # <<<<<<<<<<<<<<
@@ -37523,7 +37523,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
     (__pyx_v_self->sa->arr[__pyx_v_midpoint]) = (__pyx_v_self->sa->arr[__pyx_v_i]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":128
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":128
  *             tmp = self.sa.arr[midpoint]
  *             self.sa.arr[midpoint] = self.sa.arr[i]
  *             self.sa.arr[i] = tmp             # <<<<<<<<<<<<<<
@@ -37535,7 +37535,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
   }
   __pyx_L6:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":129
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":129
  *             self.sa.arr[midpoint] = self.sa.arr[i]
  *             self.sa.arr[i] = tmp
  *         phead = i             # <<<<<<<<<<<<<<
@@ -37544,7 +37544,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
   __pyx_v_phead = __pyx_v_i;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":130
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":130
  *             self.sa.arr[i] = tmp
  *         phead = i
  *         ptail = i             # <<<<<<<<<<<<<<
@@ -37553,7 +37553,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
   __pyx_v_ptail = __pyx_v_i;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":134
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":134
  *         # find the three partitions.    phead marks the first element
  *         # of the middle partition, and ptail marks the last element
  *         for k from i+1 <= k < j+1:             # <<<<<<<<<<<<<<
@@ -37563,7 +37563,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
   __pyx_t_5 = (__pyx_v_j + 1);
   for (__pyx_v_k = (__pyx_v_i + 1); __pyx_v_k < __pyx_t_5; __pyx_v_k++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":135
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":135
  *         # of the middle partition, and ptail marks the last element
  *         for k from i+1 <= k < j+1:
  *             if isa.arr[self.sa.arr[k] + h] < pval:             # <<<<<<<<<<<<<<
@@ -37573,7 +37573,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
     __pyx_t_1 = (((__pyx_v_isa->arr[((__pyx_v_self->sa->arr[__pyx_v_k]) + __pyx_v_h)]) < __pyx_v_pval) != 0);
     if (__pyx_t_1) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":136
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":136
  *         for k from i+1 <= k < j+1:
  *             if isa.arr[self.sa.arr[k] + h] < pval:
  *                 if k > ptail+1:             # <<<<<<<<<<<<<<
@@ -37583,7 +37583,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
       __pyx_t_1 = ((__pyx_v_k > (__pyx_v_ptail + 1)) != 0);
       if (__pyx_t_1) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":137
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":137
  *             if isa.arr[self.sa.arr[k] + h] < pval:
  *                 if k > ptail+1:
  *                     tmp = self.sa.arr[phead]             # <<<<<<<<<<<<<<
@@ -37592,7 +37592,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
         __pyx_v_tmp = (__pyx_v_self->sa->arr[__pyx_v_phead]);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":138
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":138
  *                 if k > ptail+1:
  *                     tmp = self.sa.arr[phead]
  *                     self.sa.arr[phead] = self.sa.arr[k]             # <<<<<<<<<<<<<<
@@ -37601,7 +37601,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
         (__pyx_v_self->sa->arr[__pyx_v_phead]) = (__pyx_v_self->sa->arr[__pyx_v_k]);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":139
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":139
  *                     tmp = self.sa.arr[phead]
  *                     self.sa.arr[phead] = self.sa.arr[k]
  *                     self.sa.arr[k] = self.sa.arr[ptail+1]             # <<<<<<<<<<<<<<
@@ -37610,7 +37610,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
         (__pyx_v_self->sa->arr[__pyx_v_k]) = (__pyx_v_self->sa->arr[(__pyx_v_ptail + 1)]);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":140
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":140
  *                     self.sa.arr[phead] = self.sa.arr[k]
  *                     self.sa.arr[k] = self.sa.arr[ptail+1]
  *                     self.sa.arr[ptail+1] = tmp             # <<<<<<<<<<<<<<
@@ -37622,7 +37622,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
       }
       /*else*/ {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":142
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":142
  *                     self.sa.arr[ptail+1] = tmp
  *                 else: # k == ptail+1
  *                     tmp = self.sa.arr[phead]             # <<<<<<<<<<<<<<
@@ -37631,7 +37631,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
         __pyx_v_tmp = (__pyx_v_self->sa->arr[__pyx_v_phead]);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":143
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":143
  *                 else: # k == ptail+1
  *                     tmp = self.sa.arr[phead]
  *                     self.sa.arr[phead] = self.sa.arr[k]             # <<<<<<<<<<<<<<
@@ -37640,7 +37640,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
         (__pyx_v_self->sa->arr[__pyx_v_phead]) = (__pyx_v_self->sa->arr[__pyx_v_k]);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":144
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":144
  *                     tmp = self.sa.arr[phead]
  *                     self.sa.arr[phead] = self.sa.arr[k]
  *                     self.sa.arr[k] = tmp             # <<<<<<<<<<<<<<
@@ -37651,7 +37651,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
       }
       __pyx_L10:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":145
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":145
  *                     self.sa.arr[phead] = self.sa.arr[k]
  *                     self.sa.arr[k] = tmp
  *                 phead = phead + 1             # <<<<<<<<<<<<<<
@@ -37660,7 +37660,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
       __pyx_v_phead = (__pyx_v_phead + 1);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":146
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":146
  *                     self.sa.arr[k] = tmp
  *                 phead = phead + 1
  *                 ptail = ptail + 1             # <<<<<<<<<<<<<<
@@ -37672,7 +37672,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":148
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":148
  *                 ptail = ptail + 1
  *             else:
  *                 if isa.arr[self.sa.arr[k] + h] == pval:             # <<<<<<<<<<<<<<
@@ -37682,7 +37682,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
       __pyx_t_1 = (((__pyx_v_isa->arr[((__pyx_v_self->sa->arr[__pyx_v_k]) + __pyx_v_h)]) == __pyx_v_pval) != 0);
       if (__pyx_t_1) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":149
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":149
  *             else:
  *                 if isa.arr[self.sa.arr[k] + h] == pval:
  *                     if k > ptail+1:             # <<<<<<<<<<<<<<
@@ -37692,7 +37692,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
         __pyx_t_1 = ((__pyx_v_k > (__pyx_v_ptail + 1)) != 0);
         if (__pyx_t_1) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":150
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":150
  *                 if isa.arr[self.sa.arr[k] + h] == pval:
  *                     if k > ptail+1:
  *                         tmp = self.sa.arr[ptail+1]             # <<<<<<<<<<<<<<
@@ -37701,7 +37701,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
           __pyx_v_tmp = (__pyx_v_self->sa->arr[(__pyx_v_ptail + 1)]);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":151
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":151
  *                     if k > ptail+1:
  *                         tmp = self.sa.arr[ptail+1]
  *                         self.sa.arr[ptail+1] = self.sa.arr[k]             # <<<<<<<<<<<<<<
@@ -37710,7 +37710,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
  */
           (__pyx_v_self->sa->arr[(__pyx_v_ptail + 1)]) = (__pyx_v_self->sa->arr[__pyx_v_k]);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":152
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":152
  *                         tmp = self.sa.arr[ptail+1]
  *                         self.sa.arr[ptail+1] = self.sa.arr[k]
  *                         self.sa.arr[k] = tmp             # <<<<<<<<<<<<<<
@@ -37722,7 +37722,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
         }
         __pyx_L12:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":153
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":153
  *                         self.sa.arr[ptail+1] = self.sa.arr[k]
  *                         self.sa.arr[k] = tmp
  *                     ptail = ptail + 1             # <<<<<<<<<<<<<<
@@ -37737,7 +37737,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
     __pyx_L9:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":156
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":156
  * 
  *         # recursively sort smaller suffixes
  *         self.q3sort(i, phead-1, h, isa, pad+"    ")             # <<<<<<<<<<<<<<
@@ -37777,7 +37777,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
   __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":160
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":160
  *         # update suffixes with pivot value
  *         # corresponds to update_group function in Larsson & Sadakane
  *         for k from phead <= k < ptail+1:             # <<<<<<<<<<<<<<
@@ -37787,7 +37787,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
   __pyx_t_5 = (__pyx_v_ptail + 1);
   for (__pyx_v_k = __pyx_v_phead; __pyx_v_k < __pyx_t_5; __pyx_v_k++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":161
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":161
  *         # corresponds to update_group function in Larsson & Sadakane
  *         for k from phead <= k < ptail+1:
  *             isa.arr[self.sa.arr[k]] = ptail             # <<<<<<<<<<<<<<
@@ -37797,7 +37797,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
     (__pyx_v_isa->arr[(__pyx_v_self->sa->arr[__pyx_v_k])]) = __pyx_v_ptail;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":162
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":162
  *         for k from phead <= k < ptail+1:
  *             isa.arr[self.sa.arr[k]] = ptail
  *         if phead == ptail:             # <<<<<<<<<<<<<<
@@ -37807,7 +37807,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
   __pyx_t_1 = ((__pyx_v_phead == __pyx_v_ptail) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":163
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":163
  *             isa.arr[self.sa.arr[k]] = ptail
  *         if phead == ptail:
  *             self.sa.arr[phead] = -1             # <<<<<<<<<<<<<<
@@ -37819,7 +37819,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
   }
   __pyx_L15:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":166
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":166
  * 
  *         # recursively sort larger suffixes
  *         self.q3sort(ptail+1, j, h, isa, pad+"    ")             # <<<<<<<<<<<<<<
@@ -37859,7 +37859,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":100
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":100
  *         logger.info("Suffix array construction took %f seconds", (monitor_cpu() - start_time))
  * 
  *     def q3sort(self, int i, int j, int h, IntList isa, pad=""):             # <<<<<<<<<<<<<<
@@ -37885,7 +37885,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_6q3sort(struct __pyx_obj_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":169
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":169
  * 
  * 
  *     def write_text(self, char* filename):             # <<<<<<<<<<<<<<
@@ -37930,7 +37930,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_8write_text(struct __pyx_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("write_text", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":170
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":170
  * 
  *     def write_text(self, char* filename):
  *         self.darray.write_text(filename)             # <<<<<<<<<<<<<<
@@ -37952,7 +37952,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_8write_text(struct __pyx_
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":169
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":169
  * 
  * 
  *     def write_text(self, char* filename):             # <<<<<<<<<<<<<<
@@ -37975,7 +37975,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_8write_text(struct __pyx_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":172
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":172
  *         self.darray.write_text(filename)
  * 
  *     def read_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -38015,7 +38015,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_10read_binary(struct __py
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("read_binary", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":174
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":174
  *     def read_binary(self, char* filename):
  *         cdef FILE *f
  *         f = fopen(filename, "r")             # <<<<<<<<<<<<<<
@@ -38024,7 +38024,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_10read_binary(struct __py
  */
   __pyx_v_f = fopen(__pyx_v_filename, __pyx_k_r);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":175
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":175
  *         cdef FILE *f
  *         f = fopen(filename, "r")
  *         self.darray.read_handle(f)             # <<<<<<<<<<<<<<
@@ -38033,7 +38033,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_10read_binary(struct __py
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_DataArray *)__pyx_v_self->darray->__pyx_vtab)->read_handle(__pyx_v_self->darray, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":176
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":176
  *         f = fopen(filename, "r")
  *         self.darray.read_handle(f)
  *         self.sa.read_handle(f)             # <<<<<<<<<<<<<<
@@ -38042,7 +38042,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_10read_binary(struct __py
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->sa->__pyx_vtab)->read_handle(__pyx_v_self->sa, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":177
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":177
  *         self.darray.read_handle(f)
  *         self.sa.read_handle(f)
  *         self.ha.read_handle(f)             # <<<<<<<<<<<<<<
@@ -38051,7 +38051,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_10read_binary(struct __py
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->ha->__pyx_vtab)->read_handle(__pyx_v_self->ha, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":178
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":178
  *         self.sa.read_handle(f)
  *         self.ha.read_handle(f)
  *         fclose(f)             # <<<<<<<<<<<<<<
@@ -38060,7 +38060,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_10read_binary(struct __py
  */
   fclose(__pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":172
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":172
  *         self.darray.write_text(filename)
  * 
  *     def read_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -38075,7 +38075,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_10read_binary(struct __py
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":180
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":180
  *         fclose(f)
  * 
  *     def write_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -38115,7 +38115,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_12write_binary(struct __p
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("write_binary", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":182
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":182
  *     def write_binary(self, char* filename):
  *         cdef FILE* f
  *         f = fopen(filename, "w")             # <<<<<<<<<<<<<<
@@ -38124,7 +38124,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_12write_binary(struct __p
  */
   __pyx_v_f = fopen(__pyx_v_filename, __pyx_k_w);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":183
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":183
  *         cdef FILE* f
  *         f = fopen(filename, "w")
  *         self.darray.write_handle(f)             # <<<<<<<<<<<<<<
@@ -38133,7 +38133,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_12write_binary(struct __p
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_DataArray *)__pyx_v_self->darray->__pyx_vtab)->write_handle(__pyx_v_self->darray, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":184
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":184
  *         f = fopen(filename, "w")
  *         self.darray.write_handle(f)
  *         self.sa.write_handle(f)             # <<<<<<<<<<<<<<
@@ -38142,7 +38142,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_12write_binary(struct __p
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->sa->__pyx_vtab)->write_handle(__pyx_v_self->sa, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":185
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":185
  *         self.darray.write_handle(f)
  *         self.sa.write_handle(f)
  *         self.ha.write_handle(f)             # <<<<<<<<<<<<<<
@@ -38151,7 +38151,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_12write_binary(struct __p
  */
   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_self->ha->__pyx_vtab)->write_handle(__pyx_v_self->ha, __pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":186
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":186
  *         self.sa.write_handle(f)
  *         self.ha.write_handle(f)
  *         fclose(f)             # <<<<<<<<<<<<<<
@@ -38160,7 +38160,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_12write_binary(struct __p
  */
   fclose(__pyx_v_f);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":180
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":180
  *         fclose(f)
  * 
  *     def write_binary(self, char* filename):             # <<<<<<<<<<<<<<
@@ -38175,7 +38175,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_12write_binary(struct __p
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":188
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":188
  *         fclose(f)
  * 
  *     def write_enhanced(self, char* filename):             # <<<<<<<<<<<<<<
@@ -38233,7 +38233,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_14write_enhanced(struct _
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("write_enhanced", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":189
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":189
  * 
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -38273,7 +38273,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_14write_enhanced(struct _
           __pyx_v_f = __pyx_t_4;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":190
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":190
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:
  *             self.darray.write_enhanced_handle(f)             # <<<<<<<<<<<<<<
@@ -38293,7 +38293,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_14write_enhanced(struct _
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":191
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":191
  *         with open(filename, "w") as f:
  *             self.darray.write_enhanced_handle(f)
  *             for a_i in self.sa:             # <<<<<<<<<<<<<<
@@ -38338,7 +38338,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_14write_enhanced(struct _
             __Pyx_XDECREF_SET(__pyx_v_a_i, __pyx_t_1);
             __pyx_t_1 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":192
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":192
  *             self.darray.write_enhanced_handle(f)
  *             for a_i in self.sa:
  *                 f.write("%d " % a_i)             # <<<<<<<<<<<<<<
@@ -38362,7 +38362,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_14write_enhanced(struct _
           }
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":193
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":193
  *             for a_i in self.sa:
  *                 f.write("%d " % a_i)
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -38376,7 +38376,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_14write_enhanced(struct _
           __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":194
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":194
  *                 f.write("%d " % a_i)
  *             f.write("\n")
  *             for w_i in self.ha:             # <<<<<<<<<<<<<<
@@ -38421,7 +38421,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_14write_enhanced(struct _
             __Pyx_XDECREF_SET(__pyx_v_w_i, __pyx_t_2);
             __pyx_t_2 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":195
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":195
  *             f.write("\n")
  *             for w_i in self.ha:
  *                 f.write("%d " % w_i)             # <<<<<<<<<<<<<<
@@ -38445,7 +38445,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_14write_enhanced(struct _
           }
           __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":196
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":196
  *             for w_i in self.ha:
  *                 f.write("%d " % w_i)
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -38469,7 +38469,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_14write_enhanced(struct _
         __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0;
         __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":189
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":189
  * 
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -38540,7 +38540,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_14write_enhanced(struct _
     __pyx_L23:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":188
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":188
  *         fclose(f)
  * 
  *     def write_enhanced(self, char* filename):             # <<<<<<<<<<<<<<
@@ -38567,7 +38567,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_14write_enhanced(struct _
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":198
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":198
  *             f.write("\n")
  * 
  *     cdef int __search_high(self, int word_id, int offset, int low, int high):             # <<<<<<<<<<<<<<
@@ -38582,7 +38582,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_high(struct __pyx_obj_4
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("__search_high", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":201
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":201
  *         cdef int midpoint
  * 
  *         if low >= high:             # <<<<<<<<<<<<<<
@@ -38592,7 +38592,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_high(struct __pyx_obj_4
   __pyx_t_1 = ((__pyx_v_low >= __pyx_v_high) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":202
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":202
  * 
  *         if low >= high:
  *             return high             # <<<<<<<<<<<<<<
@@ -38603,7 +38603,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_high(struct __pyx_obj_4
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":203
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":203
  *         if low >= high:
  *             return high
  *         midpoint = (high + low) / 2             # <<<<<<<<<<<<<<
@@ -38612,7 +38612,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_high(struct __pyx_obj_4
  */
   __pyx_v_midpoint = __Pyx_div_long((__pyx_v_high + __pyx_v_low), 2);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":204
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":204
  *             return high
  *         midpoint = (high + low) / 2
  *         if self.darray.data.arr[self.sa.arr[midpoint] + offset] == word_id:             # <<<<<<<<<<<<<<
@@ -38622,7 +38622,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_high(struct __pyx_obj_4
   __pyx_t_1 = (((__pyx_v_self->darray->data->arr[((__pyx_v_self->sa->arr[__pyx_v_midpoint]) + __pyx_v_offset)]) == __pyx_v_word_id) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":205
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":205
  *         midpoint = (high + low) / 2
  *         if self.darray.data.arr[self.sa.arr[midpoint] + offset] == word_id:
  *             return self.__search_high(word_id, offset, midpoint+1, high)             # <<<<<<<<<<<<<<
@@ -38634,7 +38634,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_high(struct __pyx_obj_4
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":207
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":207
  *             return self.__search_high(word_id, offset, midpoint+1, high)
  *         else:
  *             return self.__search_high(word_id, offset, low, midpoint)             # <<<<<<<<<<<<<<
@@ -38645,7 +38645,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_high(struct __pyx_obj_4
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":198
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":198
  *             f.write("\n")
  * 
  *     cdef int __search_high(self, int word_id, int offset, int low, int high):             # <<<<<<<<<<<<<<
@@ -38659,7 +38659,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_high(struct __pyx_obj_4
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":209
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":209
  *             return self.__search_high(word_id, offset, low, midpoint)
  * 
  *     cdef int __search_low(self, int word_id, int offset, int low, int high):             # <<<<<<<<<<<<<<
@@ -38674,7 +38674,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_low(struct __pyx_obj_4c
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("__search_low", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":212
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":212
  *         cdef int midpoint
  * 
  *         if low >= high:             # <<<<<<<<<<<<<<
@@ -38684,7 +38684,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_low(struct __pyx_obj_4c
   __pyx_t_1 = ((__pyx_v_low >= __pyx_v_high) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":213
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":213
  * 
  *         if low >= high:
  *             return high             # <<<<<<<<<<<<<<
@@ -38695,7 +38695,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_low(struct __pyx_obj_4c
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":214
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":214
  *         if low >= high:
  *             return high
  *         midpoint = (high + low) / 2             # <<<<<<<<<<<<<<
@@ -38704,7 +38704,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_low(struct __pyx_obj_4c
  */
   __pyx_v_midpoint = __Pyx_div_long((__pyx_v_high + __pyx_v_low), 2);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":215
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":215
  *             return high
  *         midpoint = (high + low) / 2
  *         if self.darray.data.arr[self.sa.arr[midpoint] + offset] == word_id:             # <<<<<<<<<<<<<<
@@ -38714,7 +38714,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_low(struct __pyx_obj_4c
   __pyx_t_1 = (((__pyx_v_self->darray->data->arr[((__pyx_v_self->sa->arr[__pyx_v_midpoint]) + __pyx_v_offset)]) == __pyx_v_word_id) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":216
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":216
  *         midpoint = (high + low) / 2
  *         if self.darray.data.arr[self.sa.arr[midpoint] + offset] == word_id:
  *             return self.__search_low(word_id, offset, low, midpoint)             # <<<<<<<<<<<<<<
@@ -38726,7 +38726,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_low(struct __pyx_obj_4c
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":218
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":218
  *             return self.__search_low(word_id, offset, low, midpoint)
  *         else:
  *             return self.__search_low(word_id, offset, midpoint+1, high)             # <<<<<<<<<<<<<<
@@ -38737,7 +38737,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_low(struct __pyx_obj_4c
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":209
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":209
  *             return self.__search_high(word_id, offset, low, midpoint)
  * 
  *     cdef int __search_low(self, int word_id, int offset, int low, int high):             # <<<<<<<<<<<<<<
@@ -38751,7 +38751,7 @@ static int __pyx_f_4cdec_2sa_3_sa_11SuffixArray___search_low(struct __pyx_obj_4c
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":220
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":220
  *             return self.__search_low(word_id, offset, midpoint+1, high)
  * 
  *     cdef __get_range(self, int word_id, int offset, int low, int high, int midpoint):             # <<<<<<<<<<<<<<
@@ -38770,7 +38770,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___get_range(struct __pyx_o
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__get_range", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":221
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":221
  * 
  *     cdef __get_range(self, int word_id, int offset, int low, int high, int midpoint):
  *         return (self.__search_low(word_id, offset, low, midpoint),             # <<<<<<<<<<<<<<
@@ -38781,7 +38781,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___get_range(struct __pyx_o
   __pyx_t_1 = __Pyx_PyInt_From_int(((struct __pyx_vtabstruct_4cdec_2sa_3_sa_SuffixArray *)__pyx_v_self->__pyx_vtab)->__pyx___search_low(__pyx_v_self, __pyx_v_word_id, __pyx_v_offset, __pyx_v_low, __pyx_v_midpoint)); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[12]; __pyx_lineno = 221; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":222
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":222
  *     cdef __get_range(self, int word_id, int offset, int low, int high, int midpoint):
  *         return (self.__search_low(word_id, offset, low, midpoint),
  *                 self.__search_high(word_id, offset, midpoint, high))             # <<<<<<<<<<<<<<
@@ -38791,7 +38791,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___get_range(struct __pyx_o
   __pyx_t_2 = __Pyx_PyInt_From_int(((struct __pyx_vtabstruct_4cdec_2sa_3_sa_SuffixArray *)__pyx_v_self->__pyx_vtab)->__pyx___search_high(__pyx_v_self, __pyx_v_word_id, __pyx_v_offset, __pyx_v_midpoint, __pyx_v_high)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[12]; __pyx_lineno = 222; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":221
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":221
  * 
  *     cdef __get_range(self, int word_id, int offset, int low, int high, int midpoint):
  *         return (self.__search_low(word_id, offset, low, midpoint),             # <<<<<<<<<<<<<<
@@ -38810,7 +38810,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___get_range(struct __pyx_o
   __pyx_t_3 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":220
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":220
  *             return self.__search_low(word_id, offset, midpoint+1, high)
  * 
  *     cdef __get_range(self, int word_id, int offset, int low, int high, int midpoint):             # <<<<<<<<<<<<<<
@@ -38831,7 +38831,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___get_range(struct __pyx_o
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":224
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":224
  *                 self.__search_high(word_id, offset, midpoint, high))
  * 
  *     cdef __lookup_helper(self, int word_id, int offset, int low, int high):             # <<<<<<<<<<<<<<
@@ -38852,7 +38852,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___lookup_helper(struct __p
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__lookup_helper", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":227
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":227
  *         cdef int midpoint
  * 
  *         if offset == 0:             # <<<<<<<<<<<<<<
@@ -38862,7 +38862,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___lookup_helper(struct __p
   __pyx_t_1 = ((__pyx_v_offset == 0) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":228
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":228
  * 
  *         if offset == 0:
  *             return (self.ha.arr[word_id], self.ha.arr[word_id+1])             # <<<<<<<<<<<<<<
@@ -38887,7 +38887,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___lookup_helper(struct __p
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":229
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":229
  *         if offset == 0:
  *             return (self.ha.arr[word_id], self.ha.arr[word_id+1])
  *         if low >= high:             # <<<<<<<<<<<<<<
@@ -38897,7 +38897,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___lookup_helper(struct __p
   __pyx_t_1 = ((__pyx_v_low >= __pyx_v_high) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":230
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":230
  *             return (self.ha.arr[word_id], self.ha.arr[word_id+1])
  *         if low >= high:
  *             return None             # <<<<<<<<<<<<<<
@@ -38910,7 +38910,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___lookup_helper(struct __p
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":232
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":232
  *             return None
  * 
  *         midpoint = (high + low) / 2             # <<<<<<<<<<<<<<
@@ -38919,7 +38919,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___lookup_helper(struct __p
  */
   __pyx_v_midpoint = __Pyx_div_long((__pyx_v_high + __pyx_v_low), 2);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":233
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":233
  * 
  *         midpoint = (high + low) / 2
  *         if self.darray.data.arr[self.sa.arr[midpoint] + offset] == word_id:             # <<<<<<<<<<<<<<
@@ -38929,7 +38929,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___lookup_helper(struct __p
   __pyx_t_1 = (((__pyx_v_self->darray->data->arr[((__pyx_v_self->sa->arr[__pyx_v_midpoint]) + __pyx_v_offset)]) == __pyx_v_word_id) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":234
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":234
  *         midpoint = (high + low) / 2
  *         if self.darray.data.arr[self.sa.arr[midpoint] + offset] == word_id:
  *             return self.__get_range(word_id, offset, low, high, midpoint)             # <<<<<<<<<<<<<<
@@ -38944,7 +38944,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___lookup_helper(struct __p
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":235
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":235
  *         if self.darray.data.arr[self.sa.arr[midpoint] + offset] == word_id:
  *             return self.__get_range(word_id, offset, low, high, midpoint)
  *         if self.darray.data.arr[self.sa.arr[midpoint] + offset] > word_id:             # <<<<<<<<<<<<<<
@@ -38954,7 +38954,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___lookup_helper(struct __p
   __pyx_t_1 = (((__pyx_v_self->darray->data->arr[((__pyx_v_self->sa->arr[__pyx_v_midpoint]) + __pyx_v_offset)]) > __pyx_v_word_id) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":236
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":236
  *             return self.__get_range(word_id, offset, low, high, midpoint)
  *         if self.darray.data.arr[self.sa.arr[midpoint] + offset] > word_id:
  *             return self.__lookup_helper(word_id, offset, low, midpoint)             # <<<<<<<<<<<<<<
@@ -38970,7 +38970,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___lookup_helper(struct __p
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":238
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":238
  *             return self.__lookup_helper(word_id, offset, low, midpoint)
  *         else:
  *             return self.__lookup_helper(word_id, offset, midpoint+1, high)             # <<<<<<<<<<<<<<
@@ -38985,7 +38985,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___lookup_helper(struct __p
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":224
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":224
  *                 self.__search_high(word_id, offset, midpoint, high))
  * 
  *     cdef __lookup_helper(self, int word_id, int offset, int low, int high):             # <<<<<<<<<<<<<<
@@ -39006,7 +39006,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_11SuffixArray___lookup_helper(struct __p
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":240
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":240
  *             return self.__lookup_helper(word_id, offset, midpoint+1, high)
  * 
  *     def lookup(self, word, int offset, int low, int high):             # <<<<<<<<<<<<<<
@@ -39107,7 +39107,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_16lookup(struct __pyx_obj
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("lookup", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":242
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":242
  *     def lookup(self, word, int offset, int low, int high):
  *         cdef int wordid
  *         if low == -1:             # <<<<<<<<<<<<<<
@@ -39117,7 +39117,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_16lookup(struct __pyx_obj
   __pyx_t_1 = ((__pyx_v_low == -1) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":243
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":243
  *         cdef int wordid
  *         if low == -1:
  *             low = 0             # <<<<<<<<<<<<<<
@@ -39129,7 +39129,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_16lookup(struct __pyx_obj
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":244
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":244
  *         if low == -1:
  *             low = 0
  *         if high == -1:             # <<<<<<<<<<<<<<
@@ -39139,7 +39139,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_16lookup(struct __pyx_obj
   __pyx_t_1 = ((__pyx_v_high == -1) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":245
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":245
  *             low = 0
  *         if high == -1:
  *             high = len(self.sa)             # <<<<<<<<<<<<<<
@@ -39155,7 +39155,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_16lookup(struct __pyx_obj
   }
   __pyx_L4:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":246
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":246
  *         if high == -1:
  *             high = len(self.sa)
  *         if word in self.darray.word2id:             # <<<<<<<<<<<<<<
@@ -39166,7 +39166,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_16lookup(struct __pyx_obj
   __pyx_t_4 = (__pyx_t_1 != 0);
   if (__pyx_t_4) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":247
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":247
  *             high = len(self.sa)
  *         if word in self.darray.word2id:
  *             word_id = self.darray.word2id[word]             # <<<<<<<<<<<<<<
@@ -39178,7 +39178,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_16lookup(struct __pyx_obj
     __pyx_v_word_id = __pyx_t_2;
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":248
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":248
  *         if word in self.darray.word2id:
  *             word_id = self.darray.word2id[word]
  *             return self.__lookup_helper(word_id, offset, low, high)             # <<<<<<<<<<<<<<
@@ -39195,7 +39195,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_16lookup(struct __pyx_obj
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":250
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":250
  *             return self.__lookup_helper(word_id, offset, low, high)
  *         else:
  *             return None             # <<<<<<<<<<<<<<
@@ -39206,7 +39206,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_16lookup(struct __pyx_obj
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":240
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":240
  *             return self.__lookup_helper(word_id, offset, midpoint+1, high)
  * 
  *     def lookup(self, word, int offset, int low, int high):             # <<<<<<<<<<<<<<
@@ -39226,7 +39226,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_11SuffixArray_16lookup(struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":43
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":43
  *     cdef public phrases_al
  * 
  *     def __cinit__(self):             # <<<<<<<<<<<<<<
@@ -39250,7 +39250,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_11OnlineStats_1__cinit__(PyObject *__pyx_v_se
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":50
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":50
  *         self.phrases_f = defaultdict(int)
  *         self.phrases_e = defaultdict(int)
  *         self.phrases_fe = defaultdict(lambda: defaultdict(int))             # <<<<<<<<<<<<<<
@@ -39311,7 +39311,7 @@ static PyObject *__pyx_lambda_funcdef_lambda1(CYTHON_UNUSED PyObject *__pyx_self
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":51
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":51
  *         self.phrases_e = defaultdict(int)
  *         self.phrases_fe = defaultdict(lambda: defaultdict(int))
  *         self.phrases_al = defaultdict(lambda: defaultdict(tuple))             # <<<<<<<<<<<<<<
@@ -39372,7 +39372,7 @@ static PyObject *__pyx_lambda_funcdef_lambda2(CYTHON_UNUSED PyObject *__pyx_self
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":43
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":43
  *     cdef public phrases_al
  * 
  *     def __cinit__(self):             # <<<<<<<<<<<<<<
@@ -39391,7 +39391,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11OnlineStats___cinit__(struct __pyx_obj_4cde
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":45
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":45
  *     def __cinit__(self):
  *         # Keep track of everything that can be sampled:
  *         self.samples_f = defaultdict(int)             # <<<<<<<<<<<<<<
@@ -39415,7 +39415,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11OnlineStats___cinit__(struct __pyx_obj_4cde
   __pyx_v_self->samples_f = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":48
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":48
  * 
  *         # Phrase counts
  *         self.phrases_f = defaultdict(int)             # <<<<<<<<<<<<<<
@@ -39439,7 +39439,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11OnlineStats___cinit__(struct __pyx_obj_4cde
   __pyx_v_self->phrases_f = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":49
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":49
  *         # Phrase counts
  *         self.phrases_f = defaultdict(int)
  *         self.phrases_e = defaultdict(int)             # <<<<<<<<<<<<<<
@@ -39463,7 +39463,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11OnlineStats___cinit__(struct __pyx_obj_4cde
   __pyx_v_self->phrases_e = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":50
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":50
  *         self.phrases_f = defaultdict(int)
  *         self.phrases_e = defaultdict(int)
  *         self.phrases_fe = defaultdict(lambda: defaultdict(int))             # <<<<<<<<<<<<<<
@@ -39489,7 +39489,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11OnlineStats___cinit__(struct __pyx_obj_4cde
   __pyx_v_self->phrases_fe = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":51
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":51
  *         self.phrases_e = defaultdict(int)
  *         self.phrases_fe = defaultdict(lambda: defaultdict(int))
  *         self.phrases_al = defaultdict(lambda: defaultdict(tuple))             # <<<<<<<<<<<<<<
@@ -39515,7 +39515,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11OnlineStats___cinit__(struct __pyx_obj_4cde
   __pyx_v_self->phrases_al = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":43
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":43
  *     cdef public phrases_al
  * 
  *     def __cinit__(self):             # <<<<<<<<<<<<<<
@@ -39537,7 +39537,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11OnlineStats___cinit__(struct __pyx_obj_4cde
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":37
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":37
  * 
  * cdef class OnlineStats:
  *     cdef public samples_f             # <<<<<<<<<<<<<<
@@ -39632,7 +39632,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11OnlineStats_9samples_f_4__del__(struct __py
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":38
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":38
  * cdef class OnlineStats:
  *     cdef public samples_f
  *     cdef public phrases_f             # <<<<<<<<<<<<<<
@@ -39727,7 +39727,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11OnlineStats_9phrases_f_4__del__(struct __py
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":39
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":39
  *     cdef public samples_f
  *     cdef public phrases_f
  *     cdef public phrases_e             # <<<<<<<<<<<<<<
@@ -39822,7 +39822,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11OnlineStats_9phrases_e_4__del__(struct __py
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":40
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":40
  *     cdef public phrases_f
  *     cdef public phrases_e
  *     cdef public phrases_fe             # <<<<<<<<<<<<<<
@@ -39917,7 +39917,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11OnlineStats_10phrases_fe_4__del__(struct __
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":41
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":41
  *     cdef public phrases_e
  *     cdef public phrases_fe
  *     cdef public phrases_al             # <<<<<<<<<<<<<<
@@ -40012,7 +40012,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_11OnlineStats_10phrases_al_4__del__(struct __
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":63
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":63
  *     cdef public children
  * 
  *     def __cinit__(self):             # <<<<<<<<<<<<<<
@@ -40045,7 +40045,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_8TrieNode___cinit__(struct __pyx_obj_4cdec_2s
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":64
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":64
  * 
  *     def __cinit__(self):
  *         self.children = {}             # <<<<<<<<<<<<<<
@@ -40060,7 +40060,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_8TrieNode___cinit__(struct __pyx_obj_4cdec_2s
   __pyx_v_self->children = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":63
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":63
  *     cdef public children
  * 
  *     def __cinit__(self):             # <<<<<<<<<<<<<<
@@ -40080,7 +40080,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_8TrieNode___cinit__(struct __pyx_obj_4cdec_2s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":61
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":61
  * 
  * cdef class TrieNode:
  *     cdef public children             # <<<<<<<<<<<<<<
@@ -40175,7 +40175,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_8TrieNode_8children_4__del__(struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":71
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":71
  *     cdef public suffix_link
  * 
  *     def __cinit__(self, phrase=None, phrase_location=None, suffix_link=None):             # <<<<<<<<<<<<<<
@@ -40265,7 +40265,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_16ExtendedTrieNode___cinit__(struct __pyx_obj
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":72
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":72
  * 
  *     def __cinit__(self, phrase=None, phrase_location=None, suffix_link=None):
  *         self.phrase = phrase             # <<<<<<<<<<<<<<
@@ -40278,7 +40278,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_16ExtendedTrieNode___cinit__(struct __pyx_obj
   __Pyx_DECREF(__pyx_v_self->phrase);
   __pyx_v_self->phrase = __pyx_v_phrase;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":73
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":73
  *     def __cinit__(self, phrase=None, phrase_location=None, suffix_link=None):
  *         self.phrase = phrase
  *         self.phrase_location = phrase_location             # <<<<<<<<<<<<<<
@@ -40291,7 +40291,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_16ExtendedTrieNode___cinit__(struct __pyx_obj
   __Pyx_DECREF(__pyx_v_self->phrase_location);
   __pyx_v_self->phrase_location = __pyx_v_phrase_location;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":74
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":74
  *         self.phrase = phrase
  *         self.phrase_location = phrase_location
  *         self.suffix_link = suffix_link             # <<<<<<<<<<<<<<
@@ -40304,7 +40304,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_16ExtendedTrieNode___cinit__(struct __pyx_obj
   __Pyx_DECREF(__pyx_v_self->suffix_link);
   __pyx_v_self->suffix_link = __pyx_v_suffix_link;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":71
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":71
  *     cdef public suffix_link
  * 
  *     def __cinit__(self, phrase=None, phrase_location=None, suffix_link=None):             # <<<<<<<<<<<<<<
@@ -40318,7 +40318,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_16ExtendedTrieNode___cinit__(struct __pyx_obj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":67
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":67
  * 
  * cdef class ExtendedTrieNode(TrieNode):
  *     cdef public phrase             # <<<<<<<<<<<<<<
@@ -40413,7 +40413,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_16ExtendedTrieNode_6phrase_4__del__(struct __
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":68
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":68
  * cdef class ExtendedTrieNode(TrieNode):
  *     cdef public phrase
  *     cdef public phrase_location             # <<<<<<<<<<<<<<
@@ -40508,7 +40508,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_16ExtendedTrieNode_15phrase_location_4__del__
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":69
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":69
  *     cdef public phrase
  *     cdef public phrase_location
  *     cdef public suffix_link             # <<<<<<<<<<<<<<
@@ -40603,7 +40603,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_16ExtendedTrieNode_11suffix_link_4__del__(str
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":81
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":81
  *     cdef public int count
  *     cdef public root
  *     def __cinit__(self, extended=False):             # <<<<<<<<<<<<<<
@@ -40679,7 +40679,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9TrieTable___cinit__(struct __pyx_obj_4cdec_2
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":82
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":82
  *     cdef public root
  *     def __cinit__(self, extended=False):
  *         self.count = 0             # <<<<<<<<<<<<<<
@@ -40688,7 +40688,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9TrieTable___cinit__(struct __pyx_obj_4cdec_2
  */
   __pyx_v_self->count = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":83
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":83
  *     def __cinit__(self, extended=False):
  *         self.count = 0
  *         self.extended = extended             # <<<<<<<<<<<<<<
@@ -40698,7 +40698,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9TrieTable___cinit__(struct __pyx_obj_4cdec_2
   __pyx_t_1 = __Pyx_PyInt_As_int(__pyx_v_extended); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_self->extended = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":84
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":84
  *         self.count = 0
  *         self.extended = extended
  *         if extended:             # <<<<<<<<<<<<<<
@@ -40708,7 +40708,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9TrieTable___cinit__(struct __pyx_obj_4cdec_2
   __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_extended); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":85
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":85
  *         self.extended = extended
  *         if extended:
  *             self.root = ExtendedTrieNode()             # <<<<<<<<<<<<<<
@@ -40726,7 +40726,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9TrieTable___cinit__(struct __pyx_obj_4cdec_2
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":87
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":87
  *             self.root = ExtendedTrieNode()
  *         else:
  *             self.root = TrieNode()             # <<<<<<<<<<<<<<
@@ -40743,7 +40743,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9TrieTable___cinit__(struct __pyx_obj_4cdec_2
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":81
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":81
  *     cdef public int count
  *     cdef public root
  *     def __cinit__(self, extended=False):             # <<<<<<<<<<<<<<
@@ -40763,7 +40763,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9TrieTable___cinit__(struct __pyx_obj_4cdec_2
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":78
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":78
  * 
  * cdef class TrieTable:
  *     cdef public int extended             # <<<<<<<<<<<<<<
@@ -40845,7 +40845,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9TrieTable_8extended_2__set__(struct __pyx_ob
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":79
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":79
  * cdef class TrieTable:
  *     cdef public int extended
  *     cdef public int count             # <<<<<<<<<<<<<<
@@ -40927,7 +40927,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9TrieTable_5count_2__set__(struct __pyx_obj_4
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":80
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":80
  *     cdef public int extended
  *     cdef public int count
  *     cdef public root             # <<<<<<<<<<<<<<
@@ -41022,7 +41022,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_9TrieTable_4root_4__del__(struct __pyx_obj_4c
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":107
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":107
  * 
  *     # returns true if sent_id is contained
  *     cdef int contains(self, int sent_id):             # <<<<<<<<<<<<<<
@@ -41035,7 +41035,7 @@ static int __pyx_f_4cdec_2sa_3_sa_14PhraseLocation_contains(CYTHON_UNUSED struct
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("contains", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":108
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":108
  *     # returns true if sent_id is contained
  *     cdef int contains(self, int sent_id):
  *         return 1             # <<<<<<<<<<<<<<
@@ -41045,7 +41045,7 @@ static int __pyx_f_4cdec_2sa_3_sa_14PhraseLocation_contains(CYTHON_UNUSED struct
   __pyx_r = 1;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":107
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":107
  * 
  *     # returns true if sent_id is contained
  *     cdef int contains(self, int sent_id):             # <<<<<<<<<<<<<<
@@ -41059,7 +41059,7 @@ static int __pyx_f_4cdec_2sa_3_sa_14PhraseLocation_contains(CYTHON_UNUSED struct
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":110
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":110
  *         return 1
  * 
  *     def __cinit__(self, int sa_low=-1, int sa_high=-1, int arr_low=-1, int arr_high=-1,             # <<<<<<<<<<<<<<
@@ -41086,7 +41086,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_14PhraseLocation_1__cinit__(PyObject *__pyx_v
     static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_sa_low,&__pyx_n_s_sa_high,&__pyx_n_s_arr_low,&__pyx_n_s_arr_high,&__pyx_n_s_arr,&__pyx_n_s_num_subpatterns,0};
     PyObject* values[6] = {0,0,0,0,0,0};
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":111
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":111
  * 
  *     def __cinit__(self, int sa_low=-1, int sa_high=-1, int arr_low=-1, int arr_high=-1,
  *             arr=None, int num_subpatterns=1):             # <<<<<<<<<<<<<<
@@ -41192,7 +41192,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_14PhraseLocation_1__cinit__(PyObject *__pyx_v
   __pyx_L4_argument_unpacking_done:;
   __pyx_r = __pyx_pf_4cdec_2sa_3_sa_14PhraseLocation___cinit__(((struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *)__pyx_v_self), __pyx_v_sa_low, __pyx_v_sa_high, __pyx_v_arr_low, __pyx_v_arr_high, __pyx_v_arr, __pyx_v_num_subpatterns);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":110
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":110
  *         return 1
  * 
  *     def __cinit__(self, int sa_low=-1, int sa_high=-1, int arr_low=-1, int arr_high=-1,             # <<<<<<<<<<<<<<
@@ -41214,7 +41214,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14PhraseLocation___cinit__(struct __pyx_obj_4
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":112
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":112
  *     def __cinit__(self, int sa_low=-1, int sa_high=-1, int arr_low=-1, int arr_high=-1,
  *             arr=None, int num_subpatterns=1):
  *         self.sa_low = sa_low             # <<<<<<<<<<<<<<
@@ -41223,7 +41223,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14PhraseLocation___cinit__(struct __pyx_obj_4
  */
   __pyx_v_self->sa_low = __pyx_v_sa_low;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":113
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":113
  *             arr=None, int num_subpatterns=1):
  *         self.sa_low = sa_low
  *         self.sa_high = sa_high             # <<<<<<<<<<<<<<
@@ -41232,7 +41232,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14PhraseLocation___cinit__(struct __pyx_obj_4
  */
   __pyx_v_self->sa_high = __pyx_v_sa_high;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":114
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":114
  *         self.sa_low = sa_low
  *         self.sa_high = sa_high
  *         self.arr_low = arr_low             # <<<<<<<<<<<<<<
@@ -41241,7 +41241,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14PhraseLocation___cinit__(struct __pyx_obj_4
  */
   __pyx_v_self->arr_low = __pyx_v_arr_low;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":115
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":115
  *         self.sa_high = sa_high
  *         self.arr_low = arr_low
  *         self.arr_high = arr_high             # <<<<<<<<<<<<<<
@@ -41250,7 +41250,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14PhraseLocation___cinit__(struct __pyx_obj_4
  */
   __pyx_v_self->arr_high = __pyx_v_arr_high;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":116
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":116
  *         self.arr_low = arr_low
  *         self.arr_high = arr_high
  *         self.arr = arr             # <<<<<<<<<<<<<<
@@ -41266,7 +41266,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14PhraseLocation___cinit__(struct __pyx_obj_4
   __pyx_v_self->arr = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":117
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":117
  *         self.arr_high = arr_high
  *         self.arr = arr
  *         self.num_subpatterns = num_subpatterns             # <<<<<<<<<<<<<<
@@ -41275,7 +41275,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14PhraseLocation___cinit__(struct __pyx_obj_4
  */
   __pyx_v_self->num_subpatterns = __pyx_v_num_subpatterns;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":110
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":110
  *         return 1
  * 
  *     def __cinit__(self, int sa_low=-1, int sa_high=-1, int arr_low=-1, int arr_high=-1,             # <<<<<<<<<<<<<<
@@ -41295,7 +41295,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_14PhraseLocation___cinit__(struct __pyx_obj_4
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":127
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":127
  *     cdef IntList sa
  * 
  *     def __cinit__(self, int sample_size, SuffixArray fsarray):             # <<<<<<<<<<<<<<
@@ -41381,7 +41381,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7Sampler___cinit__(struct __pyx_obj_4cdec_2sa
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":128
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":128
  * 
  *     def __cinit__(self, int sample_size, SuffixArray fsarray):
  *         self.sample_size = sample_size             # <<<<<<<<<<<<<<
@@ -41390,7 +41390,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7Sampler___cinit__(struct __pyx_obj_4cdec_2sa
  */
   __pyx_v_self->sample_size = __pyx_v_sample_size;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":129
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":129
  *     def __cinit__(self, int sample_size, SuffixArray fsarray):
  *         self.sample_size = sample_size
  *         self.sa = fsarray.sa             # <<<<<<<<<<<<<<
@@ -41405,7 +41405,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7Sampler___cinit__(struct __pyx_obj_4cdec_2sa
   __pyx_v_self->sa = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":130
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":130
  *         self.sample_size = sample_size
  *         self.sa = fsarray.sa
  *         if sample_size > 0:             # <<<<<<<<<<<<<<
@@ -41415,7 +41415,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7Sampler___cinit__(struct __pyx_obj_4cdec_2sa
   __pyx_t_2 = ((__pyx_v_sample_size > 0) != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":131
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":131
  *         self.sa = fsarray.sa
  *         if sample_size > 0:
  *             logger.info("Sampling strategy: uniform, max sample size = %d", sample_size)             # <<<<<<<<<<<<<<
@@ -41446,7 +41446,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7Sampler___cinit__(struct __pyx_obj_4cdec_2sa
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":133
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":133
  *             logger.info("Sampling strategy: uniform, max sample size = %d", sample_size)
  *         else:
  *             logger.info("Sampling strategy: no sampling")             # <<<<<<<<<<<<<<
@@ -41465,7 +41465,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7Sampler___cinit__(struct __pyx_obj_4cdec_2sa
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":127
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":127
  *     cdef IntList sa
  * 
  *     def __cinit__(self, int sample_size, SuffixArray fsarray):             # <<<<<<<<<<<<<<
@@ -41487,7 +41487,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_7Sampler___cinit__(struct __pyx_obj_4cdec_2sa
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":135
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":135
  *             logger.info("Sampling strategy: no sampling")
  * 
  *     def sample(self, PhraseLocation phrase_location):             # <<<<<<<<<<<<<<
@@ -41536,7 +41536,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("sample", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":148
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":148
  *         cdef int num_locations, val, j
  * 
  *         sample = IntList()             # <<<<<<<<<<<<<<
@@ -41548,7 +41548,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
   __pyx_v_sample = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":149
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":149
  * 
  *         sample = IntList()
  *         if phrase_location.arr is None:             # <<<<<<<<<<<<<<
@@ -41559,7 +41559,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
   __pyx_t_3 = (__pyx_t_2 != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":150
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":150
  *         sample = IntList()
  *         if phrase_location.arr is None:
  *             num_locations = phrase_location.sa_high - phrase_location.sa_low             # <<<<<<<<<<<<<<
@@ -41568,7 +41568,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
  */
     __pyx_v_num_locations = (__pyx_v_phrase_location->sa_high - __pyx_v_phrase_location->sa_low);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":151
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":151
  *         if phrase_location.arr is None:
  *             num_locations = phrase_location.sa_high - phrase_location.sa_low
  *             if self.sample_size == -1 or num_locations <= self.sample_size:             # <<<<<<<<<<<<<<
@@ -41584,7 +41584,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
     }
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":152
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":152
  *             num_locations = phrase_location.sa_high - phrase_location.sa_low
  *             if self.sample_size == -1 or num_locations <= self.sample_size:
  *                 sample._extend_arr(self.sa.arr + phrase_location.sa_low, num_locations)             # <<<<<<<<<<<<<<
@@ -41596,7 +41596,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":154
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":154
  *                 sample._extend_arr(self.sa.arr + phrase_location.sa_low, num_locations)
  *             else:
  *                 stepsize = float(num_locations)/float(self.sample_size)             # <<<<<<<<<<<<<<
@@ -41615,7 +41615,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
       }
       __pyx_v_stepsize = (((double)__pyx_v_num_locations) / ((double)__pyx_v_self->sample_size));
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":155
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":155
  *             else:
  *                 stepsize = float(num_locations)/float(self.sample_size)
  *                 i = phrase_location.sa_low             # <<<<<<<<<<<<<<
@@ -41625,7 +41625,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
       __pyx_t_5 = __pyx_v_phrase_location->sa_low;
       __pyx_v_i = __pyx_t_5;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":156
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":156
  *                 stepsize = float(num_locations)/float(self.sample_size)
  *                 i = phrase_location.sa_low
  *                 while i < phrase_location.sa_high and sample.len < self.sample_size:             # <<<<<<<<<<<<<<
@@ -41642,7 +41642,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
         }
         if (!__pyx_t_2) break;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":159
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":159
  *                     '''Note: int(i) not guaranteed to have the desired
  *                     effect, according to the python documentation'''
  *                     if fmod(i,1.0) > 0.5:             # <<<<<<<<<<<<<<
@@ -41652,7 +41652,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
         __pyx_t_2 = ((fmod(__pyx_v_i, 1.0) > 0.5) != 0);
         if (__pyx_t_2) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":160
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":160
  *                     effect, according to the python documentation'''
  *                     if fmod(i,1.0) > 0.5:
  *                         val = int(ceil(i))             # <<<<<<<<<<<<<<
@@ -41664,7 +41664,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
         }
         /*else*/ {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":162
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":162
  *                         val = int(ceil(i))
  *                     else:
  *                         val = int(floor(i))             # <<<<<<<<<<<<<<
@@ -41675,7 +41675,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
         }
         __pyx_L7:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":163
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":163
  *                     else:
  *                         val = int(floor(i))
  *                     sample._append(self.sa.arr[val])             # <<<<<<<<<<<<<<
@@ -41684,7 +41684,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
  */
         ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_sample->__pyx_vtab)->_append(__pyx_v_sample, (__pyx_v_self->sa->arr[__pyx_v_val]));
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":164
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":164
  *                         val = int(floor(i))
  *                     sample._append(self.sa.arr[val])
  *                     i = i + stepsize             # <<<<<<<<<<<<<<
@@ -41699,7 +41699,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":166
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":166
  *                     i = i + stepsize
  *         else:
  *             num_locations = (phrase_location.arr_high - phrase_location.arr_low) / phrase_location.num_subpatterns             # <<<<<<<<<<<<<<
@@ -41729,7 +41729,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
     }
     __pyx_v_num_locations = __Pyx_div_int(__pyx_t_5, __pyx_v_phrase_location->num_subpatterns);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":167
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":167
  *         else:
  *             num_locations = (phrase_location.arr_high - phrase_location.arr_low) / phrase_location.num_subpatterns
  *             if self.sample_size == -1 or num_locations <= self.sample_size:             # <<<<<<<<<<<<<<
@@ -41745,7 +41745,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
     }
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":168
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":168
  *             num_locations = (phrase_location.arr_high - phrase_location.arr_low) / phrase_location.num_subpatterns
  *             if self.sample_size == -1 or num_locations <= self.sample_size:
  *                 sample = phrase_location.arr             # <<<<<<<<<<<<<<
@@ -41760,7 +41760,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":170
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":170
  *                 sample = phrase_location.arr
  *             else:
  *                 stepsize = float(num_locations)/float(self.sample_size)             # <<<<<<<<<<<<<<
@@ -41779,7 +41779,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
       }
       __pyx_v_stepsize = (((double)__pyx_v_num_locations) / ((double)__pyx_v_self->sample_size));
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":171
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":171
  *             else:
  *                 stepsize = float(num_locations)/float(self.sample_size)
  *                 i = phrase_location.arr_low             # <<<<<<<<<<<<<<
@@ -41789,7 +41789,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
       __pyx_t_5 = __pyx_v_phrase_location->arr_low;
       __pyx_v_i = __pyx_t_5;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":172
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":172
  *                 stepsize = float(num_locations)/float(self.sample_size)
  *                 i = phrase_location.arr_low
  *                 while i < num_locations and sample.len < self.sample_size * phrase_location.num_subpatterns:             # <<<<<<<<<<<<<<
@@ -41806,7 +41806,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
         }
         if (!__pyx_t_4) break;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":175
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":175
  *                     '''Note: int(i) not guaranteed to have the desired
  *                     effect, according to the python documentation'''
  *                     if fmod(i,1.0) > 0.5:             # <<<<<<<<<<<<<<
@@ -41816,7 +41816,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
         __pyx_t_4 = ((fmod(__pyx_v_i, 1.0) > 0.5) != 0);
         if (__pyx_t_4) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":176
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":176
  *                     effect, according to the python documentation'''
  *                     if fmod(i,1.0) > 0.5:
  *                         val = int(ceil(i))             # <<<<<<<<<<<<<<
@@ -41828,7 +41828,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
         }
         /*else*/ {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":178
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":178
  *                         val = int(ceil(i))
  *                     else:
  *                         val = int(floor(i))             # <<<<<<<<<<<<<<
@@ -41839,7 +41839,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
         }
         __pyx_L11:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":179
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":179
  *                     else:
  *                         val = int(floor(i))
  *                     j = phrase_location.arr_low + (val*phrase_location.num_subpatterns)             # <<<<<<<<<<<<<<
@@ -41848,7 +41848,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
  */
         __pyx_v_j = (__pyx_v_phrase_location->arr_low + (__pyx_v_val * __pyx_v_phrase_location->num_subpatterns));
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":180
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":180
  *                         val = int(floor(i))
  *                     j = phrase_location.arr_low + (val*phrase_location.num_subpatterns)
  *                     sample._extend_arr(phrase_location.arr.arr + j, phrase_location.num_subpatterns)             # <<<<<<<<<<<<<<
@@ -41857,7 +41857,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
  */
         ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_sample->__pyx_vtab)->_extend_arr(__pyx_v_sample, (__pyx_v_phrase_location->arr->arr + __pyx_v_j), __pyx_v_phrase_location->num_subpatterns);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":181
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":181
  *                     j = phrase_location.arr_low + (val*phrase_location.num_subpatterns)
  *                     sample._extend_arr(phrase_location.arr.arr + j, phrase_location.num_subpatterns)
  *                     i = i + stepsize             # <<<<<<<<<<<<<<
@@ -41871,7 +41871,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":182
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":182
  *                     sample._extend_arr(phrase_location.arr.arr + j, phrase_location.num_subpatterns)
  *                     i = i + stepsize
  *         return sample             # <<<<<<<<<<<<<<
@@ -41883,7 +41883,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
   __pyx_r = ((PyObject *)__pyx_v_sample);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":135
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":135
  *             logger.info("Sampling strategy: no sampling")
  * 
  *     def sample(self, PhraseLocation phrase_location):             # <<<<<<<<<<<<<<
@@ -41903,7 +41903,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_7Sampler_2sample(struct __pyx_obj_4cdec
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":194
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":194
  * 
  * 
  * cdef void assign_matching(Matching* m, int* arr, int start, int step, int* sent_id_arr):             # <<<<<<<<<<<<<<
@@ -41915,7 +41915,7 @@ static void __pyx_f_4cdec_2sa_3_sa_assign_matching(struct __pyx_t_4cdec_2sa_3_sa
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("assign_matching", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":195
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":195
  * 
  * cdef void assign_matching(Matching* m, int* arr, int start, int step, int* sent_id_arr):
  *     m.arr = arr             # <<<<<<<<<<<<<<
@@ -41924,7 +41924,7 @@ static void __pyx_f_4cdec_2sa_3_sa_assign_matching(struct __pyx_t_4cdec_2sa_3_sa
  */
   __pyx_v_m->arr = __pyx_v_arr;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":196
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":196
  * cdef void assign_matching(Matching* m, int* arr, int start, int step, int* sent_id_arr):
  *     m.arr = arr
  *     m.start = start             # <<<<<<<<<<<<<<
@@ -41933,7 +41933,7 @@ static void __pyx_f_4cdec_2sa_3_sa_assign_matching(struct __pyx_t_4cdec_2sa_3_sa
  */
   __pyx_v_m->start = __pyx_v_start;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":197
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":197
  *     m.arr = arr
  *     m.start = start
  *     m.end = start + step             # <<<<<<<<<<<<<<
@@ -41942,7 +41942,7 @@ static void __pyx_f_4cdec_2sa_3_sa_assign_matching(struct __pyx_t_4cdec_2sa_3_sa
  */
   __pyx_v_m->end = (__pyx_v_start + __pyx_v_step);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":198
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":198
  *     m.start = start
  *     m.end = start + step
  *     m.sent_id = sent_id_arr[arr[start]]             # <<<<<<<<<<<<<<
@@ -41951,7 +41951,7 @@ static void __pyx_f_4cdec_2sa_3_sa_assign_matching(struct __pyx_t_4cdec_2sa_3_sa
  */
   __pyx_v_m->sent_id = (__pyx_v_sent_id_arr[(__pyx_v_arr[__pyx_v_start])]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":199
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":199
  *     m.end = start + step
  *     m.sent_id = sent_id_arr[arr[start]]
  *     m.size = step             # <<<<<<<<<<<<<<
@@ -41960,7 +41960,7 @@ static void __pyx_f_4cdec_2sa_3_sa_assign_matching(struct __pyx_t_4cdec_2sa_3_sa
  */
   __pyx_v_m->size = __pyx_v_step;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":194
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":194
  * 
  * 
  * cdef void assign_matching(Matching* m, int* arr, int start, int step, int* sent_id_arr):             # <<<<<<<<<<<<<<
@@ -41972,7 +41972,7 @@ static void __pyx_f_4cdec_2sa_3_sa_assign_matching(struct __pyx_t_4cdec_2sa_3_sa
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":202
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":202
  * 
  * 
  * cdef int* append_combined_matching(int* arr, Matching* loc1, Matching* loc2,             # <<<<<<<<<<<<<<
@@ -41989,7 +41989,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_append_combined_matching(int *__pyx_v_arr, st
   int __pyx_t_2;
   __Pyx_RefNannySetupContext("append_combined_matching", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":206
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":206
  *     cdef int i, new_len
  * 
  *     new_len = result_len[0] + num_subpatterns             # <<<<<<<<<<<<<<
@@ -41998,7 +41998,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_append_combined_matching(int *__pyx_v_arr, st
  */
   __pyx_v_new_len = ((__pyx_v_result_len[0]) + __pyx_v_num_subpatterns);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":207
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":207
  * 
  *     new_len = result_len[0] + num_subpatterns
  *     arr = <int*> realloc(arr, new_len*sizeof(int))             # <<<<<<<<<<<<<<
@@ -42007,7 +42007,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_append_combined_matching(int *__pyx_v_arr, st
  */
   __pyx_v_arr = ((int *)realloc(__pyx_v_arr, (__pyx_v_new_len * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":209
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":209
  *     arr = <int*> realloc(arr, new_len*sizeof(int))
  * 
  *     for i from 0 <= i < loc1.size:             # <<<<<<<<<<<<<<
@@ -42017,7 +42017,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_append_combined_matching(int *__pyx_v_arr, st
   __pyx_t_1 = __pyx_v_loc1->size;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_1; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":210
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":210
  * 
  *     for i from 0 <= i < loc1.size:
  *         arr[result_len[0]+i] = loc1.arr[loc1.start+i]             # <<<<<<<<<<<<<<
@@ -42027,7 +42027,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_append_combined_matching(int *__pyx_v_arr, st
     (__pyx_v_arr[((__pyx_v_result_len[0]) + __pyx_v_i)]) = (__pyx_v_loc1->arr[(__pyx_v_loc1->start + __pyx_v_i)]);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":211
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":211
  *     for i from 0 <= i < loc1.size:
  *         arr[result_len[0]+i] = loc1.arr[loc1.start+i]
  *     if num_subpatterns > loc1.size:             # <<<<<<<<<<<<<<
@@ -42037,7 +42037,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_append_combined_matching(int *__pyx_v_arr, st
   __pyx_t_2 = ((__pyx_v_num_subpatterns > __pyx_v_loc1->size) != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":212
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":212
  *         arr[result_len[0]+i] = loc1.arr[loc1.start+i]
  *     if num_subpatterns > loc1.size:
  *         arr[new_len-1] = loc2.arr[loc2.end-1]             # <<<<<<<<<<<<<<
@@ -42049,7 +42049,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_append_combined_matching(int *__pyx_v_arr, st
   }
   __pyx_L5:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":213
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":213
  *     if num_subpatterns > loc1.size:
  *         arr[new_len-1] = loc2.arr[loc2.end-1]
  *     result_len[0] = new_len             # <<<<<<<<<<<<<<
@@ -42058,7 +42058,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_append_combined_matching(int *__pyx_v_arr, st
  */
   (__pyx_v_result_len[0]) = __pyx_v_new_len;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":214
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":214
  *         arr[new_len-1] = loc2.arr[loc2.end-1]
  *     result_len[0] = new_len
  *     return arr             # <<<<<<<<<<<<<<
@@ -42068,7 +42068,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_append_combined_matching(int *__pyx_v_arr, st
   __pyx_r = __pyx_v_arr;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":202
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":202
  * 
  * 
  * cdef int* append_combined_matching(int* arr, Matching* loc1, Matching* loc2,             # <<<<<<<<<<<<<<
@@ -42082,7 +42082,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_append_combined_matching(int *__pyx_v_arr, st
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":217
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":217
  * 
  * 
  * cdef int* extend_arr(int* arr, int* arr_len, int* appendix, int appendix_len):             # <<<<<<<<<<<<<<
@@ -42096,7 +42096,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_extend_arr(int *__pyx_v_arr, int *__pyx_v_arr
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("extend_arr", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":220
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":220
  *     cdef int new_len
  * 
  *     new_len = arr_len[0] + appendix_len             # <<<<<<<<<<<<<<
@@ -42105,7 +42105,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_extend_arr(int *__pyx_v_arr, int *__pyx_v_arr
  */
   __pyx_v_new_len = ((__pyx_v_arr_len[0]) + __pyx_v_appendix_len);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":221
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":221
  * 
  *     new_len = arr_len[0] + appendix_len
  *     arr = <int*> realloc(arr, new_len*sizeof(int))             # <<<<<<<<<<<<<<
@@ -42114,7 +42114,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_extend_arr(int *__pyx_v_arr, int *__pyx_v_arr
  */
   __pyx_v_arr = ((int *)realloc(__pyx_v_arr, (__pyx_v_new_len * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":222
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":222
  *     new_len = arr_len[0] + appendix_len
  *     arr = <int*> realloc(arr, new_len*sizeof(int))
  *     memcpy(arr+arr_len[0], appendix, appendix_len*sizeof(int))             # <<<<<<<<<<<<<<
@@ -42123,7 +42123,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_extend_arr(int *__pyx_v_arr, int *__pyx_v_arr
  */
   memcpy((__pyx_v_arr + (__pyx_v_arr_len[0])), __pyx_v_appendix, (__pyx_v_appendix_len * (sizeof(int))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":223
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":223
  *     arr = <int*> realloc(arr, new_len*sizeof(int))
  *     memcpy(arr+arr_len[0], appendix, appendix_len*sizeof(int))
  *     arr_len[0] = new_len             # <<<<<<<<<<<<<<
@@ -42132,7 +42132,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_extend_arr(int *__pyx_v_arr, int *__pyx_v_arr
  */
   (__pyx_v_arr_len[0]) = __pyx_v_new_len;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":224
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":224
  *     memcpy(arr+arr_len[0], appendix, appendix_len*sizeof(int))
  *     arr_len[0] = new_len
  *     return arr             # <<<<<<<<<<<<<<
@@ -42142,7 +42142,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_extend_arr(int *__pyx_v_arr, int *__pyx_v_arr
   __pyx_r = __pyx_v_arr;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":217
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":217
  * 
  * 
  * cdef int* extend_arr(int* arr, int* arr_len, int* appendix, int appendix_len):             # <<<<<<<<<<<<<<
@@ -42156,7 +42156,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_extend_arr(int *__pyx_v_arr, int *__pyx_v_arr
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":226
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":226
  *     return arr
  * 
  * cdef int median(int low, int high, int step):             # <<<<<<<<<<<<<<
@@ -42173,7 +42173,7 @@ static int __pyx_f_4cdec_2sa_3_sa_median(int __pyx_v_low, int __pyx_v_high, int
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("median", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":227
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":227
  * 
  * cdef int median(int low, int high, int step):
  *     return low + (((high - low)/step)/2)*step             # <<<<<<<<<<<<<<
@@ -42204,7 +42204,7 @@ static int __pyx_f_4cdec_2sa_3_sa_median(int __pyx_v_low, int __pyx_v_high, int
   __pyx_r = (__pyx_v_low + (__Pyx_div_long(__Pyx_div_int(__pyx_t_1, __pyx_v_step), 2) * __pyx_v_step));
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":226
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":226
  *     return arr
  * 
  * cdef int median(int low, int high, int step):             # <<<<<<<<<<<<<<
@@ -42221,7 +42221,7 @@ static int __pyx_f_4cdec_2sa_3_sa_median(int __pyx_v_low, int __pyx_v_high, int
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":230
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":230
  * 
  * 
  * cdef void find_comparable_matchings(int low, int high, int* arr, int step, int loc, int* loc_minus, int* loc_plus):             # <<<<<<<<<<<<<<
@@ -42236,7 +42236,7 @@ static void __pyx_f_4cdec_2sa_3_sa_find_comparable_matchings(int __pyx_v_low, in
   int __pyx_t_3;
   __Pyx_RefNannySetupContext("find_comparable_matchings", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":234
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":234
  *     # in which all matchings have the same first index as the one
  *     # starting at loc
  *     loc_plus[0] = loc + step             # <<<<<<<<<<<<<<
@@ -42245,7 +42245,7 @@ static void __pyx_f_4cdec_2sa_3_sa_find_comparable_matchings(int __pyx_v_low, in
  */
   (__pyx_v_loc_plus[0]) = (__pyx_v_loc + __pyx_v_step);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":235
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":235
  *     # starting at loc
  *     loc_plus[0] = loc + step
  *     while loc_plus[0] < high and arr[loc_plus[0]] == arr[loc]:             # <<<<<<<<<<<<<<
@@ -42262,7 +42262,7 @@ static void __pyx_f_4cdec_2sa_3_sa_find_comparable_matchings(int __pyx_v_low, in
     }
     if (!__pyx_t_3) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":236
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":236
  *     loc_plus[0] = loc + step
  *     while loc_plus[0] < high and arr[loc_plus[0]] == arr[loc]:
  *         loc_plus[0] = loc_plus[0] + step             # <<<<<<<<<<<<<<
@@ -42272,7 +42272,7 @@ static void __pyx_f_4cdec_2sa_3_sa_find_comparable_matchings(int __pyx_v_low, in
     (__pyx_v_loc_plus[0]) = ((__pyx_v_loc_plus[0]) + __pyx_v_step);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":237
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":237
  *     while loc_plus[0] < high and arr[loc_plus[0]] == arr[loc]:
  *         loc_plus[0] = loc_plus[0] + step
  *     loc_minus[0] = loc             # <<<<<<<<<<<<<<
@@ -42281,7 +42281,7 @@ static void __pyx_f_4cdec_2sa_3_sa_find_comparable_matchings(int __pyx_v_low, in
  */
   (__pyx_v_loc_minus[0]) = __pyx_v_loc;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":238
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":238
  *         loc_plus[0] = loc_plus[0] + step
  *     loc_minus[0] = loc
  *     while loc_minus[0]-step >= low and arr[loc_minus[0]-step] == arr[loc]:             # <<<<<<<<<<<<<<
@@ -42298,7 +42298,7 @@ static void __pyx_f_4cdec_2sa_3_sa_find_comparable_matchings(int __pyx_v_low, in
     }
     if (!__pyx_t_2) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":239
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":239
  *     loc_minus[0] = loc
  *     while loc_minus[0]-step >= low and arr[loc_minus[0]-step] == arr[loc]:
  *         loc_minus[0] = loc_minus[0] - step             # <<<<<<<<<<<<<<
@@ -42308,7 +42308,7 @@ static void __pyx_f_4cdec_2sa_3_sa_find_comparable_matchings(int __pyx_v_low, in
     (__pyx_v_loc_minus[0]) = ((__pyx_v_loc_minus[0]) - __pyx_v_step);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":230
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":230
  * 
  * 
  * cdef void find_comparable_matchings(int low, int high, int* arr, int step, int loc, int* loc_minus, int* loc_plus):             # <<<<<<<<<<<<<<
@@ -42320,7 +42320,7 @@ static void __pyx_f_4cdec_2sa_3_sa_find_comparable_matchings(int __pyx_v_low, in
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":296
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":296
  *     cdef bilex
  * 
  *     def __cinit__(self,             # <<<<<<<<<<<<<<
@@ -42363,7 +42363,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_1__cinit__(PyObject
     static PyObject **__pyx_pyargnames[] = {&__pyx_n_s_alignment,&__pyx_n_s_bilex,&__pyx_n_s_by_slack_factor,&__pyx_n_s_category,&__pyx_n_s_max_chunks,&__pyx_n_s_max_initial_size,&__pyx_n_s_max_length,&__pyx_n_s_max_nonterminals,&__pyx_n_s_max_target_chunks,&__pyx_n_s_max_target_length,&__pyx_n_s_min_gap_size,&__pyx_n_s_precompute_file,&__pyx_n_s_precompute_secondary_rank,&__pyx_n_s_precompute_rank,&__pyx_n_s_require_aligned_terminal,&__pyx_n_s_require_aligned_chunks,&__pyx_n_s_train_max_initial_size,&__pyx_n_s_train_min_gap_size,&__pyx_n_s_tight_phrases,&__pyx_n_s_use_baeza_yates,&__pyx_n_s_use_collocations,&__pyx_n_s_use_index,0};
     PyObject* values[22] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":300
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":300
  *             Alignment alignment,
  *             # bilexical dictionary if online
  *             bilex=None,             # <<<<<<<<<<<<<<
@@ -42372,7 +42372,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_1__cinit__(PyObject
  */
     values[1] = ((PyObject *)Py_None);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":306
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":306
  *             char* category="[X]",
  *             # maximum number of contiguous chunks of terminal symbols in RHS of a rule. If None, defaults to max_nonterminals+1
  *             max_chunks=None,             # <<<<<<<<<<<<<<
@@ -42381,7 +42381,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_1__cinit__(PyObject
  */
     values[4] = ((PyObject *)Py_None);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":314
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":314
  *             unsigned max_nonterminals=2,
  *             # maximum number of contiguous chunks of terminal symbols in target-side RHS of a rule. If None, defaults to max_nonterminals+1
  *             max_target_chunks=None,             # <<<<<<<<<<<<<<
@@ -42390,7 +42390,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_1__cinit__(PyObject
  */
     values[8] = ((PyObject *)Py_None);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":316
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":316
  *             max_target_chunks=None,
  *             # maximum number of target side symbols (both T and NT) allowed in a rule. If None, defaults to max_initial_size
  *             max_target_length=None,             # <<<<<<<<<<<<<<
@@ -42399,7 +42399,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_1__cinit__(PyObject
  */
     values[9] = ((PyObject *)Py_None);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":320
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":320
  *             unsigned min_gap_size=2,
  *             # filename of file containing precomputed collocations
  *             precompute_file=None,             # <<<<<<<<<<<<<<
@@ -42628,7 +42628,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_1__cinit__(PyObject
       __pyx_v_require_aligned_terminal = __Pyx_PyObject_IsTrue(values[14]); if (unlikely((__pyx_v_require_aligned_terminal == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 326; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     } else {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":326
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":326
  *             unsigned precompute_rank=100,
  *             # require extracted rules to have at least one aligned word
  *             bint require_aligned_terminal=True,             # <<<<<<<<<<<<<<
@@ -42641,7 +42641,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_1__cinit__(PyObject
       __pyx_v_require_aligned_chunks = __Pyx_PyObject_IsTrue(values[15]); if (unlikely((__pyx_v_require_aligned_chunks == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 328; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     } else {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":328
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":328
  *             bint require_aligned_terminal=True,
  *             # require each contiguous chunk of extracted rules to have at least one aligned word
  *             bint require_aligned_chunks=False,             # <<<<<<<<<<<<<<
@@ -42664,7 +42664,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_1__cinit__(PyObject
       __pyx_v_tight_phrases = __Pyx_PyObject_IsTrue(values[18]); if (unlikely((__pyx_v_tight_phrases == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 334; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     } else {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":334
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":334
  *             unsigned train_min_gap_size=2,
  *             # False if phrases should be loose (better but slower), True otherwise
  *             bint tight_phrases=True,             # <<<<<<<<<<<<<<
@@ -42677,7 +42677,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_1__cinit__(PyObject
       __pyx_v_use_baeza_yates = __Pyx_PyObject_IsTrue(values[19]); if (unlikely((__pyx_v_use_baeza_yates == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 336; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     } else {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":336
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":336
  *             bint tight_phrases=True,
  *             # True to require use of double-binary alg, false otherwise
  *             bint use_baeza_yates=True,             # <<<<<<<<<<<<<<
@@ -42690,7 +42690,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_1__cinit__(PyObject
       __pyx_v_use_collocations = __Pyx_PyObject_IsTrue(values[20]); if (unlikely((__pyx_v_use_collocations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 338; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     } else {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":338
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":338
  *             bint use_baeza_yates=True,
  *             # True to enable used of precomputed collocations
  *             bint use_collocations=True,             # <<<<<<<<<<<<<<
@@ -42703,7 +42703,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_1__cinit__(PyObject
       __pyx_v_use_index = __Pyx_PyObject_IsTrue(values[21]); if (unlikely((__pyx_v_use_index == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 340; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     } else {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":340
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":340
  *             bint use_collocations=True,
  *             # True to enable use of precomputed inverted indices
  *             bint use_index=True):             # <<<<<<<<<<<<<<
@@ -42724,7 +42724,7 @@ static int __pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_1__cinit__(PyObject
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_alignment), __pyx_ptype_4cdec_2sa_3_sa_Alignment, 1, "alignment", 0))) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 298; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_r = __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(((struct __pyx_obj_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self), __pyx_v_alignment, __pyx_v_bilex, __pyx_v_by_slack_factor, __pyx_v_category, __pyx_v_max_chunks, __pyx_v_max_initial_size, __pyx_v_max_length, __pyx_v_max_nonterminals, __pyx_v_max_target_chunks, __pyx_v_max_target_length, __pyx_v_min_gap_size, __pyx_v_precompute_file, __pyx_v_precompute_secondary_rank, __pyx_v_precompute_rank, __pyx_v_require_aligned_terminal, __pyx_v_require_aligned_chunks, __pyx_v_train_max_initial_size, __pyx_v_train_min_gap_size, __pyx_v_tight_phrases, __pyx_v_use_baeza_yates, __pyx_v_use_collocations, __pyx_v_use_index);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":296
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":296
  *     cdef bilex
  * 
  *     def __cinit__(self,             # <<<<<<<<<<<<<<
@@ -42755,7 +42755,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":346
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":346
  *         respectively.    This is because Chiang's model does not require
  *         them to be the same, therefore we don't either.'''
  *         self.rules = TrieTable(True) # cache             # <<<<<<<<<<<<<<
@@ -42770,7 +42770,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __pyx_v_self->rules = ((struct __pyx_obj_4cdec_2sa_3_sa_TrieTable *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":347
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":347
  *         them to be the same, therefore we don't either.'''
  *         self.rules = TrieTable(True) # cache
  *         self.rules.root = ExtendedTrieNode(phrase_location=PhraseLocation())             # <<<<<<<<<<<<<<
@@ -42792,7 +42792,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __pyx_v_self->rules->root = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":348
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":348
  *         self.rules = TrieTable(True) # cache
  *         self.rules.root = ExtendedTrieNode(phrase_location=PhraseLocation())
  *         if alignment is None:             # <<<<<<<<<<<<<<
@@ -42803,7 +42803,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __pyx_t_4 = (__pyx_t_3 != 0);
   if (__pyx_t_4) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":349
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":349
  *         self.rules.root = ExtendedTrieNode(phrase_location=PhraseLocation())
  *         if alignment is None:
  *             raise Exception("Must specify an alignment object")             # <<<<<<<<<<<<<<
@@ -42817,7 +42817,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
     {__pyx_filename = __pyx_f[8]; __pyx_lineno = 349; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":350
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":350
  *         if alignment is None:
  *             raise Exception("Must specify an alignment object")
  *         self.alignment = alignment             # <<<<<<<<<<<<<<
@@ -42830,7 +42830,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __Pyx_DECREF(((PyObject *)__pyx_v_self->alignment));
   __pyx_v_self->alignment = __pyx_v_alignment;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":354
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":354
  *         # grammar parameters and settings
  *         # NOTE: setting max_nonterminals > 2 is not currently supported in Hiero
  *         self.max_length = max_length             # <<<<<<<<<<<<<<
@@ -42839,7 +42839,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->max_length = __pyx_v_max_length;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":355
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":355
  *         # NOTE: setting max_nonterminals > 2 is not currently supported in Hiero
  *         self.max_length = max_length
  *         self.max_nonterminals = max_nonterminals             # <<<<<<<<<<<<<<
@@ -42848,7 +42848,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->max_nonterminals = __pyx_v_max_nonterminals;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":356
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":356
  *         self.max_length = max_length
  *         self.max_nonterminals = max_nonterminals
  *         self.max_initial_size = max_initial_size             # <<<<<<<<<<<<<<
@@ -42857,7 +42857,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->max_initial_size = __pyx_v_max_initial_size;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":357
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":357
  *         self.max_nonterminals = max_nonterminals
  *         self.max_initial_size = max_initial_size
  *         self.train_max_initial_size = train_max_initial_size             # <<<<<<<<<<<<<<
@@ -42866,7 +42866,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->train_max_initial_size = __pyx_v_train_max_initial_size;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":358
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":358
  *         self.max_initial_size = max_initial_size
  *         self.train_max_initial_size = train_max_initial_size
  *         self.min_gap_size = min_gap_size             # <<<<<<<<<<<<<<
@@ -42875,7 +42875,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->min_gap_size = __pyx_v_min_gap_size;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":359
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":359
  *         self.train_max_initial_size = train_max_initial_size
  *         self.min_gap_size = min_gap_size
  *         self.train_min_gap_size = train_min_gap_size             # <<<<<<<<<<<<<<
@@ -42884,7 +42884,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->train_min_gap_size = __pyx_v_train_min_gap_size;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":360
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":360
  *         self.min_gap_size = min_gap_size
  *         self.train_min_gap_size = train_min_gap_size
  *         self.category = sym_fromstring(category, False)             # <<<<<<<<<<<<<<
@@ -42893,7 +42893,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->category = __pyx_f_4cdec_2sa_3_sa_sym_fromstring(__pyx_v_category, 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":362
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":362
  *         self.category = sym_fromstring(category, False)
  * 
  *         if max_chunks is None:             # <<<<<<<<<<<<<<
@@ -42904,7 +42904,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __pyx_t_3 = (__pyx_t_4 != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":363
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":363
  * 
  *         if max_chunks is None:
  *             self.max_chunks = self.max_nonterminals + 1             # <<<<<<<<<<<<<<
@@ -42916,7 +42916,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":365
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":365
  *             self.max_chunks = self.max_nonterminals + 1
  *         else:
  *             self.max_chunks = max_chunks             # <<<<<<<<<<<<<<
@@ -42928,7 +42928,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   }
   __pyx_L4:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":367
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":367
  *             self.max_chunks = max_chunks
  * 
  *         if max_target_chunks is None:             # <<<<<<<<<<<<<<
@@ -42939,7 +42939,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __pyx_t_4 = (__pyx_t_3 != 0);
   if (__pyx_t_4) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":368
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":368
  * 
  *         if max_target_chunks is None:
  *             self.max_target_chunks = self.max_nonterminals + 1             # <<<<<<<<<<<<<<
@@ -42951,7 +42951,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":370
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":370
  *             self.max_target_chunks = self.max_nonterminals + 1
  *         else:
  *             self.max_target_chunks = max_target_chunks             # <<<<<<<<<<<<<<
@@ -42963,7 +42963,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   }
   __pyx_L5:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":372
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":372
  *             self.max_target_chunks = max_target_chunks
  * 
  *         if max_target_length is None:             # <<<<<<<<<<<<<<
@@ -42974,7 +42974,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __pyx_t_3 = (__pyx_t_4 != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":373
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":373
  * 
  *         if max_target_length is None:
  *             self.max_target_length = max_initial_size             # <<<<<<<<<<<<<<
@@ -42986,7 +42986,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":375
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":375
  *             self.max_target_length = max_initial_size
  *         else:
  *             self.max_target_length = max_target_length             # <<<<<<<<<<<<<<
@@ -42998,7 +42998,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   }
   __pyx_L6:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":378
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":378
  * 
  *         # algorithmic parameters and settings
  *         self.precomputed_collocations = {}             # <<<<<<<<<<<<<<
@@ -43013,7 +43013,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __pyx_v_self->precomputed_collocations = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":379
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":379
  *         # algorithmic parameters and settings
  *         self.precomputed_collocations = {}
  *         self.precomputed_index = {}             # <<<<<<<<<<<<<<
@@ -43028,7 +43028,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __pyx_v_self->precomputed_index = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":380
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":380
  *         self.precomputed_collocations = {}
  *         self.precomputed_index = {}
  *         self.use_index = use_index             # <<<<<<<<<<<<<<
@@ -43037,7 +43037,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->use_index = __pyx_v_use_index;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":381
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":381
  *         self.precomputed_index = {}
  *         self.use_index = use_index
  *         self.use_collocations = use_collocations             # <<<<<<<<<<<<<<
@@ -43046,7 +43046,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->use_collocations = __pyx_v_use_collocations;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":382
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":382
  *         self.use_index = use_index
  *         self.use_collocations = use_collocations
  *         self.max_rank = {}             # <<<<<<<<<<<<<<
@@ -43061,7 +43061,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __pyx_v_self->max_rank = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":383
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":383
  *         self.use_collocations = use_collocations
  *         self.max_rank = {}
  *         self.precompute_file = precompute_file             # <<<<<<<<<<<<<<
@@ -43074,7 +43074,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __Pyx_DECREF(__pyx_v_self->precompute_file);
   __pyx_v_self->precompute_file = __pyx_v_precompute_file;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":384
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":384
  *         self.max_rank = {}
  *         self.precompute_file = precompute_file
  *         self.precompute_rank = precompute_rank             # <<<<<<<<<<<<<<
@@ -43083,7 +43083,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->precompute_rank = __pyx_v_precompute_rank;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":385
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":385
  *         self.precompute_file = precompute_file
  *         self.precompute_rank = precompute_rank
  *         self.precompute_secondary_rank = precompute_secondary_rank             # <<<<<<<<<<<<<<
@@ -43092,7 +43092,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->precompute_secondary_rank = __pyx_v_precompute_secondary_rank;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":386
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":386
  *         self.precompute_rank = precompute_rank
  *         self.precompute_secondary_rank = precompute_secondary_rank
  *         self.use_baeza_yates = use_baeza_yates             # <<<<<<<<<<<<<<
@@ -43101,7 +43101,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->use_baeza_yates = __pyx_v_use_baeza_yates;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":387
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":387
  *         self.precompute_secondary_rank = precompute_secondary_rank
  *         self.use_baeza_yates = use_baeza_yates
  *         self.by_slack_factor = by_slack_factor             # <<<<<<<<<<<<<<
@@ -43110,7 +43110,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->by_slack_factor = __pyx_v_by_slack_factor;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":388
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":388
  *         self.use_baeza_yates = use_baeza_yates
  *         self.by_slack_factor = by_slack_factor
  *         self.tight_phrases = tight_phrases             # <<<<<<<<<<<<<<
@@ -43119,7 +43119,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->tight_phrases = __pyx_v_tight_phrases;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":390
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":390
  *         self.tight_phrases = tight_phrases
  * 
  *         if require_aligned_chunks:             # <<<<<<<<<<<<<<
@@ -43129,7 +43129,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __pyx_t_3 = (__pyx_v_require_aligned_chunks != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":392
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":392
  *         if require_aligned_chunks:
  *             # one condition is a stronger version of the other.
  *             self.require_aligned_chunks = self.require_aligned_terminal = True             # <<<<<<<<<<<<<<
@@ -43141,7 +43141,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
     goto __pyx_L7;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":393
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":393
  *             # one condition is a stronger version of the other.
  *             self.require_aligned_chunks = self.require_aligned_terminal = True
  *         elif require_aligned_terminal:             # <<<<<<<<<<<<<<
@@ -43151,7 +43151,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __pyx_t_3 = (__pyx_v_require_aligned_terminal != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":394
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":394
  *             self.require_aligned_chunks = self.require_aligned_terminal = True
  *         elif require_aligned_terminal:
  *             self.require_aligned_chunks = False             # <<<<<<<<<<<<<<
@@ -43160,7 +43160,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
     __pyx_v_self->require_aligned_chunks = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":395
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":395
  *         elif require_aligned_terminal:
  *             self.require_aligned_chunks = False
  *             self.require_aligned_terminal = True             # <<<<<<<<<<<<<<
@@ -43172,7 +43172,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":397
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":397
  *             self.require_aligned_terminal = True
  *         else:
  *             self.require_aligned_chunks = self.require_aligned_terminal = False             # <<<<<<<<<<<<<<
@@ -43184,7 +43184,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   }
   __pyx_L7:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":400
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":400
  * 
  *         # diagnostics
  *         self.prev_norm_prefix = ()             # <<<<<<<<<<<<<<
@@ -43197,7 +43197,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __Pyx_DECREF(__pyx_v_self->prev_norm_prefix);
   __pyx_v_self->prev_norm_prefix = __pyx_empty_tuple;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":402
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":402
  *         self.prev_norm_prefix = ()
  * 
  *         self.findexes = IntList(initial_len=10)             # <<<<<<<<<<<<<<
@@ -43216,7 +43216,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __pyx_v_self->findexes = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":403
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":403
  * 
  *         self.findexes = IntList(initial_len=10)
  *         self.findexes1 = IntList(initial_len=10)             # <<<<<<<<<<<<<<
@@ -43235,7 +43235,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __pyx_v_self->findexes1 = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":408
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":408
  * 
  *         # None if not online
  *         self.bilex = bilex             # <<<<<<<<<<<<<<
@@ -43248,7 +43248,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __Pyx_DECREF(__pyx_v_self->bilex);
   __pyx_v_self->bilex = __pyx_v_bilex;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":411
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":411
  * 
  *         # True after data is added
  *         self.online = False             # <<<<<<<<<<<<<<
@@ -43257,7 +43257,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
  */
   __pyx_v_self->online = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":412
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":412
  *         # True after data is added
  *         self.online = False
  *         self.online_stats = defaultdict(OnlineStats)             # <<<<<<<<<<<<<<
@@ -43281,7 +43281,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   __pyx_v_self->online_stats = __pyx_t_6;
   __pyx_t_6 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":296
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":296
  *     cdef bilex
  * 
  *     def __cinit__(self,             # <<<<<<<<<<<<<<
@@ -43303,7 +43303,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory___cinit__(struct __
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":414
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":414
  *         self.online_stats = defaultdict(OnlineStats)
  * 
  *     def configure(self, SuffixArray fsarray, DataArray edarray,             # <<<<<<<<<<<<<<
@@ -43409,7 +43409,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_2configure(st
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("configure", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":419
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":419
  *         Here we also use it to precompute the most expensive intersections
  *         in the corpus quickly.'''
  *         self.fsa = fsarray             # <<<<<<<<<<<<<<
@@ -43422,7 +43422,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_2configure(st
   __Pyx_DECREF(((PyObject *)__pyx_v_self->fsa));
   __pyx_v_self->fsa = __pyx_v_fsarray;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":420
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":420
  *         in the corpus quickly.'''
  *         self.fsa = fsarray
  *         self.fda = fsarray.darray             # <<<<<<<<<<<<<<
@@ -43437,7 +43437,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_2configure(st
   __pyx_v_self->fda = ((struct __pyx_obj_4cdec_2sa_3_sa_DataArray *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":421
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":421
  *         self.fsa = fsarray
  *         self.fda = fsarray.darray
  *         self.eda = edarray             # <<<<<<<<<<<<<<
@@ -43450,7 +43450,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_2configure(st
   __Pyx_DECREF(((PyObject *)__pyx_v_self->eda));
   __pyx_v_self->eda = __pyx_v_edarray;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":422
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":422
  *         self.fda = fsarray.darray
  *         self.eda = edarray
  *         self.fid2symid = self.set_idmap(self.fda)             # <<<<<<<<<<<<<<
@@ -43469,7 +43469,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_2configure(st
   __pyx_v_self->fid2symid = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":423
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":423
  *         self.eda = edarray
  *         self.fid2symid = self.set_idmap(self.fda)
  *         self.eid2symid = self.set_idmap(self.eda)             # <<<<<<<<<<<<<<
@@ -43488,7 +43488,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_2configure(st
   __pyx_v_self->eid2symid = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":424
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":424
  *         self.fid2symid = self.set_idmap(self.fda)
  *         self.eid2symid = self.set_idmap(self.eda)
  *         self.precompute()             # <<<<<<<<<<<<<<
@@ -43502,7 +43502,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_2configure(st
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":425
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":425
  *         self.eid2symid = self.set_idmap(self.eda)
  *         self.precompute()
  *         self.sampler = sampler             # <<<<<<<<<<<<<<
@@ -43515,7 +43515,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_2configure(st
   __Pyx_DECREF(((PyObject *)__pyx_v_self->sampler));
   __pyx_v_self->sampler = __pyx_v_sampler;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":426
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":426
  *         self.precompute()
  *         self.sampler = sampler
  *         self.scorer = scorer             # <<<<<<<<<<<<<<
@@ -43528,7 +43528,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_2configure(st
   __Pyx_DECREF(((PyObject *)__pyx_v_self->scorer));
   __pyx_v_self->scorer = __pyx_v_scorer;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":414
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":414
  *         self.online_stats = defaultdict(OnlineStats)
  * 
  *     def configure(self, SuffixArray fsarray, DataArray edarray,             # <<<<<<<<<<<<<<
@@ -43550,7 +43550,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_2configure(st
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":428
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":428
  *         self.scorer = scorer
  * 
  *     cdef set_idmap(self, DataArray darray):             # <<<<<<<<<<<<<<
@@ -43575,7 +43575,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_set_idmap(CYTH
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("set_idmap", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":432
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":432
  *         cdef IntList idmap
  * 
  *         N = len(darray.id2word)             # <<<<<<<<<<<<<<
@@ -43588,7 +43588,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_set_idmap(CYTH
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_v_N = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":433
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":433
  * 
  *         N = len(darray.id2word)
  *         idmap = IntList(initial_len=N)             # <<<<<<<<<<<<<<
@@ -43607,7 +43607,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_set_idmap(CYTH
   __pyx_v_idmap = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":434
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":434
  *         N = len(darray.id2word)
  *         idmap = IntList(initial_len=N)
  *         for word_id from 0 <= word_id < N:             # <<<<<<<<<<<<<<
@@ -43617,7 +43617,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_set_idmap(CYTH
   __pyx_t_4 = __pyx_v_N;
   for (__pyx_v_word_id = 0; __pyx_v_word_id < __pyx_t_4; __pyx_v_word_id++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":435
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":435
  *         idmap = IntList(initial_len=N)
  *         for word_id from 0 <= word_id < N:
  *             new_word_id = sym_fromstring(darray.id2word[word_id], True)             # <<<<<<<<<<<<<<
@@ -43630,7 +43630,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_set_idmap(CYTH
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __pyx_v_new_word_id = __pyx_f_4cdec_2sa_3_sa_sym_fromstring(__pyx_t_5, 1);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":436
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":436
  *         for word_id from 0 <= word_id < N:
  *             new_word_id = sym_fromstring(darray.id2word[word_id], True)
  *             idmap.arr[word_id] = new_word_id             # <<<<<<<<<<<<<<
@@ -43640,7 +43640,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_set_idmap(CYTH
     (__pyx_v_idmap->arr[__pyx_v_word_id]) = __pyx_v_new_word_id;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":437
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":437
  *             new_word_id = sym_fromstring(darray.id2word[word_id], True)
  *             idmap.arr[word_id] = new_word_id
  *         return idmap             # <<<<<<<<<<<<<<
@@ -43652,7 +43652,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_set_idmap(CYTH
   __pyx_r = ((PyObject *)__pyx_v_idmap);
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":428
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":428
  *         self.scorer = scorer
  * 
  *     cdef set_idmap(self, DataArray darray):             # <<<<<<<<<<<<<<
@@ -43673,7 +43673,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_set_idmap(CYTH
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":440
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":440
  * 
  * 
  *     def pattern2phrase(self, pattern):             # <<<<<<<<<<<<<<
@@ -43714,7 +43714,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_4pattern2phra
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("pattern2phrase", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":442
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":442
  *     def pattern2phrase(self, pattern):
  *         # pattern is a tuple, which we must convert to a hiero Phrase
  *         result = ()             # <<<<<<<<<<<<<<
@@ -43724,7 +43724,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_4pattern2phra
   __Pyx_INCREF(__pyx_empty_tuple);
   __pyx_v_result = __pyx_empty_tuple;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":443
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":443
  *         # pattern is a tuple, which we must convert to a hiero Phrase
  *         result = ()
  *         arity = 0             # <<<<<<<<<<<<<<
@@ -43734,7 +43734,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_4pattern2phra
   __Pyx_INCREF(__pyx_int_0);
   __pyx_v_arity = __pyx_int_0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":444
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":444
  *         result = ()
  *         arity = 0
  *         for word_id in pattern:             # <<<<<<<<<<<<<<
@@ -43779,7 +43779,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_4pattern2phra
     __Pyx_XDECREF_SET(__pyx_v_word_id, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":445
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":445
  *         arity = 0
  *         for word_id in pattern:
  *             if word_id == -1:             # <<<<<<<<<<<<<<
@@ -43791,7 +43791,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_4pattern2phra
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":446
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":446
  *         for word_id in pattern:
  *             if word_id == -1:
  *                 arity = arity + 1             # <<<<<<<<<<<<<<
@@ -43803,7 +43803,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_4pattern2phra
       __Pyx_DECREF_SET(__pyx_v_arity, __pyx_t_4);
       __pyx_t_4 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":447
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":447
  *             if word_id == -1:
  *                 arity = arity + 1
  *                 new_id = sym_setindex(self.category, arity)             # <<<<<<<<<<<<<<
@@ -43816,7 +43816,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_4pattern2phra
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":449
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":449
  *                 new_id = sym_setindex(self.category, arity)
  *             else:
  *                 new_id = sym_fromstring(self.fda.id2word[word_id], True)             # <<<<<<<<<<<<<<
@@ -43831,7 +43831,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_4pattern2phra
     }
     __pyx_L5:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":450
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":450
  *             else:
  *                 new_id = sym_fromstring(self.fda.id2word[word_id], True)
  *             result = result + (new_id,)             # <<<<<<<<<<<<<<
@@ -43853,7 +43853,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_4pattern2phra
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":451
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":451
  *                 new_id = sym_fromstring(self.fda.id2word[word_id], True)
  *             result = result + (new_id,)
  *         return Phrase(result)             # <<<<<<<<<<<<<<
@@ -43873,7 +43873,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_4pattern2phra
   __pyx_t_4 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":440
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":440
  * 
  * 
  *     def pattern2phrase(self, pattern):             # <<<<<<<<<<<<<<
@@ -43897,7 +43897,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_4pattern2phra
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":453
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":453
  *         return Phrase(result)
  * 
  *     def pattern2phrase_plus(self, pattern):             # <<<<<<<<<<<<<<
@@ -43940,7 +43940,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("pattern2phrase_plus", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":456
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":456
  *         # returns a list containing both the pattern, and pattern
  *         # suffixed/prefixed with the NT category.
  *         patterns = []             # <<<<<<<<<<<<<<
@@ -43952,7 +43952,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
   __pyx_v_patterns = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":457
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":457
  *         # suffixed/prefixed with the NT category.
  *         patterns = []
  *         result = ()             # <<<<<<<<<<<<<<
@@ -43962,7 +43962,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
   __Pyx_INCREF(__pyx_empty_tuple);
   __pyx_v_result = __pyx_empty_tuple;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":458
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":458
  *         patterns = []
  *         result = ()
  *         arity = 0             # <<<<<<<<<<<<<<
@@ -43972,7 +43972,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
   __Pyx_INCREF(__pyx_int_0);
   __pyx_v_arity = __pyx_int_0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":459
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":459
  *         result = ()
  *         arity = 0
  *         for word_id in pattern:             # <<<<<<<<<<<<<<
@@ -44017,7 +44017,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
     __Pyx_XDECREF_SET(__pyx_v_word_id, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":460
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":460
  *         arity = 0
  *         for word_id in pattern:
  *             if word_id == -1:             # <<<<<<<<<<<<<<
@@ -44029,7 +44029,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":461
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":461
  *         for word_id in pattern:
  *             if word_id == -1:
  *                 arity = arity + 1             # <<<<<<<<<<<<<<
@@ -44041,7 +44041,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
       __Pyx_DECREF_SET(__pyx_v_arity, __pyx_t_4);
       __pyx_t_4 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":462
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":462
  *             if word_id == -1:
  *                 arity = arity + 1
  *                 new_id = sym_setindex(self.category, arity)             # <<<<<<<<<<<<<<
@@ -44054,7 +44054,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":464
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":464
  *                 new_id = sym_setindex(self.category, arity)
  *             else:
  *                 new_id = sym_fromstring(self.fda.id2word[word_id], True)             # <<<<<<<<<<<<<<
@@ -44069,7 +44069,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
     }
     __pyx_L5:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":465
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":465
  *             else:
  *                 new_id = sym_fromstring(self.fda.id2word[word_id], True)
  *             result = result + (new_id,)             # <<<<<<<<<<<<<<
@@ -44091,7 +44091,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":466
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":466
  *                 new_id = sym_fromstring(self.fda.id2word[word_id], True)
  *             result = result + (new_id,)
  *         patterns.append(Phrase(result))             # <<<<<<<<<<<<<<
@@ -44109,7 +44109,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
   __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_patterns, __pyx_t_4); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 466; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":467
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":467
  *             result = result + (new_id,)
  *         patterns.append(Phrase(result))
  *         patterns.append(Phrase(result + (sym_setindex(self.category, 1),)))             # <<<<<<<<<<<<<<
@@ -44137,7 +44137,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
   __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_patterns, __pyx_t_4); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 467; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":468
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":468
  *         patterns.append(Phrase(result))
  *         patterns.append(Phrase(result + (sym_setindex(self.category, 1),)))
  *         patterns.append(Phrase((sym_setindex(self.category, 1),) + result))             # <<<<<<<<<<<<<<
@@ -44165,7 +44165,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
   __pyx_t_9 = __Pyx_PyList_Append(__pyx_v_patterns, __pyx_t_4); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 468; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":469
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":469
  *         patterns.append(Phrase(result + (sym_setindex(self.category, 1),)))
  *         patterns.append(Phrase((sym_setindex(self.category, 1),) + result))
  *         return patterns             # <<<<<<<<<<<<<<
@@ -44177,7 +44177,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
   __pyx_r = __pyx_v_patterns;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":453
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":453
  *         return Phrase(result)
  * 
  *     def pattern2phrase_plus(self, pattern):             # <<<<<<<<<<<<<<
@@ -44202,7 +44202,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_6pattern2phra
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":471
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":471
  *         return patterns
  * 
  *     def precompute(self):             # <<<<<<<<<<<<<<
@@ -44250,7 +44250,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("precompute", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":474
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":474
  *         cdef Precomputation pre
  * 
  *         if self.precompute_file is not None:             # <<<<<<<<<<<<<<
@@ -44261,7 +44261,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":475
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":475
  * 
  *         if self.precompute_file is not None:
  *             start_time = monitor_cpu()             # <<<<<<<<<<<<<<
@@ -44276,7 +44276,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
     __pyx_v_start_time = __pyx_t_4;
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":476
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":476
  *         if self.precompute_file is not None:
  *             start_time = monitor_cpu()
  *             logger.info("Reading precomputed data from file %s... ", self.precompute_file)             # <<<<<<<<<<<<<<
@@ -44302,7 +44302,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":477
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":477
  *             start_time = monitor_cpu()
  *             logger.info("Reading precomputed data from file %s... ", self.precompute_file)
  *             pre = Precomputation(from_binary=self.precompute_file)             # <<<<<<<<<<<<<<
@@ -44318,7 +44318,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
     __pyx_v_pre = ((struct __pyx_obj_4cdec_2sa_3_sa_Precomputation *)__pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":479
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":479
  *             pre = Precomputation(from_binary=self.precompute_file)
  *             # check parameters of precomputation -- some are critical and some are not
  *             if pre.max_nonterminals != self.max_nonterminals:             # <<<<<<<<<<<<<<
@@ -44328,7 +44328,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
     __pyx_t_2 = ((__pyx_v_pre->max_nonterminals != __pyx_v_self->max_nonterminals) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":480
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":480
  *             # check parameters of precomputation -- some are critical and some are not
  *             if pre.max_nonterminals != self.max_nonterminals:
  *                 logger.warn("Precomputation done with max nonterminals %d, decoder uses %d", pre.max_nonterminals, self.max_nonterminals)             # <<<<<<<<<<<<<<
@@ -44364,7 +44364,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
     }
     __pyx_L4:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":481
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":481
  *             if pre.max_nonterminals != self.max_nonterminals:
  *                 logger.warn("Precomputation done with max nonterminals %d, decoder uses %d", pre.max_nonterminals, self.max_nonterminals)
  *             if pre.max_length != self.max_length:             # <<<<<<<<<<<<<<
@@ -44374,7 +44374,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
     __pyx_t_2 = ((__pyx_v_pre->max_length != __pyx_v_self->max_length) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":482
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":482
  *                 logger.warn("Precomputation done with max nonterminals %d, decoder uses %d", pre.max_nonterminals, self.max_nonterminals)
  *             if pre.max_length != self.max_length:
  *                 logger.warn("Precomputation done with max terminals %d, decoder uses %d", pre.max_length, self.max_length)             # <<<<<<<<<<<<<<
@@ -44410,7 +44410,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
     }
     __pyx_L5:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":483
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":483
  *             if pre.max_length != self.max_length:
  *                 logger.warn("Precomputation done with max terminals %d, decoder uses %d", pre.max_length, self.max_length)
  *             if pre.train_max_initial_size != self.train_max_initial_size:             # <<<<<<<<<<<<<<
@@ -44420,7 +44420,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
     __pyx_t_2 = ((__pyx_v_pre->train_max_initial_size != __pyx_v_self->train_max_initial_size) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":484
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":484
  *                 logger.warn("Precomputation done with max terminals %d, decoder uses %d", pre.max_length, self.max_length)
  *             if pre.train_max_initial_size != self.train_max_initial_size:
  *                 raise Exception("Precomputation done with max initial size %d, decoder uses %d" % (pre.train_max_initial_size, self.train_max_initial_size))             # <<<<<<<<<<<<<<
@@ -44455,7 +44455,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
       {__pyx_filename = __pyx_f[8]; __pyx_lineno = 484; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":485
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":485
  *             if pre.train_max_initial_size != self.train_max_initial_size:
  *                 raise Exception("Precomputation done with max initial size %d, decoder uses %d" % (pre.train_max_initial_size, self.train_max_initial_size))
  *             if pre.train_min_gap_size != self.train_min_gap_size:             # <<<<<<<<<<<<<<
@@ -44465,7 +44465,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
     __pyx_t_2 = ((__pyx_v_pre->train_min_gap_size != __pyx_v_self->train_min_gap_size) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":486
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":486
  *                 raise Exception("Precomputation done with max initial size %d, decoder uses %d" % (pre.train_max_initial_size, self.train_max_initial_size))
  *             if pre.train_min_gap_size != self.train_min_gap_size:
  *                 raise Exception("Precomputation done with min gap size %d, decoder uses %d" % (pre.train_min_gap_size, self.train_min_gap_size))             # <<<<<<<<<<<<<<
@@ -44500,7 +44500,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
       {__pyx_filename = __pyx_f[8]; __pyx_lineno = 486; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":487
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":487
  *             if pre.train_min_gap_size != self.train_min_gap_size:
  *                 raise Exception("Precomputation done with min gap size %d, decoder uses %d" % (pre.train_min_gap_size, self.train_min_gap_size))
  *             if self.use_index:             # <<<<<<<<<<<<<<
@@ -44510,7 +44510,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
     __pyx_t_2 = (__pyx_v_self->use_index != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":488
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":488
  *                 raise Exception("Precomputation done with min gap size %d, decoder uses %d" % (pre.train_min_gap_size, self.train_min_gap_size))
  *             if self.use_index:
  *                 logger.info("Converting %d hash keys on precomputed inverted index... ", len(pre.precomputed_index))             # <<<<<<<<<<<<<<
@@ -44542,7 +44542,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":489
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":489
  *             if self.use_index:
  *                 logger.info("Converting %d hash keys on precomputed inverted index... ", len(pre.precomputed_index))
  *                 for pattern, arr in pre.precomputed_index.iteritems():             # <<<<<<<<<<<<<<
@@ -44570,7 +44570,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
         __Pyx_XDECREF_SET(__pyx_v_arr, __pyx_t_5);
         __pyx_t_5 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":490
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":490
  *                 logger.info("Converting %d hash keys on precomputed inverted index... ", len(pre.precomputed_index))
  *                 for pattern, arr in pre.precomputed_index.iteritems():
  *                     phrases = self.pattern2phrase_plus(pattern)             # <<<<<<<<<<<<<<
@@ -44591,7 +44591,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
         __Pyx_XDECREF_SET(__pyx_v_phrases, __pyx_t_3);
         __pyx_t_3 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":491
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":491
  *                 for pattern, arr in pre.precomputed_index.iteritems():
  *                     phrases = self.pattern2phrase_plus(pattern)
  *                     for phrase in phrases:             # <<<<<<<<<<<<<<
@@ -44636,7 +44636,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
           __Pyx_XDECREF_SET(__pyx_v_phrase, __pyx_t_4);
           __pyx_t_4 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":492
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":492
  *                     phrases = self.pattern2phrase_plus(pattern)
  *                     for phrase in phrases:
  *                         self.precomputed_index[phrase] = arr             # <<<<<<<<<<<<<<
@@ -44652,7 +44652,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
     }
     __pyx_L8:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":493
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":493
  *                     for phrase in phrases:
  *                         self.precomputed_index[phrase] = arr
  *             if self.use_collocations:             # <<<<<<<<<<<<<<
@@ -44662,7 +44662,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
     __pyx_t_2 = (__pyx_v_self->use_collocations != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":494
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":494
  *                         self.precomputed_index[phrase] = arr
  *             if self.use_collocations:
  *                 logger.info("Converting %d hash keys on precomputed collocations... ", len(pre.precomputed_collocations))             # <<<<<<<<<<<<<<
@@ -44694,7 +44694,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":495
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":495
  *             if self.use_collocations:
  *                 logger.info("Converting %d hash keys on precomputed collocations... ", len(pre.precomputed_collocations))
  *                 for pattern, arr in pre.precomputed_collocations.iteritems():             # <<<<<<<<<<<<<<
@@ -44722,7 +44722,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
         __Pyx_XDECREF_SET(__pyx_v_arr, __pyx_t_3);
         __pyx_t_3 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":496
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":496
  *                 logger.info("Converting %d hash keys on precomputed collocations... ", len(pre.precomputed_collocations))
  *                 for pattern, arr in pre.precomputed_collocations.iteritems():
  *                     phrase = self.pattern2phrase(pattern)             # <<<<<<<<<<<<<<
@@ -44743,7 +44743,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
         __Pyx_XDECREF_SET(__pyx_v_phrase, __pyx_t_5);
         __pyx_t_5 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":497
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":497
  *                 for pattern, arr in pre.precomputed_collocations.iteritems():
  *                     phrase = self.pattern2phrase(pattern)
  *                     self.precomputed_collocations[phrase] = arr             # <<<<<<<<<<<<<<
@@ -44757,7 +44757,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
     }
     __pyx_L13:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":498
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":498
  *                     phrase = self.pattern2phrase(pattern)
  *                     self.precomputed_collocations[phrase] = arr
  *             stop_time = monitor_cpu()             # <<<<<<<<<<<<<<
@@ -44772,7 +44772,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
     __pyx_v_stop_time = __pyx_t_5;
     __pyx_t_5 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":499
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":499
  *                     self.precomputed_collocations[phrase] = arr
  *             stop_time = monitor_cpu()
  *             logger.info("Processing precomputations took %f seconds", stop_time - start_time)             # <<<<<<<<<<<<<<
@@ -44803,7 +44803,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":471
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":471
  *         return patterns
  * 
  *     def precompute(self):             # <<<<<<<<<<<<<<
@@ -44834,7 +44834,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8precompute(s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":502
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":502
  * 
  * 
  *     def get_precomputed_collocation(self, phrase):             # <<<<<<<<<<<<<<
@@ -44870,7 +44870,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_10get_precomp
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_precomputed_collocation", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":503
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":503
  * 
  *     def get_precomputed_collocation(self, phrase):
  *         if phrase in self.precomputed_collocations:             # <<<<<<<<<<<<<<
@@ -44881,7 +44881,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_10get_precomp
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":504
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":504
  *     def get_precomputed_collocation(self, phrase):
  *         if phrase in self.precomputed_collocations:
  *             arr = self.precomputed_collocations[phrase]             # <<<<<<<<<<<<<<
@@ -44893,7 +44893,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_10get_precomp
     __pyx_v_arr = __pyx_t_3;
     __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":505
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":505
  *         if phrase in self.precomputed_collocations:
  *             arr = self.precomputed_collocations[phrase]
  *             return PhraseLocation(arr=arr, arr_low=0, arr_high=len(arr), num_subpatterns=phrase.arity()+1)             # <<<<<<<<<<<<<<
@@ -44928,7 +44928,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_10get_precomp
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":506
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":506
  *             arr = self.precomputed_collocations[phrase]
  *             return PhraseLocation(arr=arr, arr_low=0, arr_high=len(arr), num_subpatterns=phrase.arity()+1)
  *         return None             # <<<<<<<<<<<<<<
@@ -44940,7 +44940,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_10get_precomp
   __pyx_r = Py_None;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":502
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":502
  * 
  * 
  *     def get_precomputed_collocation(self, phrase):             # <<<<<<<<<<<<<<
@@ -44962,7 +44962,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_10get_precomp
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":509
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":509
  * 
  * 
  *     cdef int* baeza_yates_helper(self, int low1, int high1, int* arr1, int step1,             # <<<<<<<<<<<<<<
@@ -45008,7 +45008,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("baeza_yates_helper", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":522
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":522
  *         cdef Matching loc1, loc2
  * 
  *         result = <int*> malloc(0*sizeof(int*))             # <<<<<<<<<<<<<<
@@ -45017,7 +45017,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_v_result = ((int *)malloc((0 * (sizeof(int *)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":524
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":524
  *         result = <int*> malloc(0*sizeof(int*))
  * 
  *         d_first = 0             # <<<<<<<<<<<<<<
@@ -45026,7 +45026,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_v_d_first = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":525
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":525
  * 
  *         d_first = 0
  *         if high1 - low1 > high2 - low2:             # <<<<<<<<<<<<<<
@@ -45036,7 +45036,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   __pyx_t_1 = (((__pyx_v_high1 - __pyx_v_low1) > (__pyx_v_high2 - __pyx_v_low2)) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":526
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":526
  *         d_first = 0
  *         if high1 - low1 > high2 - low2:
  *             d_first = 1             # <<<<<<<<<<<<<<
@@ -45048,7 +45048,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":530
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":530
  *         # First, check to see if we are at any of the recursive base cases
  *         # Case 1: one of the sets is empty
  *         if low1 >= high1 or low2 >= high2:             # <<<<<<<<<<<<<<
@@ -45064,7 +45064,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   }
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":531
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":531
  *         # Case 1: one of the sets is empty
  *         if low1 >= high1 or low2 >= high2:
  *             return result             # <<<<<<<<<<<<<<
@@ -45075,7 +45075,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":534
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":534
  * 
  *         # Case 2: sets are non-overlapping
  *         assign_matching(&loc1, arr1, high1-step1, step1, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -45084,7 +45084,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_f_4cdec_2sa_3_sa_assign_matching((&__pyx_v_loc1), __pyx_v_arr1, (__pyx_v_high1 - __pyx_v_step1), __pyx_v_step1, __pyx_v_self->fda->sent_id->arr);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":535
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":535
  *         # Case 2: sets are non-overlapping
  *         assign_matching(&loc1, arr1, high1-step1, step1, self.fda.sent_id.arr)
  *         assign_matching(&loc2, arr2, low2, step2, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -45093,7 +45093,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_f_4cdec_2sa_3_sa_assign_matching((&__pyx_v_loc2), __pyx_v_arr2, __pyx_v_low2, __pyx_v_step2, __pyx_v_self->fda->sent_id->arr);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":536
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":536
  *         assign_matching(&loc1, arr1, high1-step1, step1, self.fda.sent_id.arr)
  *         assign_matching(&loc2, arr2, low2, step2, self.fda.sent_id.arr)
  *         if self.compare_matchings(&loc1, &loc2, offset_by_one, len_last) == -1:             # <<<<<<<<<<<<<<
@@ -45103,7 +45103,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   __pyx_t_3 = ((((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->compare_matchings(__pyx_v_self, (&__pyx_v_loc1), (&__pyx_v_loc2), __pyx_v_offset_by_one, __pyx_v_len_last) == -1) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":537
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":537
  *         assign_matching(&loc2, arr2, low2, step2, self.fda.sent_id.arr)
  *         if self.compare_matchings(&loc1, &loc2, offset_by_one, len_last) == -1:
  *             return result             # <<<<<<<<<<<<<<
@@ -45114,7 +45114,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":539
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":539
  *             return result
  * 
  *         assign_matching(&loc1, arr1, low1, step1, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -45123,7 +45123,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_f_4cdec_2sa_3_sa_assign_matching((&__pyx_v_loc1), __pyx_v_arr1, __pyx_v_low1, __pyx_v_step1, __pyx_v_self->fda->sent_id->arr);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":540
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":540
  * 
  *         assign_matching(&loc1, arr1, low1, step1, self.fda.sent_id.arr)
  *         assign_matching(&loc2, arr2, high2-step2, step2, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -45132,7 +45132,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_f_4cdec_2sa_3_sa_assign_matching((&__pyx_v_loc2), __pyx_v_arr2, (__pyx_v_high2 - __pyx_v_step2), __pyx_v_step2, __pyx_v_self->fda->sent_id->arr);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":541
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":541
  *         assign_matching(&loc1, arr1, low1, step1, self.fda.sent_id.arr)
  *         assign_matching(&loc2, arr2, high2-step2, step2, self.fda.sent_id.arr)
  *         if self.compare_matchings(&loc1, &loc2, offset_by_one, len_last) == 1:             # <<<<<<<<<<<<<<
@@ -45142,7 +45142,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   __pyx_t_3 = ((((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->compare_matchings(__pyx_v_self, (&__pyx_v_loc1), (&__pyx_v_loc2), __pyx_v_offset_by_one, __pyx_v_len_last) == 1) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":542
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":542
  *         assign_matching(&loc2, arr2, high2-step2, step2, self.fda.sent_id.arr)
  *         if self.compare_matchings(&loc1, &loc2, offset_by_one, len_last) == 1:
  *             return result             # <<<<<<<<<<<<<<
@@ -45153,7 +45153,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":546
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":546
  *         # Case 3: query set and data set do not meet size mismatch constraints;
  *         # We use mergesort instead in this case
  *         qsetsize = (high1-low1) / step1             # <<<<<<<<<<<<<<
@@ -45183,7 +45183,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   }
   __pyx_v_qsetsize = __Pyx_div_int(__pyx_t_4, __pyx_v_step1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":547
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":547
  *         # We use mergesort instead in this case
  *         qsetsize = (high1-low1) / step1
  *         dsetsize = (high2-low2) / step2             # <<<<<<<<<<<<<<
@@ -45213,7 +45213,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   }
   __pyx_v_dsetsize = __Pyx_div_int(__pyx_t_4, __pyx_v_step2);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":548
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":548
  *         qsetsize = (high1-low1) / step1
  *         dsetsize = (high2-low2) / step2
  *         if d_first:             # <<<<<<<<<<<<<<
@@ -45223,7 +45223,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   __pyx_t_3 = (__pyx_v_d_first != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":549
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":549
  *         dsetsize = (high2-low2) / step2
  *         if d_first:
  *             tmp = qsetsize             # <<<<<<<<<<<<<<
@@ -45232,7 +45232,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_tmp = __pyx_v_qsetsize;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":550
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":550
  *         if d_first:
  *             tmp = qsetsize
  *             qsetsize = dsetsize             # <<<<<<<<<<<<<<
@@ -45241,7 +45241,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_qsetsize = __pyx_v_dsetsize;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":551
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":551
  *             tmp = qsetsize
  *             qsetsize = dsetsize
  *             dsetsize = tmp             # <<<<<<<<<<<<<<
@@ -45253,7 +45253,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   }
   __pyx_L7:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":553
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":553
  *             dsetsize = tmp
  * 
  *         if self.by_slack_factor * qsetsize * log(dsetsize) / log(2) > dsetsize:             # <<<<<<<<<<<<<<
@@ -45275,7 +45275,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   __pyx_t_3 = (((__pyx_t_5 / __pyx_t_6) > __pyx_v_dsetsize) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":554
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":554
  * 
  *         if self.by_slack_factor * qsetsize * log(dsetsize) / log(2) > dsetsize:
  *             free(result)             # <<<<<<<<<<<<<<
@@ -45284,7 +45284,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     free(__pyx_v_result);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":555
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":555
  *         if self.by_slack_factor * qsetsize * log(dsetsize) / log(2) > dsetsize:
  *             free(result)
  *             return self.merge_helper(low1, high1, arr1, step1, low2, high2, arr2, step2, offset_by_one, len_last, num_subpatterns, result_len)             # <<<<<<<<<<<<<<
@@ -45295,7 +45295,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":559
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":559
  *         # binary search.    There are two flavors, depending on
  *         # whether the queryset or dataset is first
  *         if d_first:             # <<<<<<<<<<<<<<
@@ -45305,7 +45305,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   __pyx_t_3 = (__pyx_v_d_first != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":560
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":560
  *         # whether the queryset or dataset is first
  *         if d_first:
  *             med2 = median(low2, high2, step2)             # <<<<<<<<<<<<<<
@@ -45314,7 +45314,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_med2 = __pyx_f_4cdec_2sa_3_sa_median(__pyx_v_low2, __pyx_v_high2, __pyx_v_step2);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":561
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":561
  *         if d_first:
  *             med2 = median(low2, high2, step2)
  *             assign_matching(&loc2, arr2, med2, step2, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -45323,7 +45323,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_f_4cdec_2sa_3_sa_assign_matching((&__pyx_v_loc2), __pyx_v_arr2, __pyx_v_med2, __pyx_v_step2, __pyx_v_self->fda->sent_id->arr);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":563
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":563
  *             assign_matching(&loc2, arr2, med2, step2, self.fda.sent_id.arr)
  * 
  *             search_low = low1             # <<<<<<<<<<<<<<
@@ -45332,7 +45332,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_search_low = __pyx_v_low1;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":564
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":564
  * 
  *             search_low = low1
  *             search_high = high1             # <<<<<<<<<<<<<<
@@ -45341,7 +45341,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_search_high = __pyx_v_high1;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":565
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":565
  *             search_low = low1
  *             search_high = high1
  *             while search_low < search_high:             # <<<<<<<<<<<<<<
@@ -45352,7 +45352,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
       __pyx_t_3 = ((__pyx_v_search_low < __pyx_v_search_high) != 0);
       if (!__pyx_t_3) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":566
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":566
  *             search_high = high1
  *             while search_low < search_high:
  *                 med1 = median(search_low, search_high, step1)             # <<<<<<<<<<<<<<
@@ -45361,7 +45361,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
       __pyx_v_med1 = __pyx_f_4cdec_2sa_3_sa_median(__pyx_v_search_low, __pyx_v_search_high, __pyx_v_step1);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":567
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":567
  *             while search_low < search_high:
  *                 med1 = median(search_low, search_high, step1)
  *                 find_comparable_matchings(low1, high1, arr1, step1, med1, &med1_minus, &med1_plus)             # <<<<<<<<<<<<<<
@@ -45370,7 +45370,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
       __pyx_f_4cdec_2sa_3_sa_find_comparable_matchings(__pyx_v_low1, __pyx_v_high1, __pyx_v_arr1, __pyx_v_step1, __pyx_v_med1, (&__pyx_v_med1_minus), (&__pyx_v_med1_plus));
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":568
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":568
  *                 med1 = median(search_low, search_high, step1)
  *                 find_comparable_matchings(low1, high1, arr1, step1, med1, &med1_minus, &med1_plus)
  *                 comparison = self.compare_matchings_set(med1_minus, med1_plus, arr1, step1, &loc2, offset_by_one, len_last)             # <<<<<<<<<<<<<<
@@ -45379,7 +45379,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
       __pyx_v_comparison = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->compare_matchings_set(__pyx_v_self, __pyx_v_med1_minus, __pyx_v_med1_plus, __pyx_v_arr1, __pyx_v_step1, (&__pyx_v_loc2), __pyx_v_offset_by_one, __pyx_v_len_last);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":571
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":571
  *                 if comparison == -1:
  *                     search_low = med1_plus
  *                 elif comparison == 1:             # <<<<<<<<<<<<<<
@@ -45388,7 +45388,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
       switch (__pyx_v_comparison) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":569
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":569
  *                 find_comparable_matchings(low1, high1, arr1, step1, med1, &med1_minus, &med1_plus)
  *                 comparison = self.compare_matchings_set(med1_minus, med1_plus, arr1, step1, &loc2, offset_by_one, len_last)
  *                 if comparison == -1:             # <<<<<<<<<<<<<<
@@ -45397,7 +45397,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
         case -1:
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":570
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":570
  *                 comparison = self.compare_matchings_set(med1_minus, med1_plus, arr1, step1, &loc2, offset_by_one, len_last)
  *                 if comparison == -1:
  *                     search_low = med1_plus             # <<<<<<<<<<<<<<
@@ -45407,7 +45407,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
         __pyx_v_search_low = __pyx_v_med1_plus;
         break;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":571
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":571
  *                 if comparison == -1:
  *                     search_low = med1_plus
  *                 elif comparison == 1:             # <<<<<<<<<<<<<<
@@ -45416,7 +45416,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
         case 1:
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":572
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":572
  *                     search_low = med1_plus
  *                 elif comparison == 1:
  *                     search_high = med1_minus             # <<<<<<<<<<<<<<
@@ -45427,7 +45427,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
         break;
         default:
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":574
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":574
  *                     search_high = med1_minus
  *                 else:
  *                     break             # <<<<<<<<<<<<<<
@@ -45443,7 +45443,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":576
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":576
  *                     break
  *         else:
  *             med1 = median(low1, high1, step1)             # <<<<<<<<<<<<<<
@@ -45452,7 +45452,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_med1 = __pyx_f_4cdec_2sa_3_sa_median(__pyx_v_low1, __pyx_v_high1, __pyx_v_step1);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":577
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":577
  *         else:
  *             med1 = median(low1, high1, step1)
  *             find_comparable_matchings(low1, high1, arr1, step1, med1, &med1_minus, &med1_plus)             # <<<<<<<<<<<<<<
@@ -45461,7 +45461,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_f_4cdec_2sa_3_sa_find_comparable_matchings(__pyx_v_low1, __pyx_v_high1, __pyx_v_arr1, __pyx_v_step1, __pyx_v_med1, (&__pyx_v_med1_minus), (&__pyx_v_med1_plus));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":579
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":579
  *             find_comparable_matchings(low1, high1, arr1, step1, med1, &med1_minus, &med1_plus)
  * 
  *             search_low = low2             # <<<<<<<<<<<<<<
@@ -45470,7 +45470,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_search_low = __pyx_v_low2;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":580
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":580
  * 
  *             search_low = low2
  *             search_high = high2             # <<<<<<<<<<<<<<
@@ -45479,7 +45479,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_search_high = __pyx_v_high2;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":581
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":581
  *             search_low = low2
  *             search_high = high2
  *             while search_low < search_high:             # <<<<<<<<<<<<<<
@@ -45490,7 +45490,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
       __pyx_t_3 = ((__pyx_v_search_low < __pyx_v_search_high) != 0);
       if (!__pyx_t_3) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":582
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":582
  *             search_high = high2
  *             while search_low < search_high:
  *                 med2 = median(search_low, search_high, step2)             # <<<<<<<<<<<<<<
@@ -45499,7 +45499,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
       __pyx_v_med2 = __pyx_f_4cdec_2sa_3_sa_median(__pyx_v_search_low, __pyx_v_search_high, __pyx_v_step2);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":583
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":583
  *             while search_low < search_high:
  *                 med2 = median(search_low, search_high, step2)
  *                 assign_matching(&loc2, arr2, med2, step2, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -45508,7 +45508,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
       __pyx_f_4cdec_2sa_3_sa_assign_matching((&__pyx_v_loc2), __pyx_v_arr2, __pyx_v_med2, __pyx_v_step2, __pyx_v_self->fda->sent_id->arr);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":584
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":584
  *                 med2 = median(search_low, search_high, step2)
  *                 assign_matching(&loc2, arr2, med2, step2, self.fda.sent_id.arr)
  *                 comparison = self.compare_matchings_set(med1_minus, med1_plus, arr1, step1, &loc2, offset_by_one, len_last)             # <<<<<<<<<<<<<<
@@ -45517,7 +45517,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
       __pyx_v_comparison = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->compare_matchings_set(__pyx_v_self, __pyx_v_med1_minus, __pyx_v_med1_plus, __pyx_v_arr1, __pyx_v_step1, (&__pyx_v_loc2), __pyx_v_offset_by_one, __pyx_v_len_last);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":587
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":587
  *                 if comparison == -1:
  *                     search_high = med2
  *                 elif comparison == 1:             # <<<<<<<<<<<<<<
@@ -45526,7 +45526,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
       switch (__pyx_v_comparison) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":585
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":585
  *                 assign_matching(&loc2, arr2, med2, step2, self.fda.sent_id.arr)
  *                 comparison = self.compare_matchings_set(med1_minus, med1_plus, arr1, step1, &loc2, offset_by_one, len_last)
  *                 if comparison == -1:             # <<<<<<<<<<<<<<
@@ -45535,7 +45535,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
         case -1:
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":586
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":586
  *                 comparison = self.compare_matchings_set(med1_minus, med1_plus, arr1, step1, &loc2, offset_by_one, len_last)
  *                 if comparison == -1:
  *                     search_high = med2             # <<<<<<<<<<<<<<
@@ -45545,7 +45545,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
         __pyx_v_search_high = __pyx_v_med2;
         break;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":587
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":587
  *                 if comparison == -1:
  *                     search_high = med2
  *                 elif comparison == 1:             # <<<<<<<<<<<<<<
@@ -45554,7 +45554,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
         case 1:
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":588
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":588
  *                     search_high = med2
  *                 elif comparison == 1:
  *                     search_low = med2 + step2             # <<<<<<<<<<<<<<
@@ -45565,7 +45565,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
         break;
         default:
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":590
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":590
  *                     search_low = med2 + step2
  *                 else:
  *                     break             # <<<<<<<<<<<<<<
@@ -45580,7 +45580,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   }
   __pyx_L9:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":592
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":592
  *                     break
  * 
  *         med_result_len = 0             # <<<<<<<<<<<<<<
@@ -45589,7 +45589,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_v_med_result_len = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":593
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":593
  * 
  *         med_result_len = 0
  *         med_result = <int*> malloc(0*sizeof(int*))             # <<<<<<<<<<<<<<
@@ -45598,7 +45598,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_v_med_result = ((int *)malloc((0 * (sizeof(int *)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":594
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":594
  *         med_result_len = 0
  *         med_result = <int*> malloc(0*sizeof(int*))
  *         if search_high > search_low:             # <<<<<<<<<<<<<<
@@ -45608,7 +45608,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   __pyx_t_3 = ((__pyx_v_search_high > __pyx_v_search_low) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":600
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":600
  *             # want to store the bindings for all of those elements.    We can
  *             # subsequently throw all of them away.
  *             med2_minus = med2             # <<<<<<<<<<<<<<
@@ -45617,7 +45617,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_med2_minus = __pyx_v_med2;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":601
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":601
  *             # subsequently throw all of them away.
  *             med2_minus = med2
  *             med2_plus = med2 + step2             # <<<<<<<<<<<<<<
@@ -45626,7 +45626,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_med2_plus = (__pyx_v_med2 + __pyx_v_step2);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":602
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":602
  *             med2_minus = med2
  *             med2_plus = med2 + step2
  *             i1 = med1_minus             # <<<<<<<<<<<<<<
@@ -45635,7 +45635,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_i1 = __pyx_v_med1_minus;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":603
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":603
  *             med2_plus = med2 + step2
  *             i1 = med1_minus
  *             while i1 < med1_plus:             # <<<<<<<<<<<<<<
@@ -45646,7 +45646,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
       __pyx_t_3 = ((__pyx_v_i1 < __pyx_v_med1_plus) != 0);
       if (!__pyx_t_3) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":604
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":604
  *             i1 = med1_minus
  *             while i1 < med1_plus:
  *                 assign_matching(&loc1, arr1, i1, step1, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -45655,7 +45655,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
       __pyx_f_4cdec_2sa_3_sa_assign_matching((&__pyx_v_loc1), __pyx_v_arr1, __pyx_v_i1, __pyx_v_step1, __pyx_v_self->fda->sent_id->arr);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":605
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":605
  *             while i1 < med1_plus:
  *                 assign_matching(&loc1, arr1, i1, step1, self.fda.sent_id.arr)
  *                 while med2_minus-step2 >= low2:             # <<<<<<<<<<<<<<
@@ -45666,7 +45666,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
         __pyx_t_3 = (((__pyx_v_med2_minus - __pyx_v_step2) >= __pyx_v_low2) != 0);
         if (!__pyx_t_3) break;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":606
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":606
  *                 assign_matching(&loc1, arr1, i1, step1, self.fda.sent_id.arr)
  *                 while med2_minus-step2 >= low2:
  *                     assign_matching(&loc2, arr2, med2_minus-step2, step2, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -45675,7 +45675,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
         __pyx_f_4cdec_2sa_3_sa_assign_matching((&__pyx_v_loc2), __pyx_v_arr2, (__pyx_v_med2_minus - __pyx_v_step2), __pyx_v_step2, __pyx_v_self->fda->sent_id->arr);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":607
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":607
  *                 while med2_minus-step2 >= low2:
  *                     assign_matching(&loc2, arr2, med2_minus-step2, step2, self.fda.sent_id.arr)
  *                     if self.compare_matchings(&loc1, &loc2, offset_by_one, len_last) < 1:             # <<<<<<<<<<<<<<
@@ -45685,7 +45685,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
         __pyx_t_3 = ((((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->compare_matchings(__pyx_v_self, (&__pyx_v_loc1), (&__pyx_v_loc2), __pyx_v_offset_by_one, __pyx_v_len_last) < 1) != 0);
         if (__pyx_t_3) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":608
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":608
  *                     assign_matching(&loc2, arr2, med2_minus-step2, step2, self.fda.sent_id.arr)
  *                     if self.compare_matchings(&loc1, &loc2, offset_by_one, len_last) < 1:
  *                         med2_minus = med2_minus - step2             # <<<<<<<<<<<<<<
@@ -45697,7 +45697,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
         }
         /*else*/ {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":610
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":610
  *                         med2_minus = med2_minus - step2
  *                     else:
  *                         break             # <<<<<<<<<<<<<<
@@ -45710,7 +45710,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
       }
       __pyx_L18_break:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":611
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":611
  *                     else:
  *                         break
  *                 i2 = med2_minus             # <<<<<<<<<<<<<<
@@ -45719,7 +45719,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
       __pyx_v_i2 = __pyx_v_med2_minus;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":612
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":612
  *                         break
  *                 i2 = med2_minus
  *                 while i2 < high2:             # <<<<<<<<<<<<<<
@@ -45730,7 +45730,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
         __pyx_t_3 = ((__pyx_v_i2 < __pyx_v_high2) != 0);
         if (!__pyx_t_3) break;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":613
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":613
  *                 i2 = med2_minus
  *                 while i2 < high2:
  *                     assign_matching(&loc2, arr2, i2, step2, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -45739,7 +45739,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
         __pyx_f_4cdec_2sa_3_sa_assign_matching((&__pyx_v_loc2), __pyx_v_arr2, __pyx_v_i2, __pyx_v_step2, __pyx_v_self->fda->sent_id->arr);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":614
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":614
  *                 while i2 < high2:
  *                     assign_matching(&loc2, arr2, i2, step2, self.fda.sent_id.arr)
  *                     comparison = self.compare_matchings(&loc1, &loc2, offset_by_one, len_last)             # <<<<<<<<<<<<<<
@@ -45748,7 +45748,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
         __pyx_v_comparison = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->compare_matchings(__pyx_v_self, (&__pyx_v_loc1), (&__pyx_v_loc2), __pyx_v_offset_by_one, __pyx_v_len_last);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":615
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":615
  *                     assign_matching(&loc2, arr2, i2, step2, self.fda.sent_id.arr)
  *                     comparison = self.compare_matchings(&loc1, &loc2, offset_by_one, len_last)
  *                     if comparison == 0:             # <<<<<<<<<<<<<<
@@ -45758,7 +45758,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
         __pyx_t_3 = ((__pyx_v_comparison == 0) != 0);
         if (__pyx_t_3) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":617
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":617
  *                     if comparison == 0:
  *                         pass
  *                         med_result = append_combined_matching(med_result, &loc1, &loc2, offset_by_one, num_subpatterns, &med_result_len)             # <<<<<<<<<<<<<<
@@ -45770,7 +45770,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
         }
         __pyx_L22:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":618
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":618
  *                         pass
  *                         med_result = append_combined_matching(med_result, &loc1, &loc2, offset_by_one, num_subpatterns, &med_result_len)
  *                     if comparison == -1:             # <<<<<<<<<<<<<<
@@ -45780,7 +45780,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
         __pyx_t_3 = ((__pyx_v_comparison == -1) != 0);
         if (__pyx_t_3) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":619
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":619
  *                         med_result = append_combined_matching(med_result, &loc1, &loc2, offset_by_one, num_subpatterns, &med_result_len)
  *                     if comparison == -1:
  *                         break             # <<<<<<<<<<<<<<
@@ -45790,7 +45790,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
           goto __pyx_L21_break;
         }
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":620
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":620
  *                     if comparison == -1:
  *                         break
  *                     i2 = i2 + step2             # <<<<<<<<<<<<<<
@@ -45801,7 +45801,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
       }
       __pyx_L21_break:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":621
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":621
  *                         break
  *                     i2 = i2 + step2
  *                 if i2 > med2_plus:             # <<<<<<<<<<<<<<
@@ -45811,7 +45811,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
       __pyx_t_3 = ((__pyx_v_i2 > __pyx_v_med2_plus) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":622
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":622
  *                     i2 = i2 + step2
  *                 if i2 > med2_plus:
  *                     med2_plus = i2             # <<<<<<<<<<<<<<
@@ -45823,7 +45823,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
       }
       __pyx_L24:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":623
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":623
  *                 if i2 > med2_plus:
  *                     med2_plus = i2
  *                 i1 = i1 + step1             # <<<<<<<<<<<<<<
@@ -45833,7 +45833,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
       __pyx_v_i1 = (__pyx_v_i1 + __pyx_v_step1);
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":625
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":625
  *                 i1 = i1 + step1
  * 
  *             tmp = med1_minus             # <<<<<<<<<<<<<<
@@ -45842,7 +45842,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_tmp = __pyx_v_med1_minus;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":626
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":626
  * 
  *             tmp = med1_minus
  *             med1_minus = med1_plus             # <<<<<<<<<<<<<<
@@ -45851,7 +45851,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_med1_minus = __pyx_v_med1_plus;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":627
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":627
  *             tmp = med1_minus
  *             med1_minus = med1_plus
  *             med1_plus = tmp             # <<<<<<<<<<<<<<
@@ -45863,7 +45863,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":630
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":630
  *         else:
  *             # No match; need to figure out the point of division in D and Q
  *             med2_minus = med2             # <<<<<<<<<<<<<<
@@ -45872,7 +45872,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_med2_minus = __pyx_v_med2;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":631
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":631
  *             # No match; need to figure out the point of division in D and Q
  *             med2_minus = med2
  *             med2_plus = med2             # <<<<<<<<<<<<<<
@@ -45881,7 +45881,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
     __pyx_v_med2_plus = __pyx_v_med2;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":632
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":632
  *             med2_minus = med2
  *             med2_plus = med2
  *             if d_first:             # <<<<<<<<<<<<<<
@@ -45891,7 +45891,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
     __pyx_t_3 = (__pyx_v_d_first != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":633
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":633
  *             med2_plus = med2
  *             if d_first:
  *                 med2_minus = med2_minus + step2             # <<<<<<<<<<<<<<
@@ -45900,7 +45900,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
       __pyx_v_med2_minus = (__pyx_v_med2_minus + __pyx_v_step2);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":634
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":634
  *             if d_first:
  *                 med2_minus = med2_minus + step2
  *                 if comparison == -1:             # <<<<<<<<<<<<<<
@@ -45910,7 +45910,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
       __pyx_t_3 = ((__pyx_v_comparison == -1) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":635
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":635
  *                 med2_minus = med2_minus + step2
  *                 if comparison == -1:
  *                     med1_minus = med1_plus             # <<<<<<<<<<<<<<
@@ -45922,7 +45922,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
       }
       __pyx_L26:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":636
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":636
  *                 if comparison == -1:
  *                     med1_minus = med1_plus
  *                 if comparison == 1:             # <<<<<<<<<<<<<<
@@ -45932,7 +45932,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
       __pyx_t_3 = ((__pyx_v_comparison == 1) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":637
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":637
  *                     med1_minus = med1_plus
  *                 if comparison == 1:
  *                     med1_plus = med1_minus             # <<<<<<<<<<<<<<
@@ -45947,7 +45947,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":639
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":639
  *                     med1_plus = med1_minus
  *             else:
  *                 tmp = med1_minus             # <<<<<<<<<<<<<<
@@ -45956,7 +45956,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
       __pyx_v_tmp = __pyx_v_med1_minus;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":640
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":640
  *             else:
  *                 tmp = med1_minus
  *                 med1_minus = med1_plus             # <<<<<<<<<<<<<<
@@ -45965,7 +45965,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
       __pyx_v_med1_minus = __pyx_v_med1_plus;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":641
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":641
  *                 tmp = med1_minus
  *                 med1_minus = med1_plus
  *                 med1_plus = tmp             # <<<<<<<<<<<<<<
@@ -45974,7 +45974,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
       __pyx_v_med1_plus = __pyx_v_tmp;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":642
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":642
  *                 med1_minus = med1_plus
  *                 med1_plus = tmp
  *                 if comparison == 1:             # <<<<<<<<<<<<<<
@@ -45984,7 +45984,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
       __pyx_t_3 = ((__pyx_v_comparison == 1) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":643
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":643
  *                 med1_plus = tmp
  *                 if comparison == 1:
  *                     med2_minus = med2_minus + step2             # <<<<<<<<<<<<<<
@@ -45993,7 +45993,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
         __pyx_v_med2_minus = (__pyx_v_med2_minus + __pyx_v_step2);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":644
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":644
  *                 if comparison == 1:
  *                     med2_minus = med2_minus + step2
  *                     med2_plus = med2_plus + step2             # <<<<<<<<<<<<<<
@@ -46009,7 +46009,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   }
   __pyx_L14:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":646
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":646
  *                     med2_plus = med2_plus + step2
  * 
  *         low_result_len = 0             # <<<<<<<<<<<<<<
@@ -46018,7 +46018,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_v_low_result_len = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":647
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":647
  * 
  *         low_result_len = 0
  *         low_result = self.baeza_yates_helper(low1, med1_plus, arr1, step1, low2, med2_plus, arr2, step2, offset_by_one, len_last, num_subpatterns, &low_result_len)             # <<<<<<<<<<<<<<
@@ -46027,7 +46027,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_v_low_result = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->baeza_yates_helper(__pyx_v_self, __pyx_v_low1, __pyx_v_med1_plus, __pyx_v_arr1, __pyx_v_step1, __pyx_v_low2, __pyx_v_med2_plus, __pyx_v_arr2, __pyx_v_step2, __pyx_v_offset_by_one, __pyx_v_len_last, __pyx_v_num_subpatterns, (&__pyx_v_low_result_len));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":648
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":648
  *         low_result_len = 0
  *         low_result = self.baeza_yates_helper(low1, med1_plus, arr1, step1, low2, med2_plus, arr2, step2, offset_by_one, len_last, num_subpatterns, &low_result_len)
  *         high_result_len = 0             # <<<<<<<<<<<<<<
@@ -46036,7 +46036,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_v_high_result_len = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":649
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":649
  *         low_result = self.baeza_yates_helper(low1, med1_plus, arr1, step1, low2, med2_plus, arr2, step2, offset_by_one, len_last, num_subpatterns, &low_result_len)
  *         high_result_len = 0
  *         high_result = self.baeza_yates_helper(med1_minus, high1, arr1, step1, med2_minus, high2, arr2, step2, offset_by_one, len_last, num_subpatterns, &high_result_len)             # <<<<<<<<<<<<<<
@@ -46045,7 +46045,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_v_high_result = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->baeza_yates_helper(__pyx_v_self, __pyx_v_med1_minus, __pyx_v_high1, __pyx_v_arr1, __pyx_v_step1, __pyx_v_med2_minus, __pyx_v_high2, __pyx_v_arr2, __pyx_v_step2, __pyx_v_offset_by_one, __pyx_v_len_last, __pyx_v_num_subpatterns, (&__pyx_v_high_result_len));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":651
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":651
  *         high_result = self.baeza_yates_helper(med1_minus, high1, arr1, step1, med2_minus, high2, arr2, step2, offset_by_one, len_last, num_subpatterns, &high_result_len)
  * 
  *         result = extend_arr(result, result_len, low_result, low_result_len)             # <<<<<<<<<<<<<<
@@ -46054,7 +46054,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_v_result = __pyx_f_4cdec_2sa_3_sa_extend_arr(__pyx_v_result, __pyx_v_result_len, __pyx_v_low_result, __pyx_v_low_result_len);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":652
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":652
  * 
  *         result = extend_arr(result, result_len, low_result, low_result_len)
  *         result = extend_arr(result, result_len, med_result, med_result_len)             # <<<<<<<<<<<<<<
@@ -46063,7 +46063,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_v_result = __pyx_f_4cdec_2sa_3_sa_extend_arr(__pyx_v_result, __pyx_v_result_len, __pyx_v_med_result, __pyx_v_med_result_len);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":653
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":653
  *         result = extend_arr(result, result_len, low_result, low_result_len)
  *         result = extend_arr(result, result_len, med_result, med_result_len)
  *         result = extend_arr(result, result_len, high_result, high_result_len)             # <<<<<<<<<<<<<<
@@ -46072,7 +46072,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   __pyx_v_result = __pyx_f_4cdec_2sa_3_sa_extend_arr(__pyx_v_result, __pyx_v_result_len, __pyx_v_high_result, __pyx_v_high_result_len);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":654
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":654
  *         result = extend_arr(result, result_len, med_result, med_result_len)
  *         result = extend_arr(result, result_len, high_result, high_result_len)
  *         free(low_result)             # <<<<<<<<<<<<<<
@@ -46081,7 +46081,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   free(__pyx_v_low_result);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":655
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":655
  *         result = extend_arr(result, result_len, high_result, high_result_len)
  *         free(low_result)
  *         free(med_result)             # <<<<<<<<<<<<<<
@@ -46090,7 +46090,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   free(__pyx_v_med_result);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":656
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":656
  *         free(low_result)
  *         free(med_result)
  *         free(high_result)             # <<<<<<<<<<<<<<
@@ -46099,7 +46099,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
  */
   free(__pyx_v_high_result);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":658
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":658
  *         free(high_result)
  * 
  *         return result             # <<<<<<<<<<<<<<
@@ -46109,7 +46109,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   __pyx_r = __pyx_v_result;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":509
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":509
  * 
  * 
  *     cdef int* baeza_yates_helper(self, int low1, int high1, int* arr1, int step1,             # <<<<<<<<<<<<<<
@@ -46126,7 +46126,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_baeza_yates_helper(
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":662
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":662
  * 
  * 
  *     cdef long compare_matchings_set(self, int i1_minus, int i1_plus, int* arr1, int step1,             # <<<<<<<<<<<<<<
@@ -46145,7 +46145,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
   int __pyx_t_1;
   __Pyx_RefNannySetupContext("compare_matchings_set", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":673
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":673
  *         cdef Matching* loc1
  * 
  *         loc1 = &l1_stack             # <<<<<<<<<<<<<<
@@ -46154,7 +46154,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
  */
   __pyx_v_loc1 = (&__pyx_v_l1_stack);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":675
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":675
  *         loc1 = &l1_stack
  * 
  *         i1 = i1_minus             # <<<<<<<<<<<<<<
@@ -46163,7 +46163,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
  */
   __pyx_v_i1 = __pyx_v_i1_minus;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":676
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":676
  * 
  *         i1 = i1_minus
  *         while i1 < i1_plus:             # <<<<<<<<<<<<<<
@@ -46174,7 +46174,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
     __pyx_t_1 = ((__pyx_v_i1 < __pyx_v_i1_plus) != 0);
     if (!__pyx_t_1) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":677
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":677
  *         i1 = i1_minus
  *         while i1 < i1_plus:
  *             assign_matching(loc1, arr1, i1, step1, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -46183,7 +46183,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
  */
     __pyx_f_4cdec_2sa_3_sa_assign_matching(__pyx_v_loc1, __pyx_v_arr1, __pyx_v_i1, __pyx_v_step1, __pyx_v_self->fda->sent_id->arr);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":678
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":678
  *         while i1 < i1_plus:
  *             assign_matching(loc1, arr1, i1, step1, self.fda.sent_id.arr)
  *             comparison = self.compare_matchings(loc1, loc2, offset_by_one, len_last)             # <<<<<<<<<<<<<<
@@ -46192,7 +46192,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
  */
     __pyx_v_comparison = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->compare_matchings(__pyx_v_self, __pyx_v_loc1, __pyx_v_loc2, __pyx_v_offset_by_one, __pyx_v_len_last);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":679
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":679
  *             assign_matching(loc1, arr1, i1, step1, self.fda.sent_id.arr)
  *             comparison = self.compare_matchings(loc1, loc2, offset_by_one, len_last)
  *             if comparison == 0:             # <<<<<<<<<<<<<<
@@ -46202,7 +46202,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
     __pyx_t_1 = ((__pyx_v_comparison == 0) != 0);
     if (__pyx_t_1) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":680
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":680
  *             comparison = self.compare_matchings(loc1, loc2, offset_by_one, len_last)
  *             if comparison == 0:
  *                 prev_comparison = 0             # <<<<<<<<<<<<<<
@@ -46211,7 +46211,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
  */
       __pyx_v_prev_comparison = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":681
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":681
  *             if comparison == 0:
  *                 prev_comparison = 0
  *                 break             # <<<<<<<<<<<<<<
@@ -46221,7 +46221,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
       goto __pyx_L4_break;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":682
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":682
  *                 prev_comparison = 0
  *                 break
  *             elif i1 == i1_minus:             # <<<<<<<<<<<<<<
@@ -46231,7 +46231,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
     __pyx_t_1 = ((__pyx_v_i1 == __pyx_v_i1_minus) != 0);
     if (__pyx_t_1) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":683
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":683
  *                 break
  *             elif i1 == i1_minus:
  *                 prev_comparison = comparison             # <<<<<<<<<<<<<<
@@ -46243,7 +46243,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":685
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":685
  *                 prev_comparison = comparison
  *             else:
  *                 if comparison != prev_comparison:             # <<<<<<<<<<<<<<
@@ -46253,7 +46253,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
       __pyx_t_1 = ((__pyx_v_comparison != __pyx_v_prev_comparison) != 0);
       if (__pyx_t_1) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":686
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":686
  *             else:
  *                 if comparison != prev_comparison:
  *                     prev_comparison = 0             # <<<<<<<<<<<<<<
@@ -46262,7 +46262,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
  */
         __pyx_v_prev_comparison = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":687
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":687
  *                 if comparison != prev_comparison:
  *                     prev_comparison = 0
  *                     break             # <<<<<<<<<<<<<<
@@ -46274,7 +46274,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
     }
     __pyx_L5:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":688
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":688
  *                     prev_comparison = 0
  *                     break
  *             i1 = i1 + step1             # <<<<<<<<<<<<<<
@@ -46285,7 +46285,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
   }
   __pyx_L4_break:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":689
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":689
  *                     break
  *             i1 = i1 + step1
  *         return prev_comparison             # <<<<<<<<<<<<<<
@@ -46295,7 +46295,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
   __pyx_r = __pyx_v_prev_comparison;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":662
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":662
  * 
  * 
  *     cdef long compare_matchings_set(self, int i1_minus, int i1_plus, int* arr1, int step1,             # <<<<<<<<<<<<<<
@@ -46309,7 +46309,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings_s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":692
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":692
  * 
  * 
  *     cdef long compare_matchings(self, Matching* loc1, Matching* loc2, int offset_by_one, int len_last):             # <<<<<<<<<<<<<<
@@ -46327,7 +46327,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
   int __pyx_t_4;
   __Pyx_RefNannySetupContext("compare_matchings", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":695
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":695
  *         cdef int i
  * 
  *         if loc1.sent_id > loc2.sent_id:             # <<<<<<<<<<<<<<
@@ -46337,7 +46337,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
   __pyx_t_1 = ((__pyx_v_loc1->sent_id > __pyx_v_loc2->sent_id) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":696
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":696
  * 
  *         if loc1.sent_id > loc2.sent_id:
  *             return 1             # <<<<<<<<<<<<<<
@@ -46348,7 +46348,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":697
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":697
  *         if loc1.sent_id > loc2.sent_id:
  *             return 1
  *         if loc2.sent_id > loc1.sent_id:             # <<<<<<<<<<<<<<
@@ -46358,7 +46358,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
   __pyx_t_1 = ((__pyx_v_loc2->sent_id > __pyx_v_loc1->sent_id) != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":698
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":698
  *             return 1
  *         if loc2.sent_id > loc1.sent_id:
  *             return -1             # <<<<<<<<<<<<<<
@@ -46369,7 +46369,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":700
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":700
  *             return -1
  * 
  *         if loc1.size == 1 and loc2.size == 1:             # <<<<<<<<<<<<<<
@@ -46385,7 +46385,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
   }
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":701
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":701
  * 
  *         if loc1.size == 1 and loc2.size == 1:
  *             if loc2.arr[loc2.start] - loc1.arr[loc1.start] <= self.train_min_gap_size:             # <<<<<<<<<<<<<<
@@ -46395,7 +46395,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
     __pyx_t_3 = ((((__pyx_v_loc2->arr[__pyx_v_loc2->start]) - (__pyx_v_loc1->arr[__pyx_v_loc1->start])) <= __pyx_v_self->train_min_gap_size) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":702
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":702
  *         if loc1.size == 1 and loc2.size == 1:
  *             if loc2.arr[loc2.start] - loc1.arr[loc1.start] <= self.train_min_gap_size:
  *                 return 1             # <<<<<<<<<<<<<<
@@ -46408,7 +46408,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
     goto __pyx_L5;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":704
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":704
  *                 return 1
  * 
  *         elif offset_by_one:             # <<<<<<<<<<<<<<
@@ -46418,7 +46418,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
   __pyx_t_3 = (__pyx_v_offset_by_one != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":705
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":705
  * 
  *         elif offset_by_one:
  *             for i from 1 <= i < loc1.size:             # <<<<<<<<<<<<<<
@@ -46428,7 +46428,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
     __pyx_t_4 = __pyx_v_loc1->size;
     for (__pyx_v_i = 1; __pyx_v_i < __pyx_t_4; __pyx_v_i++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":706
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":706
  *         elif offset_by_one:
  *             for i from 1 <= i < loc1.size:
  *                 if loc1.arr[loc1.start+i] > loc2.arr[loc2.start+i-1]:             # <<<<<<<<<<<<<<
@@ -46438,7 +46438,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
       __pyx_t_3 = (((__pyx_v_loc1->arr[(__pyx_v_loc1->start + __pyx_v_i)]) > (__pyx_v_loc2->arr[((__pyx_v_loc2->start + __pyx_v_i) - 1)])) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":707
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":707
  *             for i from 1 <= i < loc1.size:
  *                 if loc1.arr[loc1.start+i] > loc2.arr[loc2.start+i-1]:
  *                     return 1             # <<<<<<<<<<<<<<
@@ -46449,7 +46449,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
         goto __pyx_L0;
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":708
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":708
  *                 if loc1.arr[loc1.start+i] > loc2.arr[loc2.start+i-1]:
  *                     return 1
  *                 if loc1.arr[loc1.start+i] < loc2.arr[loc2.start+i-1]:             # <<<<<<<<<<<<<<
@@ -46459,7 +46459,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
       __pyx_t_3 = (((__pyx_v_loc1->arr[(__pyx_v_loc1->start + __pyx_v_i)]) < (__pyx_v_loc2->arr[((__pyx_v_loc2->start + __pyx_v_i) - 1)])) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":709
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":709
  *                     return 1
  *                 if loc1.arr[loc1.start+i] < loc2.arr[loc2.start+i-1]:
  *                     return -1             # <<<<<<<<<<<<<<
@@ -46474,7 +46474,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":712
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":712
  * 
  *         else:
  *             if loc1.arr[loc1.start]+1 > loc2.arr[loc2.start]:             # <<<<<<<<<<<<<<
@@ -46484,7 +46484,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
     __pyx_t_3 = ((((__pyx_v_loc1->arr[__pyx_v_loc1->start]) + 1) > (__pyx_v_loc2->arr[__pyx_v_loc2->start])) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":713
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":713
  *         else:
  *             if loc1.arr[loc1.start]+1 > loc2.arr[loc2.start]:
  *                 return 1             # <<<<<<<<<<<<<<
@@ -46495,7 +46495,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":714
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":714
  *             if loc1.arr[loc1.start]+1 > loc2.arr[loc2.start]:
  *                 return 1
  *             if loc1.arr[loc1.start]+1 < loc2.arr[loc2.start]:             # <<<<<<<<<<<<<<
@@ -46505,7 +46505,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
     __pyx_t_3 = ((((__pyx_v_loc1->arr[__pyx_v_loc1->start]) + 1) < (__pyx_v_loc2->arr[__pyx_v_loc2->start])) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":715
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":715
  *                 return 1
  *             if loc1.arr[loc1.start]+1 < loc2.arr[loc2.start]:
  *                 return -1             # <<<<<<<<<<<<<<
@@ -46516,7 +46516,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":717
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":717
  *                 return -1
  * 
  *             for i from 1 <= i < loc1.size:             # <<<<<<<<<<<<<<
@@ -46526,7 +46526,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
     __pyx_t_4 = __pyx_v_loc1->size;
     for (__pyx_v_i = 1; __pyx_v_i < __pyx_t_4; __pyx_v_i++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":718
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":718
  * 
  *             for i from 1 <= i < loc1.size:
  *                 if loc1.arr[loc1.start+i] > loc2.arr[loc2.start+i]:             # <<<<<<<<<<<<<<
@@ -46536,7 +46536,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
       __pyx_t_3 = (((__pyx_v_loc1->arr[(__pyx_v_loc1->start + __pyx_v_i)]) > (__pyx_v_loc2->arr[(__pyx_v_loc2->start + __pyx_v_i)])) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":719
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":719
  *             for i from 1 <= i < loc1.size:
  *                 if loc1.arr[loc1.start+i] > loc2.arr[loc2.start+i]:
  *                     return 1             # <<<<<<<<<<<<<<
@@ -46547,7 +46547,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
         goto __pyx_L0;
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":720
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":720
  *                 if loc1.arr[loc1.start+i] > loc2.arr[loc2.start+i]:
  *                     return 1
  *                 if loc1.arr[loc1.start+i] < loc2.arr[loc2.start+i]:             # <<<<<<<<<<<<<<
@@ -46557,7 +46557,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
       __pyx_t_3 = (((__pyx_v_loc1->arr[(__pyx_v_loc1->start + __pyx_v_i)]) < (__pyx_v_loc2->arr[(__pyx_v_loc2->start + __pyx_v_i)])) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":721
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":721
  *                     return 1
  *                 if loc1.arr[loc1.start+i] < loc2.arr[loc2.start+i]:
  *                     return -1             # <<<<<<<<<<<<<<
@@ -46571,7 +46571,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
   }
   __pyx_L5:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":723
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":723
  *                     return -1
  * 
  *         if loc2.arr[loc2.end-1] + len_last - loc1.arr[loc1.start] > self.train_max_initial_size:             # <<<<<<<<<<<<<<
@@ -46581,7 +46581,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
   __pyx_t_3 = (((((__pyx_v_loc2->arr[(__pyx_v_loc2->end - 1)]) + __pyx_v_len_last) - (__pyx_v_loc1->arr[__pyx_v_loc1->start])) > __pyx_v_self->train_max_initial_size) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":724
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":724
  * 
  *         if loc2.arr[loc2.end-1] + len_last - loc1.arr[loc1.start] > self.train_max_initial_size:
  *             return -1             # <<<<<<<<<<<<<<
@@ -46592,7 +46592,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":725
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":725
  *         if loc2.arr[loc2.end-1] + len_last - loc1.arr[loc1.start] > self.train_max_initial_size:
  *             return -1
  *         return 0             # <<<<<<<<<<<<<<
@@ -46602,7 +46602,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":692
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":692
  * 
  * 
  *     cdef long compare_matchings(self, Matching* loc1, Matching* loc2, int offset_by_one, int len_last):             # <<<<<<<<<<<<<<
@@ -46616,7 +46616,7 @@ static long __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_compare_matchings(s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":728
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":728
  * 
  * 
  *     cdef int* merge_helper(self, int low1, int high1, int* arr1, int step1,             # <<<<<<<<<<<<<<
@@ -46640,7 +46640,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
   int __pyx_t_3;
   __Pyx_RefNannySetupContext("merge_helper", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":736
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":736
  *         cdef Matching loc1, loc2
  * 
  *         result_len[0] = 0             # <<<<<<<<<<<<<<
@@ -46649,7 +46649,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
  */
   (__pyx_v_result_len[0]) = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":737
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":737
  * 
  *         result_len[0] = 0
  *         result = <int*> malloc(0*sizeof(int))             # <<<<<<<<<<<<<<
@@ -46658,7 +46658,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
  */
   __pyx_v_result = ((int *)malloc((0 * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":739
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":739
  *         result = <int*> malloc(0*sizeof(int))
  * 
  *         i1 = low1             # <<<<<<<<<<<<<<
@@ -46667,7 +46667,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
  */
   __pyx_v_i1 = __pyx_v_low1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":740
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":740
  * 
  *         i1 = low1
  *         i2 = low2             # <<<<<<<<<<<<<<
@@ -46676,7 +46676,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
  */
   __pyx_v_i2 = __pyx_v_low2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":741
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":741
  *         i1 = low1
  *         i2 = low2
  *         while i1 < high1 and i2 < high2:             # <<<<<<<<<<<<<<
@@ -46693,7 +46693,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
     }
     if (!__pyx_t_3) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":744
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":744
  * 
  *             # First, pop all unneeded loc2's off the stack
  *             assign_matching(&loc1, arr1, i1, step1, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -46702,7 +46702,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
  */
     __pyx_f_4cdec_2sa_3_sa_assign_matching((&__pyx_v_loc1), __pyx_v_arr1, __pyx_v_i1, __pyx_v_step1, __pyx_v_self->fda->sent_id->arr);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":745
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":745
  *             # First, pop all unneeded loc2's off the stack
  *             assign_matching(&loc1, arr1, i1, step1, self.fda.sent_id.arr)
  *             while i2 < high2:             # <<<<<<<<<<<<<<
@@ -46713,7 +46713,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
       __pyx_t_3 = ((__pyx_v_i2 < __pyx_v_high2) != 0);
       if (!__pyx_t_3) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":746
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":746
  *             assign_matching(&loc1, arr1, i1, step1, self.fda.sent_id.arr)
  *             while i2 < high2:
  *                 assign_matching(&loc2, arr2, i2, step2, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -46722,7 +46722,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
  */
       __pyx_f_4cdec_2sa_3_sa_assign_matching((&__pyx_v_loc2), __pyx_v_arr2, __pyx_v_i2, __pyx_v_step2, __pyx_v_self->fda->sent_id->arr);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":747
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":747
  *             while i2 < high2:
  *                 assign_matching(&loc2, arr2, i2, step2, self.fda.sent_id.arr)
  *                 if self.compare_matchings(&loc1, &loc2, offset_by_one, len_last) == 1:             # <<<<<<<<<<<<<<
@@ -46732,7 +46732,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
       __pyx_t_3 = ((((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->compare_matchings(__pyx_v_self, (&__pyx_v_loc1), (&__pyx_v_loc2), __pyx_v_offset_by_one, __pyx_v_len_last) == 1) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":748
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":748
  *                 assign_matching(&loc2, arr2, i2, step2, self.fda.sent_id.arr)
  *                 if self.compare_matchings(&loc1, &loc2, offset_by_one, len_last) == 1:
  *                     i2 = i2 + step2             # <<<<<<<<<<<<<<
@@ -46744,7 +46744,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
       }
       /*else*/ {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":750
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":750
  *                     i2 = i2 + step2
  *                 else:
  *                     break             # <<<<<<<<<<<<<<
@@ -46757,7 +46757,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
     }
     __pyx_L6_break:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":753
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":753
  * 
  *             # Next: process all loc1's with the same starting val
  *             j1 = i1             # <<<<<<<<<<<<<<
@@ -46766,7 +46766,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
  */
     __pyx_v_j1 = __pyx_v_i1;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":754
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":754
  *             # Next: process all loc1's with the same starting val
  *             j1 = i1
  *             while i1 < high1 and arr1[j1] == arr1[i1]:             # <<<<<<<<<<<<<<
@@ -46783,7 +46783,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
       }
       if (!__pyx_t_2) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":755
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":755
  *             j1 = i1
  *             while i1 < high1 and arr1[j1] == arr1[i1]:
  *                 assign_matching(&loc1, arr1, i1, step1, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -46792,7 +46792,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
  */
       __pyx_f_4cdec_2sa_3_sa_assign_matching((&__pyx_v_loc1), __pyx_v_arr1, __pyx_v_i1, __pyx_v_step1, __pyx_v_self->fda->sent_id->arr);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":756
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":756
  *             while i1 < high1 and arr1[j1] == arr1[i1]:
  *                 assign_matching(&loc1, arr1, i1, step1, self.fda.sent_id.arr)
  *                 j2 = i2             # <<<<<<<<<<<<<<
@@ -46801,7 +46801,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
  */
       __pyx_v_j2 = __pyx_v_i2;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":757
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":757
  *                 assign_matching(&loc1, arr1, i1, step1, self.fda.sent_id.arr)
  *                 j2 = i2
  *                 while j2 < high2:             # <<<<<<<<<<<<<<
@@ -46812,7 +46812,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
         __pyx_t_2 = ((__pyx_v_j2 < __pyx_v_high2) != 0);
         if (!__pyx_t_2) break;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":758
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":758
  *                 j2 = i2
  *                 while j2 < high2:
  *                     assign_matching(&loc2, arr2, j2, step2, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -46821,7 +46821,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
  */
         __pyx_f_4cdec_2sa_3_sa_assign_matching((&__pyx_v_loc2), __pyx_v_arr2, __pyx_v_j2, __pyx_v_step2, __pyx_v_self->fda->sent_id->arr);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":759
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":759
  *                 while j2 < high2:
  *                     assign_matching(&loc2, arr2, j2, step2, self.fda.sent_id.arr)
  *                     comparison = self.compare_matchings(&loc1, &loc2, offset_by_one, len_last)             # <<<<<<<<<<<<<<
@@ -46830,7 +46830,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
  */
         __pyx_v_comparison = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->compare_matchings(__pyx_v_self, (&__pyx_v_loc1), (&__pyx_v_loc2), __pyx_v_offset_by_one, __pyx_v_len_last);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":760
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":760
  *                     assign_matching(&loc2, arr2, j2, step2, self.fda.sent_id.arr)
  *                     comparison = self.compare_matchings(&loc1, &loc2, offset_by_one, len_last)
  *                     if comparison == 0:             # <<<<<<<<<<<<<<
@@ -46840,7 +46840,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
         __pyx_t_2 = ((__pyx_v_comparison == 0) != 0);
         if (__pyx_t_2) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":761
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":761
  *                     comparison = self.compare_matchings(&loc1, &loc2, offset_by_one, len_last)
  *                     if comparison == 0:
  *                         result = append_combined_matching(result, &loc1, &loc2, offset_by_one, num_subpatterns, result_len)             # <<<<<<<<<<<<<<
@@ -46852,7 +46852,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
         }
         __pyx_L12:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":762
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":762
  *                     if comparison == 0:
  *                         result = append_combined_matching(result, &loc1, &loc2, offset_by_one, num_subpatterns, result_len)
  *                     if comparison == 1:             # <<<<<<<<<<<<<<
@@ -46865,7 +46865,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
         }
         __pyx_L13:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":764
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":764
  *                     if comparison == 1:
  *                         pass
  *                     if comparison == -1:             # <<<<<<<<<<<<<<
@@ -46875,7 +46875,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
         __pyx_t_2 = ((__pyx_v_comparison == -1) != 0);
         if (__pyx_t_2) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":765
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":765
  *                         pass
  *                     if comparison == -1:
  *                         break             # <<<<<<<<<<<<<<
@@ -46886,7 +46886,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
         }
         /*else*/ {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":767
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":767
  *                         break
  *                     else:
  *                         j2 = j2 + step2             # <<<<<<<<<<<<<<
@@ -46898,7 +46898,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
       }
       __pyx_L11_break:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":768
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":768
  *                     else:
  *                         j2 = j2 + step2
  *                 i1 = i1 + step1             # <<<<<<<<<<<<<<
@@ -46909,7 +46909,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
     }
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":769
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":769
  *                         j2 = j2 + step2
  *                 i1 = i1 + step1
  *         return result             # <<<<<<<<<<<<<<
@@ -46919,7 +46919,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
   __pyx_r = __pyx_v_result;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":728
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":728
  * 
  * 
  *     cdef int* merge_helper(self, int low1, int high1, int* arr1, int step1,             # <<<<<<<<<<<<<<
@@ -46933,7 +46933,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_merge_helper(struct
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":772
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":772
  * 
  * 
  *     cdef void sort_phrase_loc(self, IntList arr, PhraseLocation loc, Phrase phrase):             # <<<<<<<<<<<<<<
@@ -46956,7 +46956,7 @@ static void __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_sort_phrase_loc(str
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("sort_phrase_loc", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":777
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":777
  *         cdef IntList result
  * 
  *         if phrase in self.precomputed_index:             # <<<<<<<<<<<<<<
@@ -46967,7 +46967,7 @@ static void __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_sort_phrase_loc(str
   __pyx_t_2 = (__pyx_t_1 != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":778
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":778
  * 
  *         if phrase in self.precomputed_index:
  *             loc.arr = self.precomputed_index[phrase]             # <<<<<<<<<<<<<<
@@ -46986,7 +46986,7 @@ static void __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_sort_phrase_loc(str
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":780
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":780
  *             loc.arr = self.precomputed_index[phrase]
  *         else:
  *             loc.arr = IntList(initial_len=loc.sa_high-loc.sa_low)             # <<<<<<<<<<<<<<
@@ -47008,7 +47008,7 @@ static void __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_sort_phrase_loc(str
     __pyx_v_loc->arr = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":781
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":781
  *         else:
  *             loc.arr = IntList(initial_len=loc.sa_high-loc.sa_low)
  *             veb = VEB(arr.len)             # <<<<<<<<<<<<<<
@@ -47028,7 +47028,7 @@ static void __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_sort_phrase_loc(str
     __pyx_v_veb = ((struct __pyx_obj_4cdec_2sa_3_sa_VEB *)__pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":782
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":782
  *             loc.arr = IntList(initial_len=loc.sa_high-loc.sa_low)
  *             veb = VEB(arr.len)
  *             for i from loc.sa_low <= i < loc.sa_high:             # <<<<<<<<<<<<<<
@@ -47038,7 +47038,7 @@ static void __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_sort_phrase_loc(str
     __pyx_t_5 = __pyx_v_loc->sa_high;
     for (__pyx_v_i = __pyx_v_loc->sa_low; __pyx_v_i < __pyx_t_5; __pyx_v_i++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":783
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":783
  *             veb = VEB(arr.len)
  *             for i from loc.sa_low <= i < loc.sa_high:
  *                 veb._insert(arr.arr[i])             # <<<<<<<<<<<<<<
@@ -47048,7 +47048,7 @@ static void __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_sort_phrase_loc(str
       ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_VEB *)__pyx_v_veb->__pyx_vtab)->_insert(__pyx_v_veb, (__pyx_v_arr->arr[__pyx_v_i]));
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":784
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":784
  *             for i from loc.sa_low <= i < loc.sa_high:
  *                 veb._insert(arr.arr[i])
  *             i = veb.veb.min_val             # <<<<<<<<<<<<<<
@@ -47058,7 +47058,7 @@ static void __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_sort_phrase_loc(str
     __pyx_t_5 = __pyx_v_veb->veb->min_val;
     __pyx_v_i = __pyx_t_5;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":785
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":785
  *                 veb._insert(arr.arr[i])
  *             i = veb.veb.min_val
  *             for j from 0 <= j < loc.sa_high-loc.sa_low:             # <<<<<<<<<<<<<<
@@ -47068,7 +47068,7 @@ static void __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_sort_phrase_loc(str
     __pyx_t_5 = (__pyx_v_loc->sa_high - __pyx_v_loc->sa_low);
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_5; __pyx_v_j++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":786
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":786
  *             i = veb.veb.min_val
  *             for j from 0 <= j < loc.sa_high-loc.sa_low:
  *                 loc.arr.arr[j] = i             # <<<<<<<<<<<<<<
@@ -47077,7 +47077,7 @@ static void __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_sort_phrase_loc(str
  */
       (__pyx_v_loc->arr->arr[__pyx_v_j]) = __pyx_v_i;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":787
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":787
  *             for j from 0 <= j < loc.sa_high-loc.sa_low:
  *                 loc.arr.arr[j] = i
  *                 i = veb._findsucc(i)             # <<<<<<<<<<<<<<
@@ -47089,7 +47089,7 @@ static void __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_sort_phrase_loc(str
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":788
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":788
  *                 loc.arr.arr[j] = i
  *                 i = veb._findsucc(i)
  *         loc.arr_low = 0             # <<<<<<<<<<<<<<
@@ -47098,7 +47098,7 @@ static void __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_sort_phrase_loc(str
  */
   __pyx_v_loc->arr_low = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":789
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":789
  *                 i = veb._findsucc(i)
  *         loc.arr_low = 0
  *         loc.arr_high = loc.arr.len             # <<<<<<<<<<<<<<
@@ -47108,7 +47108,7 @@ static void __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_sort_phrase_loc(str
   __pyx_t_5 = __pyx_v_loc->arr->len;
   __pyx_v_loc->arr_high = __pyx_t_5;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":772
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":772
  * 
  * 
  *     cdef void sort_phrase_loc(self, IntList arr, PhraseLocation loc, Phrase phrase):             # <<<<<<<<<<<<<<
@@ -47127,7 +47127,7 @@ static void __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_sort_phrase_loc(str
   __Pyx_RefNannyFinishContext();
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":792
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":792
  * 
  * 
  *     cdef intersect_helper(self, Phrase prefix, Phrase suffix,             # <<<<<<<<<<<<<<
@@ -47164,7 +47164,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("intersect_helper", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":799
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":799
  *         cdef int* result_ptr
  * 
  *         result_len = 0             # <<<<<<<<<<<<<<
@@ -47173,7 +47173,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
  */
   __pyx_v_result_len = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":801
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":801
  *         result_len = 0
  * 
  *         if sym_isvar(suffix[0]):             # <<<<<<<<<<<<<<
@@ -47187,7 +47187,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __pyx_t_3 = (__pyx_f_4cdec_2sa_3_sa_sym_isvar(__pyx_t_2) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":802
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":802
  * 
  *         if sym_isvar(suffix[0]):
  *             offset_by_one = 1             # <<<<<<<<<<<<<<
@@ -47199,7 +47199,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":804
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":804
  *             offset_by_one = 1
  *         else:
  *             offset_by_one = 0             # <<<<<<<<<<<<<<
@@ -47210,7 +47210,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":806
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":806
  *             offset_by_one = 0
  * 
  *         len_last = len(suffix.getchunk(suffix.arity()))             # <<<<<<<<<<<<<<
@@ -47237,7 +47237,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __pyx_v_len_last = __pyx_t_6;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":808
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":808
  *         len_last = len(suffix.getchunk(suffix.arity()))
  * 
  *         if prefix_loc.arr is None:             # <<<<<<<<<<<<<<
@@ -47248,7 +47248,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __pyx_t_7 = (__pyx_t_3 != 0);
   if (__pyx_t_7) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":809
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":809
  * 
  *         if prefix_loc.arr is None:
  *             self.sort_phrase_loc(self.fsa.sa, prefix_loc, prefix)             # <<<<<<<<<<<<<<
@@ -47263,7 +47263,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   }
   __pyx_L4:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":810
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":810
  *         if prefix_loc.arr is None:
  *             self.sort_phrase_loc(self.fsa.sa, prefix_loc, prefix)
  *         arr1 = prefix_loc.arr             # <<<<<<<<<<<<<<
@@ -47275,7 +47275,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __pyx_v_arr1 = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_5);
   __pyx_t_5 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":811
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":811
  *             self.sort_phrase_loc(self.fsa.sa, prefix_loc, prefix)
  *         arr1 = prefix_loc.arr
  *         low1 = prefix_loc.arr_low             # <<<<<<<<<<<<<<
@@ -47285,7 +47285,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __pyx_t_2 = __pyx_v_prefix_loc->arr_low;
   __pyx_v_low1 = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":812
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":812
  *         arr1 = prefix_loc.arr
  *         low1 = prefix_loc.arr_low
  *         high1 = prefix_loc.arr_high             # <<<<<<<<<<<<<<
@@ -47295,7 +47295,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __pyx_t_2 = __pyx_v_prefix_loc->arr_high;
   __pyx_v_high1 = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":813
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":813
  *         low1 = prefix_loc.arr_low
  *         high1 = prefix_loc.arr_high
  *         step1 = prefix_loc.num_subpatterns             # <<<<<<<<<<<<<<
@@ -47305,7 +47305,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __pyx_t_2 = __pyx_v_prefix_loc->num_subpatterns;
   __pyx_v_step1 = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":815
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":815
  *         step1 = prefix_loc.num_subpatterns
  * 
  *         if suffix_loc.arr is None:             # <<<<<<<<<<<<<<
@@ -47316,7 +47316,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __pyx_t_3 = (__pyx_t_7 != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":816
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":816
  * 
  *         if suffix_loc.arr is None:
  *             self.sort_phrase_loc(self.fsa.sa, suffix_loc, suffix)             # <<<<<<<<<<<<<<
@@ -47331,7 +47331,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   }
   __pyx_L5:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":817
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":817
  *         if suffix_loc.arr is None:
  *             self.sort_phrase_loc(self.fsa.sa, suffix_loc, suffix)
  *         arr2 = suffix_loc.arr             # <<<<<<<<<<<<<<
@@ -47343,7 +47343,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __pyx_v_arr2 = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_5);
   __pyx_t_5 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":818
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":818
  *             self.sort_phrase_loc(self.fsa.sa, suffix_loc, suffix)
  *         arr2 = suffix_loc.arr
  *         low2 = suffix_loc.arr_low             # <<<<<<<<<<<<<<
@@ -47353,7 +47353,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __pyx_t_2 = __pyx_v_suffix_loc->arr_low;
   __pyx_v_low2 = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":819
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":819
  *         arr2 = suffix_loc.arr
  *         low2 = suffix_loc.arr_low
  *         high2 = suffix_loc.arr_high             # <<<<<<<<<<<<<<
@@ -47363,7 +47363,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __pyx_t_2 = __pyx_v_suffix_loc->arr_high;
   __pyx_v_high2 = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":820
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":820
  *         low2 = suffix_loc.arr_low
  *         high2 = suffix_loc.arr_high
  *         step2 = suffix_loc.num_subpatterns             # <<<<<<<<<<<<<<
@@ -47373,7 +47373,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __pyx_t_2 = __pyx_v_suffix_loc->num_subpatterns;
   __pyx_v_step2 = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":822
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":822
  *         step2 = suffix_loc.num_subpatterns
  * 
  *         num_subpatterns = prefix.arity()+1             # <<<<<<<<<<<<<<
@@ -47392,7 +47392,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __pyx_v_num_subpatterns = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":824
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":824
  *         num_subpatterns = prefix.arity()+1
  * 
  *         if algorithm == MERGE:             # <<<<<<<<<<<<<<
@@ -47402,7 +47402,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __pyx_t_3 = ((__pyx_v_algorithm == __pyx_v_4cdec_2sa_3_sa_MERGE) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":825
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":825
  * 
  *         if algorithm == MERGE:
  *             result_ptr = self.merge_helper(low1, high1, arr1.arr, step1,             # <<<<<<<<<<<<<<
@@ -47414,7 +47414,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":829
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":829
  *                                     offset_by_one, len_last, num_subpatterns, &result_len)
  *         else:
  *             result_ptr = self.baeza_yates_helper(low1, high1, arr1.arr, step1,             # <<<<<<<<<<<<<<
@@ -47425,7 +47425,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   }
   __pyx_L6:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":833
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":833
  *                                     offset_by_one, len_last, num_subpatterns, &result_len)
  * 
  *         if result_len == 0:             # <<<<<<<<<<<<<<
@@ -47435,7 +47435,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   __pyx_t_3 = ((__pyx_v_result_len == 0) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":834
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":834
  * 
  *         if result_len == 0:
  *             free(result_ptr)             # <<<<<<<<<<<<<<
@@ -47444,7 +47444,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
  */
     free(__pyx_v_result_ptr);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":835
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":835
  *         if result_len == 0:
  *             free(result_ptr)
  *             return None             # <<<<<<<<<<<<<<
@@ -47458,7 +47458,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":837
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":837
  *             return None
  *         else:
  *             result = IntList()             # <<<<<<<<<<<<<<
@@ -47470,7 +47470,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
     __pyx_v_result = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_5);
     __pyx_t_5 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":838
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":838
  *         else:
  *             result = IntList()
  *             free(result.arr)             # <<<<<<<<<<<<<<
@@ -47479,7 +47479,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
  */
     free(__pyx_v_result->arr);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":839
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":839
  *             result = IntList()
  *             free(result.arr)
  *             result.arr = result_ptr             # <<<<<<<<<<<<<<
@@ -47488,7 +47488,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
  */
     __pyx_v_result->arr = __pyx_v_result_ptr;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":840
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":840
  *             free(result.arr)
  *             result.arr = result_ptr
  *             result.len = result_len             # <<<<<<<<<<<<<<
@@ -47497,7 +47497,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
  */
     __pyx_v_result->len = __pyx_v_result_len;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":841
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":841
  *             result.arr = result_ptr
  *             result.len = result_len
  *             result.size = result_len             # <<<<<<<<<<<<<<
@@ -47506,7 +47506,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
  */
     __pyx_v_result->size = __pyx_v_result_len;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":842
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":842
  *             result.len = result_len
  *             result.size = result_len
  *             return PhraseLocation(arr_low=0, arr_high=result_len, arr=result, num_subpatterns=num_subpatterns)             # <<<<<<<<<<<<<<
@@ -47534,7 +47534,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":792
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":792
  * 
  * 
  *     cdef intersect_helper(self, Phrase prefix, Phrase suffix,             # <<<<<<<<<<<<<<
@@ -47558,7 +47558,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_intersect_help
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":844
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":844
  *             return PhraseLocation(arr_low=0, arr_high=result_len, arr=result, num_subpatterns=num_subpatterns)
  * 
  *     cdef loc2str(self, PhraseLocation loc):             # <<<<<<<<<<<<<<
@@ -47581,7 +47581,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_loc2str(CYTHON
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("loc2str", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":846
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":846
  *     cdef loc2str(self, PhraseLocation loc):
  *         cdef int i, j
  *         result = "{"             # <<<<<<<<<<<<<<
@@ -47591,7 +47591,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_loc2str(CYTHON
   __Pyx_INCREF(__pyx_kp_s__63);
   __pyx_v_result = __pyx_kp_s__63;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":847
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":847
  *         cdef int i, j
  *         result = "{"
  *         i = 0             # <<<<<<<<<<<<<<
@@ -47600,7 +47600,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_loc2str(CYTHON
  */
   __pyx_v_i = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":848
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":848
  *         result = "{"
  *         i = 0
  *         while i < loc.arr_high:             # <<<<<<<<<<<<<<
@@ -47611,7 +47611,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_loc2str(CYTHON
     __pyx_t_1 = ((__pyx_v_i < __pyx_v_loc->arr_high) != 0);
     if (!__pyx_t_1) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":849
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":849
  *         i = 0
  *         while i < loc.arr_high:
  *             result = result + "("             # <<<<<<<<<<<<<<
@@ -47623,7 +47623,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_loc2str(CYTHON
     __Pyx_DECREF_SET(__pyx_v_result, __pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":850
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":850
  *         while i < loc.arr_high:
  *             result = result + "("
  *             for j from i <= j < i + loc.num_subpatterns:             # <<<<<<<<<<<<<<
@@ -47633,7 +47633,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_loc2str(CYTHON
     __pyx_t_3 = (__pyx_v_i + __pyx_v_loc->num_subpatterns);
     for (__pyx_v_j = __pyx_v_i; __pyx_v_j < __pyx_t_3; __pyx_v_j++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":851
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":851
  *             result = result + "("
  *             for j from i <= j < i + loc.num_subpatterns:
  *                 result = result + ("%d " %loc.arr[j])             # <<<<<<<<<<<<<<
@@ -47652,7 +47652,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_loc2str(CYTHON
       __pyx_t_2 = 0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":852
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":852
  *             for j from i <= j < i + loc.num_subpatterns:
  *                 result = result + ("%d " %loc.arr[j])
  *             result = result + ")"             # <<<<<<<<<<<<<<
@@ -47664,7 +47664,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_loc2str(CYTHON
     __Pyx_DECREF_SET(__pyx_v_result, __pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":853
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":853
  *                 result = result + ("%d " %loc.arr[j])
  *             result = result + ")"
  *             i = i + loc.num_subpatterns             # <<<<<<<<<<<<<<
@@ -47674,7 +47674,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_loc2str(CYTHON
     __pyx_v_i = (__pyx_v_i + __pyx_v_loc->num_subpatterns);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":854
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":854
  *             result = result + ")"
  *             i = i + loc.num_subpatterns
  *         result = result + "}"             # <<<<<<<<<<<<<<
@@ -47686,7 +47686,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_loc2str(CYTHON
   __Pyx_DECREF_SET(__pyx_v_result, __pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":855
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":855
  *             i = i + loc.num_subpatterns
  *         result = result + "}"
  *         return result             # <<<<<<<<<<<<<<
@@ -47698,7 +47698,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_loc2str(CYTHON
   __pyx_r = __pyx_v_result;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":844
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":844
  *             return PhraseLocation(arr_low=0, arr_high=result_len, arr=result, num_subpatterns=num_subpatterns)
  * 
  *     cdef loc2str(self, PhraseLocation loc):             # <<<<<<<<<<<<<<
@@ -47719,7 +47719,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_loc2str(CYTHON
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":857
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":857
  *         return result
  * 
  *     cdef PhraseLocation intersect(self, prefix_node, suffix_node, Phrase phrase):             # <<<<<<<<<<<<<<
@@ -47746,7 +47746,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("intersect", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":861
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":861
  *         cdef PhraseLocation prefix_loc, suffix_loc, result
  * 
  *         prefix = prefix_node.phrase             # <<<<<<<<<<<<<<
@@ -47759,7 +47759,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
   __pyx_v_prefix = ((struct __pyx_obj_4cdec_2sa_3_sa_Phrase *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":862
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":862
  * 
  *         prefix = prefix_node.phrase
  *         suffix = suffix_node.phrase             # <<<<<<<<<<<<<<
@@ -47772,7 +47772,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
   __pyx_v_suffix = ((struct __pyx_obj_4cdec_2sa_3_sa_Phrase *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":863
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":863
  *         prefix = prefix_node.phrase
  *         suffix = suffix_node.phrase
  *         prefix_loc = prefix_node.phrase_location             # <<<<<<<<<<<<<<
@@ -47785,7 +47785,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
   __pyx_v_prefix_loc = ((struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":864
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":864
  *         suffix = suffix_node.phrase
  *         prefix_loc = prefix_node.phrase_location
  *         suffix_loc = suffix_node.phrase_location             # <<<<<<<<<<<<<<
@@ -47798,7 +47798,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
   __pyx_v_suffix_loc = ((struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":866
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":866
  *         suffix_loc = suffix_node.phrase_location
  * 
  *         result = self.get_precomputed_collocation(phrase)             # <<<<<<<<<<<<<<
@@ -47820,7 +47820,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
   __pyx_v_result = ((struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":867
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":867
  * 
  *         result = self.get_precomputed_collocation(phrase)
  *         if result is not None:             # <<<<<<<<<<<<<<
@@ -47831,7 +47831,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
   __pyx_t_5 = (__pyx_t_4 != 0);
   if (__pyx_t_5) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":868
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":868
  *         result = self.get_precomputed_collocation(phrase)
  *         if result is not None:
  *             intersect_method = "precomputed"             # <<<<<<<<<<<<<<
@@ -47844,7 +47844,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":870
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":870
  *             intersect_method = "precomputed"
  * 
  *         if result is None:             # <<<<<<<<<<<<<<
@@ -47855,7 +47855,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
   __pyx_t_4 = (__pyx_t_5 != 0);
   if (__pyx_t_4) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":871
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":871
  * 
  *         if result is None:
  *             if self.use_baeza_yates:             # <<<<<<<<<<<<<<
@@ -47865,7 +47865,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
     __pyx_t_4 = (__pyx_v_self->use_baeza_yates != 0);
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":872
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":872
  *         if result is None:
  *             if self.use_baeza_yates:
  *                 result = self.intersect_helper(prefix, suffix, prefix_loc, suffix_loc, BAEZA_YATES)             # <<<<<<<<<<<<<<
@@ -47878,7 +47878,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
       __Pyx_DECREF_SET(__pyx_v_result, ((struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *)__pyx_t_3));
       __pyx_t_3 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":873
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":873
  *             if self.use_baeza_yates:
  *                 result = self.intersect_helper(prefix, suffix, prefix_loc, suffix_loc, BAEZA_YATES)
  *                 intersect_method="double binary"             # <<<<<<<<<<<<<<
@@ -47891,7 +47891,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":875
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":875
  *                 intersect_method="double binary"
  *             else:
  *                 result = self.intersect_helper(prefix, suffix, prefix_loc, suffix_loc, MERGE)             # <<<<<<<<<<<<<<
@@ -47904,7 +47904,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
       __Pyx_DECREF_SET(__pyx_v_result, ((struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *)__pyx_t_3));
       __pyx_t_3 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":876
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":876
  *             else:
  *                 result = self.intersect_helper(prefix, suffix, prefix_loc, suffix_loc, MERGE)
  *                 intersect_method="merge"             # <<<<<<<<<<<<<<
@@ -47919,7 +47919,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
   }
   __pyx_L4:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":877
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":877
  *                 result = self.intersect_helper(prefix, suffix, prefix_loc, suffix_loc, MERGE)
  *                 intersect_method="merge"
  *         return result             # <<<<<<<<<<<<<<
@@ -47931,7 +47931,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
   __pyx_r = __pyx_v_result;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":857
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":857
  *         return result
  * 
  *     cdef PhraseLocation intersect(self, prefix_node, suffix_node, Phrase phrase):             # <<<<<<<<<<<<<<
@@ -47958,7 +47958,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_PhraseLocation *__pyx_f_4cdec_2sa_3_sa_23
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":879
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":879
  *         return result
  * 
  *     def advance(self, frontier, res, fwords):             # <<<<<<<<<<<<<<
@@ -48069,7 +48069,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12advance(str
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("advance", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":881
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":881
  *     def advance(self, frontier, res, fwords):
  *         cdef unsigned na
  *         nf = []             # <<<<<<<<<<<<<<
@@ -48081,7 +48081,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12advance(str
   __pyx_v_nf = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":882
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":882
  *         cdef unsigned na
  *         nf = []
  *         for toskip, (i, alt, pathlen) in frontier:             # <<<<<<<<<<<<<<
@@ -48239,7 +48239,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12advance(str
     __Pyx_XDECREF_SET(__pyx_v_pathlen, __pyx_t_10);
     __pyx_t_10 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":883
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":883
  *         nf = []
  *         for toskip, (i, alt, pathlen) in frontier:
  *             spanlen = fwords[i][alt][2]             # <<<<<<<<<<<<<<
@@ -48257,7 +48257,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12advance(str
     __Pyx_XDECREF_SET(__pyx_v_spanlen, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":884
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":884
  *         for toskip, (i, alt, pathlen) in frontier:
  *             spanlen = fwords[i][alt][2]
  *             if toskip == 0:             # <<<<<<<<<<<<<<
@@ -48269,7 +48269,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12advance(str
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     if (__pyx_t_12) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":885
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":885
  *             spanlen = fwords[i][alt][2]
  *             if toskip == 0:
  *                 res.append((i, alt, pathlen))             # <<<<<<<<<<<<<<
@@ -48293,7 +48293,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12advance(str
     }
     __pyx_L9:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":886
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":886
  *             if toskip == 0:
  *                 res.append((i, alt, pathlen))
  *             ni = i + spanlen             # <<<<<<<<<<<<<<
@@ -48305,7 +48305,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12advance(str
     __Pyx_XDECREF_SET(__pyx_v_ni, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":887
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":887
  *                 res.append((i, alt, pathlen))
  *             ni = i + spanlen
  *             if ni < len(fwords) and pathlen + 1 < self.max_initial_size:             # <<<<<<<<<<<<<<
@@ -48335,7 +48335,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12advance(str
     }
     if (__pyx_t_16) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":888
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":888
  *             ni = i + spanlen
  *             if ni < len(fwords) and pathlen + 1 < self.max_initial_size:
  *                 for na in range(len(fwords[ni])):             # <<<<<<<<<<<<<<
@@ -48349,7 +48349,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12advance(str
       for (__pyx_t_17 = 0; __pyx_t_17 < __pyx_t_14; __pyx_t_17+=1) {
         __pyx_v_na = __pyx_t_17;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":889
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":889
  *             if ni < len(fwords) and pathlen + 1 < self.max_initial_size:
  *                 for na in range(len(fwords[ni])):
  *                     nf.append((toskip - 1, (ni, na, pathlen + 1)))             # <<<<<<<<<<<<<<
@@ -48390,7 +48390,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12advance(str
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":890
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":890
  *                 for na in range(len(fwords[ni])):
  *                     nf.append((toskip - 1, (ni, na, pathlen + 1)))
  *         if len(nf) > 0:             # <<<<<<<<<<<<<<
@@ -48401,7 +48401,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12advance(str
   __pyx_t_16 = ((__pyx_t_2 > 0) != 0);
   if (__pyx_t_16) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":891
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":891
  *                     nf.append((toskip - 1, (ni, na, pathlen + 1)))
  *         if len(nf) > 0:
  *             return self.advance(nf, res, fwords)             # <<<<<<<<<<<<<<
@@ -48432,7 +48432,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12advance(str
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":893
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":893
  *             return self.advance(nf, res, fwords)
  *         else:
  *             return res             # <<<<<<<<<<<<<<
@@ -48445,7 +48445,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12advance(str
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":879
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":879
  *         return result
  * 
  *     def advance(self, frontier, res, fwords):             # <<<<<<<<<<<<<<
@@ -48478,7 +48478,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12advance(str
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":895
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":895
  *             return res
  * 
  *     def get_all_nodes_isteps_away(self, skip, i, spanlen, pathlen, fwords, next_states, reachable_buffer):             # <<<<<<<<<<<<<<
@@ -48622,7 +48622,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_all_nodes_isteps_away", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":897
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":897
  *     def get_all_nodes_isteps_away(self, skip, i, spanlen, pathlen, fwords, next_states, reachable_buffer):
  *         cdef unsigned alt_it
  *         frontier = []             # <<<<<<<<<<<<<<
@@ -48634,7 +48634,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
   __pyx_v_frontier = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":898
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":898
  *         cdef unsigned alt_it
  *         frontier = []
  *         if i+spanlen+skip >= len(next_states):             # <<<<<<<<<<<<<<
@@ -48656,7 +48656,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (__pyx_t_5) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":899
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":899
  *         frontier = []
  *         if i+spanlen+skip >= len(next_states):
  *             return frontier             # <<<<<<<<<<<<<<
@@ -48669,7 +48669,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":900
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":900
  *         if i+spanlen+skip >= len(next_states):
  *             return frontier
  *         key = tuple([i,spanlen])             # <<<<<<<<<<<<<<
@@ -48690,7 +48690,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
   __pyx_v_key = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":901
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":901
  *             return frontier
  *         key = tuple([i,spanlen])
  *         reachable = []             # <<<<<<<<<<<<<<
@@ -48702,7 +48702,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
   __pyx_v_reachable = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":902
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":902
  *         key = tuple([i,spanlen])
  *         reachable = []
  *         if key in reachable_buffer:             # <<<<<<<<<<<<<<
@@ -48713,7 +48713,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
   __pyx_t_6 = (__pyx_t_5 != 0);
   if (__pyx_t_6) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":903
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":903
  *         reachable = []
  *         if key in reachable_buffer:
  *             reachable = reachable_buffer[key]             # <<<<<<<<<<<<<<
@@ -48728,7 +48728,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":905
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":905
  *             reachable = reachable_buffer[key]
  *         else:
  *             reachable = self.reachable(fwords, i, spanlen)             # <<<<<<<<<<<<<<
@@ -48755,7 +48755,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
     __Pyx_DECREF_SET(__pyx_v_reachable, __pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":906
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":906
  *         else:
  *             reachable = self.reachable(fwords, i, spanlen)
  *             reachable_buffer[key] = reachable             # <<<<<<<<<<<<<<
@@ -48766,7 +48766,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
   }
   __pyx_L4:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":907
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":907
  *             reachable = self.reachable(fwords, i, spanlen)
  *             reachable_buffer[key] = reachable
  *         for nextreachable in reachable:             # <<<<<<<<<<<<<<
@@ -48811,7 +48811,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
     __Pyx_XDECREF_SET(__pyx_v_nextreachable, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":908
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":908
  *             reachable_buffer[key] = reachable
  *         for nextreachable in reachable:
  *             for next_id in next_states[nextreachable]:             # <<<<<<<<<<<<<<
@@ -48859,7 +48859,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
       __Pyx_XDECREF_SET(__pyx_v_next_id, __pyx_t_4);
       __pyx_t_4 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":909
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":909
  *         for nextreachable in reachable:
  *             for next_id in next_states[nextreachable]:
  *                 jump = self.shortest(fwords,i,next_id)             # <<<<<<<<<<<<<<
@@ -48886,7 +48886,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
       __Pyx_XDECREF_SET(__pyx_v_jump, __pyx_t_11);
       __pyx_t_11 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":910
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":910
  *             for next_id in next_states[nextreachable]:
  *                 jump = self.shortest(fwords,i,next_id)
  *                 if jump < skip:             # <<<<<<<<<<<<<<
@@ -48898,7 +48898,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
       __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
       if (__pyx_t_6) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":911
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":911
  *                 jump = self.shortest(fwords,i,next_id)
  *                 if jump < skip:
  *                     continue             # <<<<<<<<<<<<<<
@@ -48908,7 +48908,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
         goto __pyx_L7_continue;
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":912
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":912
  *                 if jump < skip:
  *                     continue
  *                 if pathlen+jump <= self.max_initial_size:             # <<<<<<<<<<<<<<
@@ -48926,7 +48926,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       if (__pyx_t_6) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":913
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":913
  *                     continue
  *                 if pathlen+jump <= self.max_initial_size:
  *                     for alt_id in range(len(fwords[next_id])):             # <<<<<<<<<<<<<<
@@ -48940,7 +48940,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
         for (__pyx_t_13 = 0; __pyx_t_13 < __pyx_t_12; __pyx_t_13+=1) {
           __pyx_v_alt_id = __pyx_t_13;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":914
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":914
  *                 if pathlen+jump <= self.max_initial_size:
  *                     for alt_id in range(len(fwords[next_id])):
  *                         if fwords[next_id][alt_id][0] != EPSILON:             # <<<<<<<<<<<<<<
@@ -48964,7 +48964,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
           __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
           if (__pyx_t_6) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":915
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":915
  *                     for alt_id in range(len(fwords[next_id])):
  *                         if fwords[next_id][alt_id][0] != EPSILON:
  *                             newel = (next_id,alt_id,pathlen+jump)             # <<<<<<<<<<<<<<
@@ -48989,7 +48989,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
             __Pyx_XDECREF_SET(__pyx_v_newel, ((PyObject*)__pyx_t_4));
             __pyx_t_4 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":916
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":916
  *                         if fwords[next_id][alt_id][0] != EPSILON:
  *                             newel = (next_id,alt_id,pathlen+jump)
  *                             if newel not in frontier:             # <<<<<<<<<<<<<<
@@ -49000,7 +49000,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
             __pyx_t_5 = (__pyx_t_6 != 0);
             if (__pyx_t_5) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":917
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":917
  *                             newel = (next_id,alt_id,pathlen+jump)
  *                             if newel not in frontier:
  *                                 frontier.append((next_id,alt_id,pathlen+jump))             # <<<<<<<<<<<<<<
@@ -49040,7 +49040,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
   }
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":918
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":918
  *                             if newel not in frontier:
  *                                 frontier.append((next_id,alt_id,pathlen+jump))
  *         return frontier             # <<<<<<<<<<<<<<
@@ -49052,7 +49052,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
   __pyx_r = __pyx_v_frontier;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":895
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":895
  *             return res
  * 
  *     def get_all_nodes_isteps_away(self, skip, i, spanlen, pathlen, fwords, next_states, reachable_buffer):             # <<<<<<<<<<<<<<
@@ -49082,7 +49082,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_14get_all_nod
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":920
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":920
  *         return frontier
  * 
  *     def reachable(self, fwords, ifrom, dist):             # <<<<<<<<<<<<<<
@@ -49182,7 +49182,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("reachable", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":921
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":921
  * 
  *     def reachable(self, fwords, ifrom, dist):
  *         ret = []             # <<<<<<<<<<<<<<
@@ -49194,7 +49194,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
   __pyx_v_ret = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":922
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":922
  *     def reachable(self, fwords, ifrom, dist):
  *         ret = []
  *         if ifrom >= len(fwords):             # <<<<<<<<<<<<<<
@@ -49210,7 +49210,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_4) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":923
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":923
  *         ret = []
  *         if ifrom >= len(fwords):
  *             return ret             # <<<<<<<<<<<<<<
@@ -49223,7 +49223,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":924
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":924
  *         if ifrom >= len(fwords):
  *             return ret
  *         for alt_id in range(len(fwords[ifrom])):             # <<<<<<<<<<<<<<
@@ -49237,7 +49237,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
   for (__pyx_t_5 = 0; __pyx_t_5 < __pyx_t_2; __pyx_t_5+=1) {
     __pyx_v_alt_id = __pyx_t_5;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":925
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":925
  *             return ret
  *         for alt_id in range(len(fwords[ifrom])):
  *             if fwords[ifrom][alt_id][0] == EPSILON:             # <<<<<<<<<<<<<<
@@ -49261,7 +49261,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":926
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":926
  *         for alt_id in range(len(fwords[ifrom])):
  *             if fwords[ifrom][alt_id][0] == EPSILON:
  *                 ret.extend(self.reachable(fwords,ifrom+fwords[ifrom][alt_id][2],dist))             # <<<<<<<<<<<<<<
@@ -49302,7 +49302,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":928
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":928
  *                 ret.extend(self.reachable(fwords,ifrom+fwords[ifrom][alt_id][2],dist))
  *             else:
  *                 if dist == 0:             # <<<<<<<<<<<<<<
@@ -49314,7 +49314,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
       if (__pyx_t_4) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":929
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":929
  *             else:
  *                 if dist == 0:
  *                     if ifrom not in ret:             # <<<<<<<<<<<<<<
@@ -49325,7 +49325,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
         __pyx_t_8 = (__pyx_t_4 != 0);
         if (__pyx_t_8) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":930
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":930
  *                 if dist == 0:
  *                     if ifrom not in ret:
  *                         ret.append(ifrom)             # <<<<<<<<<<<<<<
@@ -49340,7 +49340,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
       }
       /*else*/ {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":932
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":932
  *                         ret.append(ifrom)
  *                 else:
  *                     for ifromchild in self.reachable(fwords,ifrom+fwords[ifrom][alt_id][2],dist-1):             # <<<<<<<<<<<<<<
@@ -49416,7 +49416,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
           __Pyx_XDECREF_SET(__pyx_v_ifromchild, __pyx_t_1);
           __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":933
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":933
  *                 else:
  *                     for ifromchild in self.reachable(fwords,ifrom+fwords[ifrom][alt_id][2],dist-1):
  *                         if ifromchild not in ret:             # <<<<<<<<<<<<<<
@@ -49427,7 +49427,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
           __pyx_t_4 = (__pyx_t_8 != 0);
           if (__pyx_t_4) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":934
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":934
  *                     for ifromchild in self.reachable(fwords,ifrom+fwords[ifrom][alt_id][2],dist-1):
  *                         if ifromchild not in ret:
  *                             ret.append(ifromchild)             # <<<<<<<<<<<<<<
@@ -49446,7 +49446,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
     __pyx_L6:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":936
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":936
  *                             ret.append(ifromchild)
  * 
  *         return ret             # <<<<<<<<<<<<<<
@@ -49458,7 +49458,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
   __pyx_r = __pyx_v_ret;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":920
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":920
  *         return frontier
  * 
  *     def reachable(self, fwords, ifrom, dist):             # <<<<<<<<<<<<<<
@@ -49482,7 +49482,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_16reachable(s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":938
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":938
  *         return ret
  * 
  *     def shortest(self, fwords, ifrom, ito):             # <<<<<<<<<<<<<<
@@ -49577,7 +49577,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_18shortest(st
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("shortest", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":940
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":940
  *     def shortest(self, fwords, ifrom, ito):
  *         cdef unsigned alt_id
  *         min = 1000             # <<<<<<<<<<<<<<
@@ -49587,7 +49587,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_18shortest(st
   __Pyx_INCREF(__pyx_int_1000);
   __pyx_v_min = __pyx_int_1000;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":941
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":941
  *         cdef unsigned alt_id
  *         min = 1000
  *         if ifrom > ito:             # <<<<<<<<<<<<<<
@@ -49599,7 +49599,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_18shortest(st
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":942
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":942
  *         min = 1000
  *         if ifrom > ito:
  *             return min             # <<<<<<<<<<<<<<
@@ -49612,7 +49612,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_18shortest(st
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":943
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":943
  *         if ifrom > ito:
  *             return min
  *         if ifrom == ito:             # <<<<<<<<<<<<<<
@@ -49624,7 +49624,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_18shortest(st
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":944
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":944
  *             return min
  *         if ifrom == ito:
  *             return 0             # <<<<<<<<<<<<<<
@@ -49637,7 +49637,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_18shortest(st
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":945
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":945
  *         if ifrom == ito:
  *             return 0
  *         for alt_id in range(len(fwords[ifrom])):             # <<<<<<<<<<<<<<
@@ -49651,7 +49651,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_18shortest(st
   for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_3; __pyx_t_4+=1) {
     __pyx_v_alt_id = __pyx_t_4;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":946
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":946
  *             return 0
  *         for alt_id in range(len(fwords[ifrom])):
  *             currmin = self.shortest(fwords,ifrom+fwords[ifrom][alt_id][2],ito)             # <<<<<<<<<<<<<<
@@ -49689,7 +49689,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_18shortest(st
     __Pyx_XDECREF_SET(__pyx_v_currmin, __pyx_t_6);
     __pyx_t_6 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":947
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":947
  *         for alt_id in range(len(fwords[ifrom])):
  *             currmin = self.shortest(fwords,ifrom+fwords[ifrom][alt_id][2],ito)
  *             if fwords[ifrom][alt_id][0] != EPSILON:             # <<<<<<<<<<<<<<
@@ -49713,7 +49713,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_18shortest(st
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":948
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":948
  *             currmin = self.shortest(fwords,ifrom+fwords[ifrom][alt_id][2],ito)
  *             if fwords[ifrom][alt_id][0] != EPSILON:
  *                 currmin += 1             # <<<<<<<<<<<<<<
@@ -49728,7 +49728,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_18shortest(st
     }
     __pyx_L7:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":949
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":949
  *             if fwords[ifrom][alt_id][0] != EPSILON:
  *                 currmin += 1
  *             if currmin < min:             # <<<<<<<<<<<<<<
@@ -49740,7 +49740,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_18shortest(st
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":950
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":950
  *                 currmin += 1
  *             if currmin < min:
  *                 min = currmin             # <<<<<<<<<<<<<<
@@ -49754,7 +49754,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_18shortest(st
     __pyx_L8:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":951
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":951
  *             if currmin < min:
  *                 min = currmin
  *         return min             # <<<<<<<<<<<<<<
@@ -49766,7 +49766,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_18shortest(st
   __pyx_r = __pyx_v_min;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":938
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":938
  *         return ret
  * 
  *     def shortest(self, fwords, ifrom, ito):             # <<<<<<<<<<<<<<
@@ -49789,7 +49789,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_18shortest(st
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":953
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":953
  *         return min
  * 
  *     def get_next_states(self, _columns, curr_idx, min_dist=2):             # <<<<<<<<<<<<<<
@@ -49895,7 +49895,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("get_next_states", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":954
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":954
  * 
  *     def get_next_states(self, _columns, curr_idx, min_dist=2):
  *         result = []             # <<<<<<<<<<<<<<
@@ -49907,7 +49907,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
   __pyx_v_result = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":955
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":955
  *     def get_next_states(self, _columns, curr_idx, min_dist=2):
  *         result = []
  *         candidate = [[curr_idx,0]]             # <<<<<<<<<<<<<<
@@ -49930,7 +49930,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
   __pyx_v_candidate = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":957
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":957
  *         candidate = [[curr_idx,0]]
  * 
  *         while len(candidate) > 0:             # <<<<<<<<<<<<<<
@@ -49942,7 +49942,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
     __pyx_t_4 = ((__pyx_t_3 > 0) != 0);
     if (!__pyx_t_4) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":958
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":958
  * 
  *         while len(candidate) > 0:
  *             curr = candidate.pop()             # <<<<<<<<<<<<<<
@@ -49954,7 +49954,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
     __Pyx_XDECREF_SET(__pyx_v_curr, __pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":959
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":959
  *         while len(candidate) > 0:
  *             curr = candidate.pop()
  *             if curr[0] >= len(_columns):             # <<<<<<<<<<<<<<
@@ -49973,7 +49973,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":960
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":960
  *             curr = candidate.pop()
  *             if curr[0] >= len(_columns):
  *                 continue             # <<<<<<<<<<<<<<
@@ -49983,7 +49983,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
       goto __pyx_L3_continue;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":961
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":961
  *             if curr[0] >= len(_columns):
  *                 continue
  *             if curr[0] not in result and min_dist <= curr[1] <= self.max_initial_size:             # <<<<<<<<<<<<<<
@@ -50014,7 +50014,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
     }
     if (__pyx_t_7) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":962
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":962
  *                 continue
  *             if curr[0] not in result and min_dist <= curr[1] <= self.max_initial_size:
  *                 result.append(curr[0]);             # <<<<<<<<<<<<<<
@@ -50029,7 +50029,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
     }
     __pyx_L6:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":963
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":963
  *             if curr[0] not in result and min_dist <= curr[1] <= self.max_initial_size:
  *                 result.append(curr[0]);
  *             curr_col = _columns[curr[0]]             # <<<<<<<<<<<<<<
@@ -50044,7 +50044,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
     __Pyx_XDECREF_SET(__pyx_v_curr_col, __pyx_t_5);
     __pyx_t_5 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":964
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":964
  *                 result.append(curr[0]);
  *             curr_col = _columns[curr[0]]
  *             for alt in curr_col:             # <<<<<<<<<<<<<<
@@ -50089,7 +50089,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
       __Pyx_XDECREF_SET(__pyx_v_alt, __pyx_t_1);
       __pyx_t_1 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":965
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":965
  *             curr_col = _columns[curr[0]]
  *             for alt in curr_col:
  *                 next_id = curr[0]+alt[2]             # <<<<<<<<<<<<<<
@@ -50107,7 +50107,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
       __Pyx_XDECREF_SET(__pyx_v_next_id, __pyx_t_10);
       __pyx_t_10 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":966
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":966
  *             for alt in curr_col:
  *                 next_id = curr[0]+alt[2]
  *                 jump = 1             # <<<<<<<<<<<<<<
@@ -50117,7 +50117,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
       __Pyx_INCREF(__pyx_int_1);
       __Pyx_XDECREF_SET(__pyx_v_jump, __pyx_int_1);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":967
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":967
  *                 next_id = curr[0]+alt[2]
  *                 jump = 1
  *                 if alt[0] == EPSILON:             # <<<<<<<<<<<<<<
@@ -50135,7 +50135,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
       if (__pyx_t_7) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":968
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":968
  *                 jump = 1
  *                 if alt[0] == EPSILON:
  *                     jump = 0             # <<<<<<<<<<<<<<
@@ -50148,7 +50148,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
       }
       __pyx_L9:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":969
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":969
  *                 if alt[0] == EPSILON:
  *                     jump = 0
  *                 if next_id not in result and min_dist <= curr[1]+jump <= self.max_initial_size+1:             # <<<<<<<<<<<<<<
@@ -50179,7 +50179,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
       }
       if (__pyx_t_6) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":970
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":970
  *                     jump = 0
  *                 if next_id not in result and min_dist <= curr[1]+jump <= self.max_initial_size+1:
  *                     candidate.append([next_id,curr[1]+jump])             # <<<<<<<<<<<<<<
@@ -50209,7 +50209,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
     __pyx_L3_continue:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":971
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":971
  *                 if next_id not in result and min_dist <= curr[1]+jump <= self.max_initial_size+1:
  *                     candidate.append([next_id,curr[1]+jump])
  *         return sorted(result);             # <<<<<<<<<<<<<<
@@ -50229,7 +50229,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
   __pyx_t_1 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":953
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":953
  *         return min
  * 
  *     def get_next_states(self, _columns, curr_idx, min_dist=2):             # <<<<<<<<<<<<<<
@@ -50259,7 +50259,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_20get_next_st
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":973
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":973
  *         return sorted(result);
  * 
  *     def input(self, fwords, meta, ctx_name=None):             # <<<<<<<<<<<<<<
@@ -50341,7 +50341,7 @@ static PyObject *__pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_23input(PyObj
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1142
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1142
  *                         if len(extracts) > 0:
  *                             fcount = Counter()
  *                             fphrases = defaultdict(lambda: defaultdict(lambda: defaultdict(list)))             # <<<<<<<<<<<<<<
@@ -50457,7 +50457,7 @@ static PyObject *__pyx_lambda_funcdef_lambda3(CYTHON_UNUSED PyObject *__pyx_self
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1148
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1148
  *                             for f, elist in fphrases.iteritems():
  *                                 for e, alslist in elist.iteritems():
  *                                     alignment, max_locs = max(alslist.iteritems(), key=lambda x: len(x[1]))             # <<<<<<<<<<<<<<
@@ -50511,7 +50511,7 @@ static PyObject *__pyx_lambda_funcdef_lambda5(CYTHON_UNUSED PyObject *__pyx_self
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_5input_4generator14(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1188
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1188
  *         if self.online:
  *             stats = self.online_stats[ctx_name]
  *             f_syms = tuple(word[0][0] for word in fwords)             # <<<<<<<<<<<<<<
@@ -50661,7 +50661,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_5input_4gener
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":973
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":973
  *         return sorted(result);
  * 
  *     def input(self, fwords, meta, ctx_name=None):             # <<<<<<<<<<<<<<
@@ -50764,7 +50764,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 973; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":984
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":984
  *         cdef Phrase hiero_phrase
  * 
  *         flen = len(fwords)             # <<<<<<<<<<<<<<
@@ -50777,7 +50777,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_cur_scope->__pyx_v_flen = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":985
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":985
  * 
  *         flen = len(fwords)
  *         start_time = monitor_cpu()             # <<<<<<<<<<<<<<
@@ -50793,7 +50793,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_cur_scope->__pyx_v_start_time = __pyx_t_4;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":986
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":986
  *         flen = len(fwords)
  *         start_time = monitor_cpu()
  *         self.extract_time = 0.0             # <<<<<<<<<<<<<<
@@ -50802,7 +50802,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
  */
   __pyx_cur_scope->__pyx_v_self->extract_time = 0.0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":987
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":987
  *         start_time = monitor_cpu()
  *         self.extract_time = 0.0
  *         self.intersect_time = 0.0             # <<<<<<<<<<<<<<
@@ -50811,7 +50811,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
  */
   __pyx_cur_scope->__pyx_v_self->intersect_time = 0.0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":988
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":988
  *         self.extract_time = 0.0
  *         self.intersect_time = 0.0
  *         nodes_isteps_away_buffer = {}             # <<<<<<<<<<<<<<
@@ -50824,7 +50824,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __pyx_cur_scope->__pyx_v_nodes_isteps_away_buffer = ((PyObject*)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":989
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":989
  *         self.intersect_time = 0.0
  *         nodes_isteps_away_buffer = {}
  *         hit = 0             # <<<<<<<<<<<<<<
@@ -50833,7 +50833,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
  */
   __pyx_cur_scope->__pyx_v_hit = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":990
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":990
  *         nodes_isteps_away_buffer = {}
  *         hit = 0
  *         reachable_buffer = {}             # <<<<<<<<<<<<<<
@@ -50846,7 +50846,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __pyx_cur_scope->__pyx_v_reachable_buffer = ((PyObject*)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":995
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":995
  *         # during online extraction.  This is probably the hackiest part of
  *         # online grammar extraction.
  *         seen_phrases = set()             # <<<<<<<<<<<<<<
@@ -50859,7 +50859,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __pyx_cur_scope->__pyx_v_seen_phrases = ((PyObject*)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":998
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":998
  * 
  *         # Do not cache between sentences
  *         self.rules.root = ExtendedTrieNode(phrase_location=PhraseLocation())             # <<<<<<<<<<<<<<
@@ -50881,7 +50881,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __pyx_cur_scope->__pyx_v_self->rules->root = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1000
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1000
  *         self.rules.root = ExtendedTrieNode(phrase_location=PhraseLocation())
  * 
  *         frontier = []             # <<<<<<<<<<<<<<
@@ -50894,7 +50894,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __pyx_cur_scope->__pyx_v_frontier = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1001
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1001
  * 
  *         frontier = []
  *         for i in range(len(fwords)):             # <<<<<<<<<<<<<<
@@ -50908,7 +50908,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   for (__pyx_t_5 = 0; __pyx_t_5 < __pyx_t_2; __pyx_t_5+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_5;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1002
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1002
  *         frontier = []
  *         for i in range(len(fwords)):
  *             for alt in range(0, len(fwords[i])):             # <<<<<<<<<<<<<<
@@ -50922,7 +50922,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
     for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {
       __pyx_cur_scope->__pyx_v_alt = __pyx_t_7;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1003
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1003
  *         for i in range(len(fwords)):
  *             for alt in range(0, len(fwords[i])):
  *                 if fwords[i][alt][0] != EPSILON:             # <<<<<<<<<<<<<<
@@ -50946,7 +50946,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
       if (__pyx_t_9) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1004
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1004
  *             for alt in range(0, len(fwords[i])):
  *                 if fwords[i][alt][0] != EPSILON:
  *                     frontier.append((i, i, (i,), alt, 0, self.rules.root, (), False))             # <<<<<<<<<<<<<<
@@ -51000,7 +51000,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
     }
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1006
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1006
  *                     frontier.append((i, i, (i,), alt, 0, self.rules.root, (), False))
  * 
  *         xroot = None             # <<<<<<<<<<<<<<
@@ -51011,7 +51011,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __Pyx_GIVEREF(Py_None);
   __pyx_cur_scope->__pyx_v_xroot = Py_None;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1007
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1007
  * 
  *         xroot = None
  *         x1 = sym_setindex(self.category, 1)             # <<<<<<<<<<<<<<
@@ -51020,7 +51020,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
  */
   __pyx_cur_scope->__pyx_v_x1 = __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_cur_scope->__pyx_v_self->category, 1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1008
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1008
  *         xroot = None
  *         x1 = sym_setindex(self.category, 1)
  *         if x1 in self.rules.root.children:             # <<<<<<<<<<<<<<
@@ -51037,7 +51037,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __pyx_t_13 = (__pyx_t_9 != 0);
   if (__pyx_t_13) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1009
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1009
  *         x1 = sym_setindex(self.category, 1)
  *         if x1 in self.rules.root.children:
  *             xroot = self.rules.root.children[x1]             # <<<<<<<<<<<<<<
@@ -51057,7 +51057,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1011
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1011
  *             xroot = self.rules.root.children[x1]
  *         else:
  *             xroot = ExtendedTrieNode(suffix_link=self.rules.root, phrase_location=PhraseLocation())             # <<<<<<<<<<<<<<
@@ -51079,7 +51079,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
     __Pyx_GIVEREF(__pyx_t_1);
     __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1012
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1012
  *         else:
  *             xroot = ExtendedTrieNode(suffix_link=self.rules.root, phrase_location=PhraseLocation())
  *             self.rules.root.children[x1] = xroot             # <<<<<<<<<<<<<<
@@ -51093,7 +51093,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   }
   __pyx_L9:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1014
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1014
  *             self.rules.root.children[x1] = xroot
  * 
  *         for i in range(self.min_gap_size, len(fwords)):             # <<<<<<<<<<<<<<
@@ -51107,7 +51107,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   for (__pyx_t_5 = __pyx_cur_scope->__pyx_v_self->min_gap_size; __pyx_t_5 < __pyx_t_2; __pyx_t_5+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_5;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1015
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1015
  * 
  *         for i in range(self.min_gap_size, len(fwords)):
  *             for alt in range(0, len(fwords[i])):             # <<<<<<<<<<<<<<
@@ -51121,7 +51121,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
     for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) {
       __pyx_cur_scope->__pyx_v_alt = __pyx_t_7;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1016
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1016
  *         for i in range(self.min_gap_size, len(fwords)):
  *             for alt in range(0, len(fwords[i])):
  *                 if fwords[i][alt][0] != EPSILON:             # <<<<<<<<<<<<<<
@@ -51145,7 +51145,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
       if (__pyx_t_13) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1017
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1017
  *             for alt in range(0, len(fwords[i])):
  *                 if fwords[i][alt][0] != EPSILON:
  *                     frontier.append((i-self.min_gap_size, i, (i,), alt, self.min_gap_size, xroot, (x1,), True))             # <<<<<<<<<<<<<<
@@ -51208,7 +51208,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
     }
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1019
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1019
  *                     frontier.append((i-self.min_gap_size, i, (i,), alt, self.min_gap_size, xroot, (x1,), True))
  * 
  *         next_states = []             # <<<<<<<<<<<<<<
@@ -51221,7 +51221,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __pyx_cur_scope->__pyx_v_next_states = ((PyObject*)__pyx_t_14);
   __pyx_t_14 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1020
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1020
  * 
  *         next_states = []
  *         for i in range(len(fwords)):             # <<<<<<<<<<<<<<
@@ -51235,7 +51235,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   for (__pyx_t_5 = 0; __pyx_t_5 < __pyx_t_2; __pyx_t_5+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_5;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1021
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1021
  *         next_states = []
  *         for i in range(len(fwords)):
  *             next_states.append(self.get_next_states(fwords,i,self.min_gap_size))             # <<<<<<<<<<<<<<
@@ -51267,7 +51267,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
     __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1023
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1023
  *             next_states.append(self.get_next_states(fwords,i,self.min_gap_size))
  * 
  *         while len(frontier) > 0:             # <<<<<<<<<<<<<<
@@ -51279,7 +51279,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
     __pyx_t_13 = ((__pyx_t_2 > 0) != 0);
     if (!__pyx_t_13) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1024
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1024
  * 
  *         while len(frontier) > 0:
  *             new_frontier = []             # <<<<<<<<<<<<<<
@@ -51293,7 +51293,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
     __Pyx_GIVEREF(__pyx_t_8);
     __pyx_t_8 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1025
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1025
  *         while len(frontier) > 0:
  *             new_frontier = []
  *             for k, i, input_match, alt, pathlen, node, prefix, is_shadow_path in frontier:             # <<<<<<<<<<<<<<
@@ -51413,7 +51413,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __Pyx_GIVEREF(__pyx_t_18);
       __pyx_t_18 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1026
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1026
  *             new_frontier = []
  *             for k, i, input_match, alt, pathlen, node, prefix, is_shadow_path in frontier:
  *                 word_id = fwords[i][alt][0]             # <<<<<<<<<<<<<<
@@ -51433,7 +51433,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __Pyx_GIVEREF(__pyx_t_1);
       __pyx_t_1 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1027
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1027
  *             for k, i, input_match, alt, pathlen, node, prefix, is_shadow_path in frontier:
  *                 word_id = fwords[i][alt][0]
  *                 spanlen = fwords[i][alt][2]             # <<<<<<<<<<<<<<
@@ -51453,7 +51453,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __Pyx_GIVEREF(__pyx_t_1);
       __pyx_t_1 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1029
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1029
  *                 spanlen = fwords[i][alt][2]
  *                 # TODO get rid of k -- pathlen is replacing it
  *                 if word_id == EPSILON:             # <<<<<<<<<<<<<<
@@ -51468,7 +51468,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __Pyx_DECREF(__pyx_t_18); __pyx_t_18 = 0;
       if (__pyx_t_13) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1031
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1031
  *                 if word_id == EPSILON:
  *                     # skipping because word_id is epsilon
  *                     if i+spanlen >= len(fwords):             # <<<<<<<<<<<<<<
@@ -51493,7 +51493,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         __Pyx_DECREF(__pyx_t_17); __pyx_t_17 = 0;
         if (__pyx_t_13) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1032
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1032
  *                     # skipping because word_id is epsilon
  *                     if i+spanlen >= len(fwords):
  *                         continue             # <<<<<<<<<<<<<<
@@ -51503,7 +51503,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           goto __pyx_L19_continue;
         }
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1033
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1033
  *                     if i+spanlen >= len(fwords):
  *                         continue
  *                     for nualt in range(0,len(fwords[i+spanlen])):             # <<<<<<<<<<<<<<
@@ -51523,7 +51523,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         for (__pyx_t_21 = 0; __pyx_t_21 < __pyx_t_6; __pyx_t_21+=1) {
           __pyx_cur_scope->__pyx_v_nualt = __pyx_t_21;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1034
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1034
  *                         continue
  *                     for nualt in range(0,len(fwords[i+spanlen])):
  *                         frontier.append((k, i+spanlen, input_match, nualt, pathlen, node, prefix, is_shadow_path))             # <<<<<<<<<<<<<<
@@ -51569,7 +51569,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0;
         }
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1035
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1035
  *                     for nualt in range(0,len(fwords[i+spanlen])):
  *                         frontier.append((k, i+spanlen, input_match, nualt, pathlen, node, prefix, is_shadow_path))
  *                     continue             # <<<<<<<<<<<<<<
@@ -51579,7 +51579,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         goto __pyx_L19_continue;
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1037
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1037
  *                     continue
  * 
  *                 phrase = prefix + (word_id,)             # <<<<<<<<<<<<<<
@@ -51599,7 +51599,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __Pyx_GIVEREF(__pyx_t_18);
       __pyx_t_18 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1038
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1038
  * 
  *                 phrase = prefix + (word_id,)
  *                 hiero_phrase = Phrase(phrase)             # <<<<<<<<<<<<<<
@@ -51619,7 +51619,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __Pyx_GIVEREF(__pyx_t_16);
       __pyx_t_16 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1039
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1039
  *                 phrase = prefix + (word_id,)
  *                 hiero_phrase = Phrase(phrase)
  *                 arity = hiero_phrase.arity()             # <<<<<<<<<<<<<<
@@ -51635,7 +51635,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __Pyx_DECREF(__pyx_t_18); __pyx_t_18 = 0;
       __pyx_cur_scope->__pyx_v_arity = __pyx_t_21;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1041
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1041
  *                 arity = hiero_phrase.arity()
  * 
  *                 lookup_required = False             # <<<<<<<<<<<<<<
@@ -51644,7 +51644,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
  */
       __pyx_cur_scope->__pyx_v_lookup_required = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1042
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1042
  * 
  *                 lookup_required = False
  *                 if word_id in node.children:             # <<<<<<<<<<<<<<
@@ -51658,7 +51658,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __pyx_t_9 = (__pyx_t_13 != 0);
       if (__pyx_t_9) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1043
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1043
  *                 lookup_required = False
  *                 if word_id in node.children:
  *                     if node.children[word_id] is None:             # <<<<<<<<<<<<<<
@@ -51675,7 +51675,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         __pyx_t_13 = (__pyx_t_9 != 0);
         if (__pyx_t_13) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1045
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1045
  *                     if node.children[word_id] is None:
  *                         # Path dead-ends at this node
  *                         continue             # <<<<<<<<<<<<<<
@@ -51686,7 +51686,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         }
         /*else*/ {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1048
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1048
  *                     else:
  *                         # Path continues at this node
  *                         node = node.children[word_id]             # <<<<<<<<<<<<<<
@@ -51707,7 +51707,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       }
       /*else*/ {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1050
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1050
  *                         node = node.children[word_id]
  *                 else:
  *                     if node.suffix_link is None:             # <<<<<<<<<<<<<<
@@ -51721,7 +51721,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         __pyx_t_9 = (__pyx_t_13 != 0);
         if (__pyx_t_9) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1052
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1052
  *                     if node.suffix_link is None:
  *                         # Current node is root; lookup required
  *                         lookup_required = True             # <<<<<<<<<<<<<<
@@ -51733,7 +51733,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         }
         /*else*/ {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1054
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1054
  *                         lookup_required = True
  *                     else:
  *                         if word_id in node.suffix_link.children:             # <<<<<<<<<<<<<<
@@ -51750,7 +51750,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __pyx_t_13 = (__pyx_t_9 != 0);
           if (__pyx_t_13) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1055
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1055
  *                     else:
  *                         if word_id in node.suffix_link.children:
  *                             if node.suffix_link.children[word_id] is None:             # <<<<<<<<<<<<<<
@@ -51770,7 +51770,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __pyx_t_9 = (__pyx_t_13 != 0);
             if (__pyx_t_9) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1057
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1057
  *                             if node.suffix_link.children[word_id] is None:
  *                                 # Suffix link reports path is dead end
  *                                 node.children[word_id] = None             # <<<<<<<<<<<<<<
@@ -51782,7 +51782,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
               if (unlikely(PyObject_SetItem(__pyx_t_16, __pyx_cur_scope->__pyx_v_word_id, Py_None) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1057; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
               __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1058
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1058
  *                                 # Suffix link reports path is dead end
  *                                 node.children[word_id] = None
  *                                 continue             # <<<<<<<<<<<<<<
@@ -51793,7 +51793,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             }
             /*else*/ {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1061
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1061
  *                             else:
  *                                 # Suffix link indicates lookup is reqired
  *                                 lookup_required = True             # <<<<<<<<<<<<<<
@@ -51806,7 +51806,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           }
           /*else*/ {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1064
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1064
  *                         else:
  *                             #ERROR: We never get here
  *                             raise Exception("Keyword trie error")             # <<<<<<<<<<<<<<
@@ -51825,7 +51825,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       }
       __pyx_L27:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1066
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1066
  *                             raise Exception("Keyword trie error")
  *                 # checking whether lookup_required
  *                 if lookup_required:             # <<<<<<<<<<<<<<
@@ -51835,7 +51835,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __pyx_t_9 = (__pyx_cur_scope->__pyx_v_lookup_required != 0);
       if (__pyx_t_9) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1067
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1067
  *                 # checking whether lookup_required
  *                 if lookup_required:
  *                     new_node = None             # <<<<<<<<<<<<<<
@@ -51847,7 +51847,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_new_node, Py_None);
         __Pyx_GIVEREF(Py_None);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1068
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1068
  *                 if lookup_required:
  *                     new_node = None
  *                     if is_shadow_path:             # <<<<<<<<<<<<<<
@@ -51857,7 +51857,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_cur_scope->__pyx_v_is_shadow_path); if (unlikely(__pyx_t_9 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1068; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         if (__pyx_t_9) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1071
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1071
  *                         # Extending shadow path
  *                         # on the shadow path we don't do any search, we just use info from suffix link
  *                         new_node = ExtendedTrieNode(phrase_location=node.suffix_link.children[word_id].phrase_location,             # <<<<<<<<<<<<<<
@@ -51880,7 +51880,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           if (PyDict_SetItem(__pyx_t_16, __pyx_n_s_phrase_location, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1072
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1072
  *                         # on the shadow path we don't do any search, we just use info from suffix link
  *                         new_node = ExtendedTrieNode(phrase_location=node.suffix_link.children[word_id].phrase_location,
  *                                 suffix_link=node.suffix_link.children[word_id],             # <<<<<<<<<<<<<<
@@ -51898,7 +51898,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           if (PyDict_SetItem(__pyx_t_16, __pyx_n_s_suffix_link, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1073
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1073
  *                         new_node = ExtendedTrieNode(phrase_location=node.suffix_link.children[word_id].phrase_location,
  *                                 suffix_link=node.suffix_link.children[word_id],
  *                                 phrase=hiero_phrase)             # <<<<<<<<<<<<<<
@@ -51907,7 +51907,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
  */
           if (PyDict_SetItem(__pyx_t_16, __pyx_n_s_phrase, ((PyObject *)__pyx_cur_scope->__pyx_v_hiero_phrase)) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1071
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1071
  *                         # Extending shadow path
  *                         # on the shadow path we don't do any search, we just use info from suffix link
  *                         new_node = ExtendedTrieNode(phrase_location=node.suffix_link.children[word_id].phrase_location,             # <<<<<<<<<<<<<<
@@ -51925,7 +51925,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         }
         /*else*/ {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1075
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1075
  *                                 phrase=hiero_phrase)
  *                     else:
  *                         if arity > 0:             # <<<<<<<<<<<<<<
@@ -51935,7 +51935,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __pyx_t_9 = ((__pyx_cur_scope->__pyx_v_arity > 0) != 0);
           if (__pyx_t_9) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1077
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1077
  *                         if arity > 0:
  *                             # Intersecting because of arity > 0
  *                             intersect_start_time = monitor_cpu()             # <<<<<<<<<<<<<<
@@ -51952,7 +51952,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __Pyx_GIVEREF(__pyx_t_16);
             __pyx_t_16 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1078
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1078
  *                             # Intersecting because of arity > 0
  *                             intersect_start_time = monitor_cpu()
  *                             phrase_location = self.intersect(node, node.suffix_link.children[word_id], hiero_phrase)             # <<<<<<<<<<<<<<
@@ -51975,7 +51975,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __Pyx_GIVEREF(__pyx_t_1);
             __pyx_t_1 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1079
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1079
  *                             intersect_start_time = monitor_cpu()
  *                             phrase_location = self.intersect(node, node.suffix_link.children[word_id], hiero_phrase)
  *                             intersect_stop_time = monitor_cpu()             # <<<<<<<<<<<<<<
@@ -51992,7 +51992,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __Pyx_GIVEREF(__pyx_t_16);
             __pyx_t_16 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1080
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1080
  *                             phrase_location = self.intersect(node, node.suffix_link.children[word_id], hiero_phrase)
  *                             intersect_stop_time = monitor_cpu()
  *                             self.intersect_time += intersect_stop_time - intersect_start_time             # <<<<<<<<<<<<<<
@@ -52014,7 +52014,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           }
           /*else*/ {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1083
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1083
  *                         else:
  *                             # Suffix array search
  *                             phrase_location = node.phrase_location             # <<<<<<<<<<<<<<
@@ -52029,7 +52029,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __Pyx_GIVEREF(__pyx_t_18);
             __pyx_t_18 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1084
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1084
  *                             # Suffix array search
  *                             phrase_location = node.phrase_location
  *                             sa_range = self.fsa.lookup(sym_tostring(phrase[-1]), len(phrase)-1, phrase_location.sa_low, phrase_location.sa_high)             # <<<<<<<<<<<<<<
@@ -52074,7 +52074,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __Pyx_GIVEREF(__pyx_t_10);
             __pyx_t_10 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1085
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1085
  *                             phrase_location = node.phrase_location
  *                             sa_range = self.fsa.lookup(sym_tostring(phrase[-1]), len(phrase)-1, phrase_location.sa_low, phrase_location.sa_high)
  *                             if sa_range is not None:             # <<<<<<<<<<<<<<
@@ -52085,7 +52085,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __pyx_t_13 = (__pyx_t_9 != 0);
             if (__pyx_t_13) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1086
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1086
  *                             sa_range = self.fsa.lookup(sym_tostring(phrase[-1]), len(phrase)-1, phrase_location.sa_low, phrase_location.sa_high)
  *                             if sa_range is not None:
  *                                 phrase_location = PhraseLocation(sa_low=sa_range[0], sa_high=sa_range[1])             # <<<<<<<<<<<<<<
@@ -52113,7 +52113,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             }
             /*else*/ {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1088
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1088
  *                                 phrase_location = PhraseLocation(sa_low=sa_range[0], sa_high=sa_range[1])
  *                             else:
  *                                 phrase_location = None             # <<<<<<<<<<<<<<
@@ -52129,7 +52129,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           }
           __pyx_L34:;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1090
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1090
  *                                 phrase_location = None
  * 
  *                         if phrase_location is None:             # <<<<<<<<<<<<<<
@@ -52140,7 +52140,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __pyx_t_9 = (__pyx_t_13 != 0);
           if (__pyx_t_9) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1091
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1091
  * 
  *                         if phrase_location is None:
  *                             node.children[word_id] = None             # <<<<<<<<<<<<<<
@@ -52152,7 +52152,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             if (unlikely(PyObject_SetItem(__pyx_t_11, __pyx_cur_scope->__pyx_v_word_id, Py_None) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1091; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
             __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1093
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1093
  *                             node.children[word_id] = None
  *                             # Search failed
  *                             continue             # <<<<<<<<<<<<<<
@@ -52162,7 +52162,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             goto __pyx_L19_continue;
           }
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1095
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1095
  *                             continue
  *                         # Search succeeded
  *                         suffix_link = self.rules.root             # <<<<<<<<<<<<<<
@@ -52176,7 +52176,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_GIVEREF(__pyx_t_11);
           __pyx_t_11 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1096
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1096
  *                         # Search succeeded
  *                         suffix_link = self.rules.root
  *                         if node.suffix_link is not None:             # <<<<<<<<<<<<<<
@@ -52190,7 +52190,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __pyx_t_13 = (__pyx_t_9 != 0);
           if (__pyx_t_13) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1097
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1097
  *                         suffix_link = self.rules.root
  *                         if node.suffix_link is not None:
  *                             suffix_link = node.suffix_link.children[word_id]             # <<<<<<<<<<<<<<
@@ -52213,7 +52213,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           }
           __pyx_L37:;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1098
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1098
  *                         if node.suffix_link is not None:
  *                             suffix_link = node.suffix_link.children[word_id]
  *                         new_node = ExtendedTrieNode(phrase_location=phrase_location,             # <<<<<<<<<<<<<<
@@ -52224,7 +52224,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_GOTREF(__pyx_t_11);
           if (PyDict_SetItem(__pyx_t_11, __pyx_n_s_phrase_location, ((PyObject *)__pyx_cur_scope->__pyx_v_phrase_location)) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1098; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1099
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1099
  *                             suffix_link = node.suffix_link.children[word_id]
  *                         new_node = ExtendedTrieNode(phrase_location=phrase_location,
  *                                 suffix_link=suffix_link,             # <<<<<<<<<<<<<<
@@ -52233,7 +52233,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
  */
           if (PyDict_SetItem(__pyx_t_11, __pyx_n_s_suffix_link, __pyx_cur_scope->__pyx_v_suffix_link) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1098; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1100
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1100
  *                         new_node = ExtendedTrieNode(phrase_location=phrase_location,
  *                                 suffix_link=suffix_link,
  *                                 phrase=hiero_phrase)             # <<<<<<<<<<<<<<
@@ -52242,7 +52242,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
  */
           if (PyDict_SetItem(__pyx_t_11, __pyx_n_s_phrase, ((PyObject *)__pyx_cur_scope->__pyx_v_hiero_phrase)) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1098; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1098
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1098
  *                         if node.suffix_link is not None:
  *                             suffix_link = node.suffix_link.children[word_id]
  *                         new_node = ExtendedTrieNode(phrase_location=phrase_location,             # <<<<<<<<<<<<<<
@@ -52259,7 +52259,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         }
         __pyx_L33:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1101
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1101
  *                                 suffix_link=suffix_link,
  *                                 phrase=hiero_phrase)
  *                     node.children[word_id] = new_node             # <<<<<<<<<<<<<<
@@ -52271,7 +52271,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         if (unlikely(PyObject_SetItem(__pyx_t_10, __pyx_cur_scope->__pyx_v_word_id, __pyx_cur_scope->__pyx_v_new_node) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1101; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1102
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1102
  *                                 phrase=hiero_phrase)
  *                     node.children[word_id] = new_node
  *                     node = new_node             # <<<<<<<<<<<<<<
@@ -52283,7 +52283,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         __Pyx_DECREF_SET(__pyx_cur_scope->__pyx_v_node, __pyx_cur_scope->__pyx_v_new_node);
         __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_new_node);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1107
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1107
  *                     This should happen before we get to extraction (so that
  *                     the node will exist if needed)'''
  *                     if arity < self.max_nonterminals:             # <<<<<<<<<<<<<<
@@ -52293,7 +52293,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         __pyx_t_13 = ((__pyx_cur_scope->__pyx_v_arity < __pyx_cur_scope->__pyx_v_self->max_nonterminals) != 0);
         if (__pyx_t_13) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1108
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1108
  *                     the node will exist if needed)'''
  *                     if arity < self.max_nonterminals:
  *                         xcat_index = arity+1             # <<<<<<<<<<<<<<
@@ -52307,7 +52307,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_GIVEREF(__pyx_t_10);
           __pyx_t_10 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1109
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1109
  *                     if arity < self.max_nonterminals:
  *                         xcat_index = arity+1
  *                         xcat = sym_setindex(self.category, xcat_index)             # <<<<<<<<<<<<<<
@@ -52317,7 +52317,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __pyx_t_21 = __Pyx_PyInt_As_int(__pyx_cur_scope->__pyx_v_xcat_index); if (unlikely((__pyx_t_21 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1109; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           __pyx_cur_scope->__pyx_v_xcat = __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_cur_scope->__pyx_v_self->category, __pyx_t_21);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1110
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1110
  *                         xcat_index = arity+1
  *                         xcat = sym_setindex(self.category, xcat_index)
  *                         suffix_link_xcat_index = xcat_index             # <<<<<<<<<<<<<<
@@ -52329,7 +52329,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_suffix_link_xcat_index, __pyx_cur_scope->__pyx_v_xcat_index);
           __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_xcat_index);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1111
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1111
  *                         xcat = sym_setindex(self.category, xcat_index)
  *                         suffix_link_xcat_index = xcat_index
  *                         if is_shadow_path:             # <<<<<<<<<<<<<<
@@ -52339,7 +52339,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __pyx_t_13 = __Pyx_PyObject_IsTrue(__pyx_cur_scope->__pyx_v_is_shadow_path); if (unlikely(__pyx_t_13 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1111; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           if (__pyx_t_13) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1112
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1112
  *                         suffix_link_xcat_index = xcat_index
  *                         if is_shadow_path:
  *                             suffix_link_xcat_index = xcat_index-1             # <<<<<<<<<<<<<<
@@ -52356,7 +52356,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           }
           __pyx_L39:;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1113
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1113
  *                         if is_shadow_path:
  *                             suffix_link_xcat_index = xcat_index-1
  *                         suffix_link_xcat = sym_setindex(self.category, suffix_link_xcat_index)             # <<<<<<<<<<<<<<
@@ -52366,7 +52366,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __pyx_t_21 = __Pyx_PyInt_As_int(__pyx_cur_scope->__pyx_v_suffix_link_xcat_index); if (unlikely((__pyx_t_21 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           __pyx_cur_scope->__pyx_v_suffix_link_xcat = __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_cur_scope->__pyx_v_self->category, __pyx_t_21);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1114
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1114
  *                             suffix_link_xcat_index = xcat_index-1
  *                         suffix_link_xcat = sym_setindex(self.category, suffix_link_xcat_index)
  *                         node.children[xcat] = ExtendedTrieNode(phrase_location=node.phrase_location,             # <<<<<<<<<<<<<<
@@ -52380,7 +52380,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           if (PyDict_SetItem(__pyx_t_10, __pyx_n_s_phrase_location, __pyx_t_11) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1115
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1115
  *                         suffix_link_xcat = sym_setindex(self.category, suffix_link_xcat_index)
  *                         node.children[xcat] = ExtendedTrieNode(phrase_location=node.phrase_location,
  *                                 suffix_link=node.suffix_link.children[suffix_link_xcat],             # <<<<<<<<<<<<<<
@@ -52398,7 +52398,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           if (PyDict_SetItem(__pyx_t_10, __pyx_n_s_suffix_link, __pyx_t_11) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1116
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1116
  *                         node.children[xcat] = ExtendedTrieNode(phrase_location=node.phrase_location,
  *                                 suffix_link=node.suffix_link.children[suffix_link_xcat],
  *                                 phrase= Phrase(phrase + (xcat,)))             # <<<<<<<<<<<<<<
@@ -52426,7 +52426,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           if (PyDict_SetItem(__pyx_t_10, __pyx_n_s_phrase, __pyx_t_11) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1114
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1114
  *                             suffix_link_xcat_index = xcat_index-1
  *                         suffix_link_xcat = sym_setindex(self.category, suffix_link_xcat_index)
  *                         node.children[xcat] = ExtendedTrieNode(phrase_location=node.phrase_location,             # <<<<<<<<<<<<<<
@@ -52445,7 +52445,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         }
         __pyx_L38:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1119
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1119
  * 
  *                     # sample from range
  *                     if not is_shadow_path:             # <<<<<<<<<<<<<<
@@ -52456,7 +52456,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         __pyx_t_9 = ((!__pyx_t_13) != 0);
         if (__pyx_t_9) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1120
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1120
  *                     # sample from range
  *                     if not is_shadow_path:
  *                         sample = self.sampler.sample(node.phrase_location)             # <<<<<<<<<<<<<<
@@ -52482,7 +52482,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_GIVEREF(__pyx_t_10);
           __pyx_t_10 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1121
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1121
  *                     if not is_shadow_path:
  *                         sample = self.sampler.sample(node.phrase_location)
  *                         num_subpatterns = (<PhraseLocation> node.phrase_location).num_subpatterns             # <<<<<<<<<<<<<<
@@ -52495,7 +52495,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
           __pyx_cur_scope->__pyx_v_num_subpatterns = __pyx_t_21;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1122
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1122
  *                         sample = self.sampler.sample(node.phrase_location)
  *                         num_subpatterns = (<PhraseLocation> node.phrase_location).num_subpatterns
  *                         chunklen = IntList(initial_len=num_subpatterns)             # <<<<<<<<<<<<<<
@@ -52516,7 +52516,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_GIVEREF(__pyx_t_18);
           __pyx_t_18 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1123
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1123
  *                         num_subpatterns = (<PhraseLocation> node.phrase_location).num_subpatterns
  *                         chunklen = IntList(initial_len=num_subpatterns)
  *                         for j from 0 <= j < num_subpatterns:             # <<<<<<<<<<<<<<
@@ -52526,7 +52526,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __pyx_t_21 = __pyx_cur_scope->__pyx_v_num_subpatterns;
           for (__pyx_cur_scope->__pyx_v_j = 0; __pyx_cur_scope->__pyx_v_j < __pyx_t_21; __pyx_cur_scope->__pyx_v_j++) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1124
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1124
  *                         chunklen = IntList(initial_len=num_subpatterns)
  *                         for j from 0 <= j < num_subpatterns:
  *                             chunklen.arr[j] = hiero_phrase.chunklen(j)             # <<<<<<<<<<<<<<
@@ -52536,7 +52536,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             (__pyx_cur_scope->__pyx_v_chunklen->arr[__pyx_cur_scope->__pyx_v_j]) = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Phrase *)__pyx_cur_scope->__pyx_v_hiero_phrase->__pyx_vtab)->chunklen(__pyx_cur_scope->__pyx_v_hiero_phrase, __pyx_cur_scope->__pyx_v_j);
           }
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1125
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1125
  *                         for j from 0 <= j < num_subpatterns:
  *                             chunklen.arr[j] = hiero_phrase.chunklen(j)
  *                         extracts = []             # <<<<<<<<<<<<<<
@@ -52550,7 +52550,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_GIVEREF(__pyx_t_18);
           __pyx_t_18 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1126
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1126
  *                             chunklen.arr[j] = hiero_phrase.chunklen(j)
  *                         extracts = []
  *                         j = 0             # <<<<<<<<<<<<<<
@@ -52559,7 +52559,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
  */
           __pyx_cur_scope->__pyx_v_j = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1127
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1127
  *                         extracts = []
  *                         j = 0
  *                         extract_start = monitor_cpu()             # <<<<<<<<<<<<<<
@@ -52576,7 +52576,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_GIVEREF(__pyx_t_10);
           __pyx_t_10 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1128
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1128
  *                         j = 0
  *                         extract_start = monitor_cpu()
  *                         while j < sample.len:             # <<<<<<<<<<<<<<
@@ -52587,7 +52587,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __pyx_t_9 = ((__pyx_cur_scope->__pyx_v_j < __pyx_cur_scope->__pyx_v_sample->len) != 0);
             if (!__pyx_t_9) break;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1129
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1129
  *                         extract_start = monitor_cpu()
  *                         while j < sample.len:
  *                             extract = []             # <<<<<<<<<<<<<<
@@ -52601,7 +52601,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __Pyx_GIVEREF(__pyx_t_10);
             __pyx_t_10 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1131
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1131
  *                             extract = []
  * 
  *                             assign_matching(&matching, sample.arr, j, num_subpatterns, self.fda.sent_id.arr)             # <<<<<<<<<<<<<<
@@ -52610,7 +52610,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
  */
             __pyx_f_4cdec_2sa_3_sa_assign_matching((&__pyx_cur_scope->__pyx_v_matching), __pyx_cur_scope->__pyx_v_sample->arr, __pyx_cur_scope->__pyx_v_j, __pyx_cur_scope->__pyx_v_num_subpatterns, __pyx_cur_scope->__pyx_v_self->fda->sent_id->arr);
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1132
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1132
  * 
  *                             assign_matching(&matching, sample.arr, j, num_subpatterns, self.fda.sent_id.arr)
  *                             loc = tuple(sample[j:j+num_subpatterns])             # <<<<<<<<<<<<<<
@@ -52632,7 +52632,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __Pyx_GIVEREF(__pyx_t_10);
             __pyx_t_10 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1133
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1133
  *                             assign_matching(&matching, sample.arr, j, num_subpatterns, self.fda.sent_id.arr)
  *                             loc = tuple(sample[j:j+num_subpatterns])
  *                             extract = self.extract(hiero_phrase, &matching, chunklen.arr, num_subpatterns)             # <<<<<<<<<<<<<<
@@ -52646,7 +52646,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __Pyx_GIVEREF(__pyx_t_10);
             __pyx_t_10 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1134
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1134
  *                             loc = tuple(sample[j:j+num_subpatterns])
  *                             extract = self.extract(hiero_phrase, &matching, chunklen.arr, num_subpatterns)
  *                             extracts.extend([(e, loc) for e in extract])             # <<<<<<<<<<<<<<
@@ -52709,7 +52709,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __pyx_t_12 = __Pyx_PyList_Extend(__pyx_cur_scope->__pyx_v_extracts, __pyx_t_10); if (unlikely(__pyx_t_12 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
             __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1135
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1135
  *                             extract = self.extract(hiero_phrase, &matching, chunklen.arr, num_subpatterns)
  *                             extracts.extend([(e, loc) for e in extract])
  *                             j = j + num_subpatterns             # <<<<<<<<<<<<<<
@@ -52719,7 +52719,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __pyx_cur_scope->__pyx_v_j = (__pyx_cur_scope->__pyx_v_j + __pyx_cur_scope->__pyx_v_num_subpatterns);
           }
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1137
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1137
  *                             j = j + num_subpatterns
  * 
  *                         num_samples = sample.len/num_subpatterns             # <<<<<<<<<<<<<<
@@ -52748,7 +52748,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           }
           __pyx_cur_scope->__pyx_v_num_samples = __Pyx_div_int(__pyx_cur_scope->__pyx_v_sample->len, __pyx_cur_scope->__pyx_v_num_subpatterns);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1138
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1138
  * 
  *                         num_samples = sample.len/num_subpatterns
  *                         extract_stop = monitor_cpu()             # <<<<<<<<<<<<<<
@@ -52765,7 +52765,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_GIVEREF(__pyx_t_18);
           __pyx_t_18 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1139
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1139
  *                         num_samples = sample.len/num_subpatterns
  *                         extract_stop = monitor_cpu()
  *                         self.extract_time = self.extract_time + extract_stop - extract_start             # <<<<<<<<<<<<<<
@@ -52784,7 +52784,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_DECREF(__pyx_t_18); __pyx_t_18 = 0;
           __pyx_cur_scope->__pyx_v_self->extract_time = __pyx_t_4;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1140
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1140
  *                         extract_stop = monitor_cpu()
  *                         self.extract_time = self.extract_time + extract_stop - extract_start
  *                         if len(extracts) > 0:             # <<<<<<<<<<<<<<
@@ -52795,7 +52795,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __pyx_t_9 = ((__pyx_t_6 > 0) != 0);
           if (__pyx_t_9) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1141
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1141
  *                         self.extract_time = self.extract_time + extract_stop - extract_start
  *                         if len(extracts) > 0:
  *                             fcount = Counter()             # <<<<<<<<<<<<<<
@@ -52812,7 +52812,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __Pyx_GIVEREF(__pyx_t_10);
             __pyx_t_10 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1142
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1142
  *                         if len(extracts) > 0:
  *                             fcount = Counter()
  *                             fphrases = defaultdict(lambda: defaultdict(lambda: defaultdict(list)))             # <<<<<<<<<<<<<<
@@ -52837,7 +52837,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __Pyx_GIVEREF(__pyx_t_18);
             __pyx_t_18 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1143
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1143
  *                             fcount = Counter()
  *                             fphrases = defaultdict(lambda: defaultdict(lambda: defaultdict(list)))
  *                             for (f, e, count, als), loc in extracts:             # <<<<<<<<<<<<<<
@@ -52986,7 +52986,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
               __Pyx_GIVEREF(__pyx_t_17);
               __pyx_t_17 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1144
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1144
  *                             fphrases = defaultdict(lambda: defaultdict(lambda: defaultdict(list)))
  *                             for (f, e, count, als), loc in extracts:
  *                                 fcount[f] += count             # <<<<<<<<<<<<<<
@@ -53004,7 +53004,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
               __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0;
               __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1145
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1145
  *                             for (f, e, count, als), loc in extracts:
  *                                 fcount[f] += count
  *                                 fphrases[f][e][als].append(loc)             # <<<<<<<<<<<<<<
@@ -53024,7 +53024,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             }
             __Pyx_DECREF(__pyx_t_18); __pyx_t_18 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1146
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1146
  *                                 fcount[f] += count
  *                                 fphrases[f][e][als].append(loc)
  *                             for f, elist in fphrases.iteritems():             # <<<<<<<<<<<<<<
@@ -53056,7 +53056,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
               __Pyx_GIVEREF(__pyx_t_10);
               __pyx_t_10 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1147
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1147
  *                                 fphrases[f][e][als].append(loc)
  *                             for f, elist in fphrases.iteritems():
  *                                 for e, alslist in elist.iteritems():             # <<<<<<<<<<<<<<
@@ -53088,7 +53088,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
                 __Pyx_GIVEREF(__pyx_t_17);
                 __pyx_t_17 = 0;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1148
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1148
  *                             for f, elist in fphrases.iteritems():
  *                                 for e, alslist in elist.iteritems():
  *                                     alignment, max_locs = max(alslist.iteritems(), key=lambda x: len(x[1]))             # <<<<<<<<<<<<<<
@@ -53174,7 +53174,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
                 __Pyx_GIVEREF(__pyx_t_17);
                 __pyx_t_17 = 0;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1149
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1149
  *                                 for e, alslist in elist.iteritems():
  *                                     alignment, max_locs = max(alslist.iteritems(), key=lambda x: len(x[1]))
  *                                     locs = tuple(itertools.chain.from_iterable(alslist.itervalues()))             # <<<<<<<<<<<<<<
@@ -53216,7 +53216,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
                 __Pyx_GIVEREF(__pyx_t_11);
                 __pyx_t_11 = 0;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1150
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1150
  *                                     alignment, max_locs = max(alslist.iteritems(), key=lambda x: len(x[1]))
  *                                     locs = tuple(itertools.chain.from_iterable(alslist.itervalues()))
  *                                     count = len(locs)             # <<<<<<<<<<<<<<
@@ -53231,7 +53231,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
                 __Pyx_GIVEREF(__pyx_t_11);
                 __pyx_t_11 = 0;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1151
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1151
  *                                     locs = tuple(itertools.chain.from_iterable(alslist.itervalues()))
  *                                     count = len(locs)
  *                                     scores = self.scorer.score(FeatureContext(             # <<<<<<<<<<<<<<
@@ -53241,7 +53241,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
                 __pyx_t_11 = __Pyx_GetModuleGlobalName(__pyx_n_s_FeatureContext); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1151; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
                 __Pyx_GOTREF(__pyx_t_11);
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1152
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1152
  *                                     count = len(locs)
  *                                     scores = self.scorer.score(FeatureContext(
  *                                                f, e, count, fcount[f], num_samples,             # <<<<<<<<<<<<<<
@@ -53253,7 +53253,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
                 __pyx_t_15 = __Pyx_PyInt_From_int(__pyx_cur_scope->__pyx_v_num_samples); if (unlikely(!__pyx_t_15)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
                 __Pyx_GOTREF(__pyx_t_15);
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1153
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1153
  *                                     scores = self.scorer.score(FeatureContext(
  *                                                f, e, count, fcount[f], num_samples,
  *                                                (k,i+spanlen), locs, input_match,             # <<<<<<<<<<<<<<
@@ -53276,7 +53276,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
                 __pyx_t_3 = 0;
                 __pyx_t_16 = 0;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1157
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1157
  *                                                meta,
  *                                                # Include online stats.  None if none.
  *                                                self.online_ctx_lookup(f, e, ctx_name)))             # <<<<<<<<<<<<<<
@@ -53301,7 +53301,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
                 __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0;
                 __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1151
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1151
  *                                     locs = tuple(itertools.chain.from_iterable(alslist.itervalues()))
  *                                     count = len(locs)
  *                                     scores = self.scorer.score(FeatureContext(             # <<<<<<<<<<<<<<
@@ -53361,7 +53361,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
                 __Pyx_GIVEREF(__pyx_t_3);
                 __pyx_t_3 = 0;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1159
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1159
  *                                                self.online_ctx_lookup(f, e, ctx_name)))
  *                                     # Phrase pair processed
  *                                     if self.online:             # <<<<<<<<<<<<<<
@@ -53371,7 +53371,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
                 __pyx_t_9 = (__pyx_cur_scope->__pyx_v_self->online != 0);
                 if (__pyx_t_9) {
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1160
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1160
  *                                     # Phrase pair processed
  *                                     if self.online:
  *                                         seen_phrases.add((f, e))             # <<<<<<<<<<<<<<
@@ -53392,7 +53392,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
                 }
                 __pyx_L60:;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1161
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1161
  *                                     if self.online:
  *                                         seen_phrases.add((f, e))
  *                                     yield Rule(self.category, f, e, scores, alignment)             # <<<<<<<<<<<<<<
@@ -53473,7 +53473,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       }
       __pyx_L32:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1163
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1163
  *                                     yield Rule(self.category, f, e, scores, alignment)
  * 
  *                 if len(phrase) < self.max_length and i+spanlen < len(fwords) and pathlen+1 <= self.max_initial_size:             # <<<<<<<<<<<<<<
@@ -53519,7 +53519,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       }
       if (__pyx_t_13) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1164
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1164
  * 
  *                 if len(phrase) < self.max_length and i+spanlen < len(fwords) and pathlen+1 <= self.max_initial_size:
  *                     for alt_id in range(len(fwords[i+spanlen])):             # <<<<<<<<<<<<<<
@@ -53539,7 +53539,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         for (__pyx_t_21 = 0; __pyx_t_21 < __pyx_t_23; __pyx_t_21+=1) {
           __pyx_cur_scope->__pyx_v_alt_id = __pyx_t_21;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1165
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1165
  *                 if len(phrase) < self.max_length and i+spanlen < len(fwords) and pathlen+1 <= self.max_initial_size:
  *                     for alt_id in range(len(fwords[i+spanlen])):
  *                         new_frontier.append((k, i+spanlen, input_match, alt_id, pathlen + 1, node, phrase, is_shadow_path))             # <<<<<<<<<<<<<<
@@ -53587,7 +53587,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
         }
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1166
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1166
  *                     for alt_id in range(len(fwords[i+spanlen])):
  *                         new_frontier.append((k, i+spanlen, input_match, alt_id, pathlen + 1, node, phrase, is_shadow_path))
  *                     num_subpatterns = arity             # <<<<<<<<<<<<<<
@@ -53596,7 +53596,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
  */
         __pyx_cur_scope->__pyx_v_num_subpatterns = __pyx_cur_scope->__pyx_v_arity;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1167
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1167
  *                         new_frontier.append((k, i+spanlen, input_match, alt_id, pathlen + 1, node, phrase, is_shadow_path))
  *                     num_subpatterns = arity
  *                     if not is_shadow_path:             # <<<<<<<<<<<<<<
@@ -53607,7 +53607,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         __pyx_t_9 = ((!__pyx_t_13) != 0);
         if (__pyx_t_9) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1168
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1168
  *                     num_subpatterns = arity
  *                     if not is_shadow_path:
  *                         num_subpatterns = num_subpatterns + 1             # <<<<<<<<<<<<<<
@@ -53619,7 +53619,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         }
         __pyx_L65:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1169
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1169
  *                     if not is_shadow_path:
  *                         num_subpatterns = num_subpatterns + 1
  *                     if len(phrase)+1 < self.max_length and arity < self.max_nonterminals and num_subpatterns < self.max_chunks:             # <<<<<<<<<<<<<<
@@ -53642,7 +53642,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         }
         if (__pyx_t_13) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1170
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1170
  *                         num_subpatterns = num_subpatterns + 1
  *                     if len(phrase)+1 < self.max_length and arity < self.max_nonterminals and num_subpatterns < self.max_chunks:
  *                         xcat = sym_setindex(self.category, arity+1)             # <<<<<<<<<<<<<<
@@ -53651,7 +53651,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
  */
           __pyx_cur_scope->__pyx_v_xcat = __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_cur_scope->__pyx_v_self->category, (__pyx_cur_scope->__pyx_v_arity + 1));
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1171
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1171
  *                     if len(phrase)+1 < self.max_length and arity < self.max_nonterminals and num_subpatterns < self.max_chunks:
  *                         xcat = sym_setindex(self.category, arity+1)
  *                         xnode = node.children[xcat]             # <<<<<<<<<<<<<<
@@ -53668,7 +53668,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_GIVEREF(__pyx_t_14);
           __pyx_t_14 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1173
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1173
  *                         xnode = node.children[xcat]
  *                         # I put spanlen=1 below
  *                         key = tuple([self.min_gap_size, i, 1, pathlen])             # <<<<<<<<<<<<<<
@@ -53701,7 +53701,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_GIVEREF(__pyx_t_11);
           __pyx_t_11 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1174
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1174
  *                         # I put spanlen=1 below
  *                         key = tuple([self.min_gap_size, i, 1, pathlen])
  *                         frontier_nodes = []             # <<<<<<<<<<<<<<
@@ -53715,7 +53715,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_GIVEREF(__pyx_t_11);
           __pyx_t_11 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1175
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1175
  *                         key = tuple([self.min_gap_size, i, 1, pathlen])
  *                         frontier_nodes = []
  *                         if key in nodes_isteps_away_buffer:             # <<<<<<<<<<<<<<
@@ -53726,7 +53726,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __pyx_t_9 = (__pyx_t_13 != 0);
           if (__pyx_t_9) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1176
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1176
  *                         frontier_nodes = []
  *                         if key in nodes_isteps_away_buffer:
  *                             frontier_nodes = nodes_isteps_away_buffer[key]             # <<<<<<<<<<<<<<
@@ -53743,7 +53743,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           }
           /*else*/ {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1178
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1178
  *                             frontier_nodes = nodes_isteps_away_buffer[key]
  *                         else:
  *                             frontier_nodes = self.get_all_nodes_isteps_away(self.min_gap_size, i, 1, pathlen, fwords, next_states, reachable_buffer)             # <<<<<<<<<<<<<<
@@ -53788,7 +53788,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __Pyx_GIVEREF(__pyx_t_14);
             __pyx_t_14 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1179
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1179
  *                         else:
  *                             frontier_nodes = self.get_all_nodes_isteps_away(self.min_gap_size, i, 1, pathlen, fwords, next_states, reachable_buffer)
  *                             nodes_isteps_away_buffer[key] = frontier_nodes             # <<<<<<<<<<<<<<
@@ -53799,7 +53799,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           }
           __pyx_L67:;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1181
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1181
  *                             nodes_isteps_away_buffer[key] = frontier_nodes
  * 
  *                         for i, alt, pathlen in frontier_nodes:             # <<<<<<<<<<<<<<
@@ -53909,7 +53909,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
             __Pyx_GIVEREF(__pyx_t_10);
             __pyx_t_10 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1182
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1182
  * 
  *                         for i, alt, pathlen in frontier_nodes:
  *                             new_frontier.append((k, i, input_match + (i,), alt, pathlen, xnode, phrase +(xcat,), is_shadow_path))             # <<<<<<<<<<<<<<
@@ -53982,7 +53982,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
     }
     __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1183
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1183
  *                         for i, alt, pathlen in frontier_nodes:
  *                             new_frontier.append((k, i, input_match + (i,), alt, pathlen, xnode, phrase +(xcat,), is_shadow_path))
  *             frontier = new_frontier             # <<<<<<<<<<<<<<
@@ -53995,7 +53995,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
     __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_new_frontier);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1186
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1186
  * 
  *         # Online rule extraction and scoring
  *         if self.online:             # <<<<<<<<<<<<<<
@@ -54005,7 +54005,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __pyx_t_9 = (__pyx_cur_scope->__pyx_v_self->online != 0);
   if (__pyx_t_9) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1187
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1187
  *         # Online rule extraction and scoring
  *         if self.online:
  *             stats = self.online_stats[ctx_name]             # <<<<<<<<<<<<<<
@@ -54018,7 +54018,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
     __pyx_cur_scope->__pyx_v_stats = __pyx_t_8;
     __pyx_t_8 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1188
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1188
  *         if self.online:
  *             stats = self.online_stats[ctx_name]
  *             f_syms = tuple(word[0][0] for word in fwords)             # <<<<<<<<<<<<<<
@@ -54039,7 +54039,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
     __pyx_cur_scope->__pyx_v_f_syms = ((PyObject*)__pyx_t_8);
     __pyx_t_8 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1189
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1189
  *             stats = self.online_stats[ctx_name]
  *             f_syms = tuple(word[0][0] for word in fwords)
  *             for f, lex_i, lex_j in self.get_f_phrases(f_syms):             # <<<<<<<<<<<<<<
@@ -54163,7 +54163,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __Pyx_GIVEREF(__pyx_t_11);
       __pyx_t_11 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1190
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1190
  *             f_syms = tuple(word[0][0] for word in fwords)
  *             for f, lex_i, lex_j in self.get_f_phrases(f_syms):
  *                 spanlen = (lex_j - lex_i) + 1             # <<<<<<<<<<<<<<
@@ -54180,7 +54180,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __Pyx_GIVEREF(__pyx_t_11);
       __pyx_t_11 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1191
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1191
  *             for f, lex_i, lex_j in self.get_f_phrases(f_syms):
  *                 spanlen = (lex_j - lex_i) + 1
  *                 if not sym_isvar(f[0]):             # <<<<<<<<<<<<<<
@@ -54194,7 +54194,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __pyx_t_9 = ((!(__pyx_f_4cdec_2sa_3_sa_sym_isvar(__pyx_t_7) != 0)) != 0);
       if (__pyx_t_9) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1192
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1192
  *                 spanlen = (lex_j - lex_i) + 1
  *                 if not sym_isvar(f[0]):
  *                     spanlen += 1             # <<<<<<<<<<<<<<
@@ -54211,7 +54211,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       }
       __pyx_L77:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1193
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1193
  *                 if not sym_isvar(f[0]):
  *                     spanlen += 1
  *                 if not sym_isvar(f[1]):             # <<<<<<<<<<<<<<
@@ -54225,7 +54225,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       __pyx_t_9 = ((!(__pyx_f_4cdec_2sa_3_sa_sym_isvar(__pyx_t_7) != 0)) != 0);
       if (__pyx_t_9) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1194
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1194
  *                     spanlen += 1
  *                 if not sym_isvar(f[1]):
  *                     spanlen += 1             # <<<<<<<<<<<<<<
@@ -54242,7 +54242,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
       }
       __pyx_L78:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1195
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1195
  *                 if not sym_isvar(f[1]):
  *                     spanlen += 1
  *                 for e in stats.phrases_fe.get(f, ()):             # <<<<<<<<<<<<<<
@@ -54307,7 +54307,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         __Pyx_GIVEREF(__pyx_t_1);
         __pyx_t_1 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1196
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1196
  *                     spanlen += 1
  *                 for e in stats.phrases_fe.get(f, ()):
  *                     if (f, e) not in seen_phrases:             # <<<<<<<<<<<<<<
@@ -54327,7 +54327,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
         __pyx_t_13 = (__pyx_t_9 != 0);
         if (__pyx_t_13) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1198
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1198
  *                     if (f, e) not in seen_phrases:
  *                         # Don't add multiple instances of the same phrase here
  *                         seen_phrases.add((f, e))             # <<<<<<<<<<<<<<
@@ -54345,7 +54345,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __pyx_t_12 = PySet_Add(__pyx_cur_scope->__pyx_v_seen_phrases, __pyx_t_1); if (unlikely(__pyx_t_12 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1198; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1199
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1199
  *                         # Don't add multiple instances of the same phrase here
  *                         seen_phrases.add((f, e))
  *                         scores = self.scorer.score(FeatureContext(             # <<<<<<<<<<<<<<
@@ -54355,7 +54355,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_FeatureContext); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1199; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           __Pyx_GOTREF(__pyx_t_1);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1204
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1204
  *                                 fwords, self.fda, self.eda,
  *                                 meta,
  *                                 self.online_ctx_lookup(f, e, ctx_name)))             # <<<<<<<<<<<<<<
@@ -54380,7 +54380,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;
           __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1199
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1199
  *                         # Don't add multiple instances of the same phrase here
  *                         seen_phrases.add((f, e))
  *                         scores = self.scorer.score(FeatureContext(             # <<<<<<<<<<<<<<
@@ -54440,7 +54440,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_GIVEREF(__pyx_t_8);
           __pyx_t_8 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1205
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1205
  *                                 meta,
  *                                 self.online_ctx_lookup(f, e, ctx_name)))
  *                         alignment = stats.phrases_al[f][e]             # <<<<<<<<<<<<<<
@@ -54460,7 +54460,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
           __Pyx_GIVEREF(__pyx_t_8);
           __pyx_t_8 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1206
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1206
  *                                 self.online_ctx_lookup(f, e, ctx_name)))
  *                         alignment = stats.phrases_al[f][e]
  *                         yield Rule(self.category, f, e, scores, alignment)             # <<<<<<<<<<<<<<
@@ -54527,7 +54527,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   }
   __pyx_L72:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1208
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1208
  *                         yield Rule(self.category, f, e, scores, alignment)
  * 
  *         stop_time = monitor_cpu()             # <<<<<<<<<<<<<<
@@ -54543,7 +54543,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __pyx_cur_scope->__pyx_v_stop_time = __pyx_t_11;
   __pyx_t_11 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1209
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1209
  * 
  *         stop_time = monitor_cpu()
  *         logger.info("Total time for rule lookup, extraction, and scoring = %f seconds", (stop_time - start_time))             # <<<<<<<<<<<<<<
@@ -54574,7 +54574,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
   __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1210
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1210
  *         stop_time = monitor_cpu()
  *         logger.info("Total time for rule lookup, extraction, and scoring = %f seconds", (stop_time - start_time))
  *         gc.collect()             # <<<<<<<<<<<<<<
@@ -54591,7 +54591,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
   __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1211
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1211
  *         logger.info("Total time for rule lookup, extraction, and scoring = %f seconds", (stop_time - start_time))
  *         gc.collect()
  *         logger.info("    Extract time = %f seconds", self.extract_time)             # <<<<<<<<<<<<<<
@@ -54619,7 +54619,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
   __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1212
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1212
  *         gc.collect()
  *         logger.info("    Extract time = %f seconds", self.extract_time)
  *         logger.info("    Intersect time = %f seconds", self.intersect_time)             # <<<<<<<<<<<<<<
@@ -54647,7 +54647,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
   __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":973
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":973
  *         return sorted(result);
  * 
  *     def input(self, fwords, meta, ctx_name=None):             # <<<<<<<<<<<<<<
@@ -54679,7 +54679,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_24generator4(
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1215
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1215
  * 
  * 
  *     cdef int find_fixpoint(self,             # <<<<<<<<<<<<<<
@@ -54709,7 +54709,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("find_fixpoint", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1230
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1230
  *         cdef int e_low_prev, e_high_prev, f_low_prev, f_high_prev, new_x, new_low_x, new_high_x
  * 
  *         e_low[0] = e_in_low             # <<<<<<<<<<<<<<
@@ -54718,7 +54718,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
   (__pyx_v_e_low[0]) = __pyx_v_e_in_low;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1231
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1231
  * 
  *         e_low[0] = e_in_low
  *         e_high[0] = e_in_high             # <<<<<<<<<<<<<<
@@ -54727,7 +54727,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
   (__pyx_v_e_high[0]) = __pyx_v_e_in_high;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1232
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1232
  *         e_low[0] = e_in_low
  *         e_high[0] = e_in_high
  *         self.find_projection(f_low, f_high, f_links_low, f_links_high, e_low, e_high)             # <<<<<<<<<<<<<<
@@ -54739,7 +54739,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1233
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1233
  *         e_high[0] = e_in_high
  *         self.find_projection(f_low, f_high, f_links_low, f_links_high, e_low, e_high)
  *         if e_low[0] == -1:             # <<<<<<<<<<<<<<
@@ -54749,7 +54749,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
   __pyx_t_3 = (((__pyx_v_e_low[0]) == -1) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1239
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1239
  *             # rule X -> X_1 w X_2 / X_1 X_2.    This is probably
  *             # not worth the bother, though.
  *             return 0             # <<<<<<<<<<<<<<
@@ -54760,7 +54760,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1240
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1240
  *             # not worth the bother, though.
  *             return 0
  *         elif e_in_low != -1 and e_low[0] != e_in_low:             # <<<<<<<<<<<<<<
@@ -54776,7 +54776,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
   }
   if (__pyx_t_5) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1241
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1241
  *             return 0
  *         elif e_in_low != -1 and e_low[0] != e_in_low:
  *             if e_in_low - e_low[0] < min_ex_size:             # <<<<<<<<<<<<<<
@@ -54786,7 +54786,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     __pyx_t_5 = (((__pyx_v_e_in_low - (__pyx_v_e_low[0])) < __pyx_v_min_ex_size) != 0);
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1242
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1242
  *         elif e_in_low != -1 and e_low[0] != e_in_low:
  *             if e_in_low - e_low[0] < min_ex_size:
  *                 e_low[0] = e_in_low - min_ex_size             # <<<<<<<<<<<<<<
@@ -54795,7 +54795,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
       (__pyx_v_e_low[0]) = (__pyx_v_e_in_low - __pyx_v_min_ex_size);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1243
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1243
  *             if e_in_low - e_low[0] < min_ex_size:
  *                 e_low[0] = e_in_low - min_ex_size
  *                 if e_low[0] < 0:             # <<<<<<<<<<<<<<
@@ -54805,7 +54805,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       __pyx_t_5 = (((__pyx_v_e_low[0]) < 0) != 0);
       if (__pyx_t_5) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1244
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1244
  *                 e_low[0] = e_in_low - min_ex_size
  *                 if e_low[0] < 0:
  *                     return 0             # <<<<<<<<<<<<<<
@@ -54822,7 +54822,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1246
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1246
  *                     return 0
  * 
  *         if e_high[0] - e_low[0] > max_e_len:             # <<<<<<<<<<<<<<
@@ -54832,7 +54832,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
   __pyx_t_5 = ((((__pyx_v_e_high[0]) - (__pyx_v_e_low[0])) > __pyx_v_max_e_len) != 0);
   if (__pyx_t_5) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1247
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1247
  * 
  *         if e_high[0] - e_low[0] > max_e_len:
  *             return 0             # <<<<<<<<<<<<<<
@@ -54843,7 +54843,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1248
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1248
  *         if e_high[0] - e_low[0] > max_e_len:
  *             return 0
  *         elif e_in_high != -1 and e_high[0] != e_in_high:             # <<<<<<<<<<<<<<
@@ -54859,7 +54859,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
   }
   if (__pyx_t_4) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1249
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1249
  *             return 0
  *         elif e_in_high != -1 and e_high[0] != e_in_high:
  *             if e_high[0] - e_in_high < min_ex_size:             # <<<<<<<<<<<<<<
@@ -54869,7 +54869,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     __pyx_t_4 = ((((__pyx_v_e_high[0]) - __pyx_v_e_in_high) < __pyx_v_min_ex_size) != 0);
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1250
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1250
  *         elif e_in_high != -1 and e_high[0] != e_in_high:
  *             if e_high[0] - e_in_high < min_ex_size:
  *                 e_high[0] = e_in_high + min_ex_size             # <<<<<<<<<<<<<<
@@ -54878,7 +54878,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
       (__pyx_v_e_high[0]) = (__pyx_v_e_in_high + __pyx_v_min_ex_size);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1251
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1251
  *             if e_high[0] - e_in_high < min_ex_size:
  *                 e_high[0] = e_in_high + min_ex_size
  *                 if e_high[0] > e_sent_len:             # <<<<<<<<<<<<<<
@@ -54888,7 +54888,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       __pyx_t_4 = (((__pyx_v_e_high[0]) > __pyx_v_e_sent_len) != 0);
       if (__pyx_t_4) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1252
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1252
  *                 e_high[0] = e_in_high + min_ex_size
  *                 if e_high[0] > e_sent_len:
  *                     return 0             # <<<<<<<<<<<<<<
@@ -54905,7 +54905,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
   }
   __pyx_L6:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1254
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1254
  *                     return 0
  * 
  *         f_back_low[0] = -1             # <<<<<<<<<<<<<<
@@ -54914,7 +54914,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
   (__pyx_v_f_back_low[0]) = -1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1255
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1255
  * 
  *         f_back_low[0] = -1
  *         f_back_high[0] = -1             # <<<<<<<<<<<<<<
@@ -54923,7 +54923,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
   (__pyx_v_f_back_high[0]) = -1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1256
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1256
  *         f_back_low[0] = -1
  *         f_back_high[0] = -1
  *         f_low_prev = f_low             # <<<<<<<<<<<<<<
@@ -54932,7 +54932,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
   __pyx_v_f_low_prev = __pyx_v_f_low;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1257
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1257
  *         f_back_high[0] = -1
  *         f_low_prev = f_low
  *         f_high_prev = f_high             # <<<<<<<<<<<<<<
@@ -54942,7 +54942,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
   __pyx_t_1 = __Pyx_PyInt_As_int(__pyx_v_f_high); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1257; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_f_high_prev = __pyx_t_1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1258
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1258
  *         f_low_prev = f_low
  *         f_high_prev = f_high
  *         new_x = 0             # <<<<<<<<<<<<<<
@@ -54951,7 +54951,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
   __pyx_v_new_x = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1259
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1259
  *         f_high_prev = f_high
  *         new_x = 0
  *         new_low_x = 0             # <<<<<<<<<<<<<<
@@ -54960,7 +54960,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
   __pyx_v_new_low_x = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1260
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1260
  *         new_x = 0
  *         new_low_x = 0
  *         new_high_x = 0             # <<<<<<<<<<<<<<
@@ -54969,7 +54969,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
   __pyx_v_new_high_x = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1262
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1262
  *         new_high_x = 0
  * 
  *         while True:             # <<<<<<<<<<<<<<
@@ -54978,7 +54978,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
   while (1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1264
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1264
  *         while True:
  * 
  *             if f_back_low[0] == -1:             # <<<<<<<<<<<<<<
@@ -54988,7 +54988,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     __pyx_t_4 = (((__pyx_v_f_back_low[0]) == -1) != 0);
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1265
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1265
  * 
  *             if f_back_low[0] == -1:
  *                 self.find_projection(e_low[0], e_high[0], e_links_low, e_links_high, f_back_low, f_back_high)             # <<<<<<<<<<<<<<
@@ -55002,7 +55002,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1267
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1267
  *                 self.find_projection(e_low[0], e_high[0], e_links_low, e_links_high, f_back_low, f_back_high)
  *             else:
  *                 self.find_projection(e_low[0], e_low_prev, e_links_low, e_links_high, f_back_low, f_back_high)             # <<<<<<<<<<<<<<
@@ -55013,7 +55013,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1268
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1268
  *             else:
  *                 self.find_projection(e_low[0], e_low_prev, e_links_low, e_links_high, f_back_low, f_back_high)
  *                 self.find_projection(e_high_prev, e_high[0], e_links_low, e_links_high, f_back_low, f_back_high)             # <<<<<<<<<<<<<<
@@ -55026,7 +55026,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     }
     __pyx_L11:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1270
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1270
  *                 self.find_projection(e_high_prev, e_high[0], e_links_low, e_links_high, f_back_low, f_back_high)
  * 
  *             if f_back_low[0] > f_low:             # <<<<<<<<<<<<<<
@@ -55036,7 +55036,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     __pyx_t_4 = (((__pyx_v_f_back_low[0]) > __pyx_v_f_low) != 0);
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1271
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1271
  * 
  *             if f_back_low[0] > f_low:
  *                 f_back_low[0] = f_low             # <<<<<<<<<<<<<<
@@ -55048,7 +55048,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     }
     __pyx_L12:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1273
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1273
  *                 f_back_low[0] = f_low
  * 
  *             if f_back_high[0] < f_high:             # <<<<<<<<<<<<<<
@@ -55063,7 +55063,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1274
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1274
  * 
  *             if f_back_high[0] < f_high:
  *                 f_back_high[0] = f_high             # <<<<<<<<<<<<<<
@@ -55076,7 +55076,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     }
     __pyx_L13:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1276
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1276
  *                 f_back_high[0] = f_high
  * 
  *             if f_back_low[0] == f_low_prev and f_back_high[0] == f_high_prev:             # <<<<<<<<<<<<<<
@@ -55092,7 +55092,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     }
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1277
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1277
  * 
  *             if f_back_low[0] == f_low_prev and f_back_high[0] == f_high_prev:
  *                 return 1             # <<<<<<<<<<<<<<
@@ -55103,7 +55103,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1279
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1279
  *                 return 1
  * 
  *             if allow_low_x == 0 and f_back_low[0] < f_low:             # <<<<<<<<<<<<<<
@@ -55119,7 +55119,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     }
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1281
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1281
  *             if allow_low_x == 0 and f_back_low[0] < f_low:
  *                 # FAIL: f phrase is not tight
  *                 return 0             # <<<<<<<<<<<<<<
@@ -55130,7 +55130,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1283
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1283
  *                 return 0
  * 
  *             if f_back_high[0] - f_back_low[0] > max_f_len:             # <<<<<<<<<<<<<<
@@ -55140,7 +55140,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     __pyx_t_5 = ((((__pyx_v_f_back_high[0]) - (__pyx_v_f_back_low[0])) > __pyx_v_max_f_len) != 0);
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1285
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1285
  *             if f_back_high[0] - f_back_low[0] > max_f_len:
  *                 # FAIL: f back projection is too wide
  *                 return 0             # <<<<<<<<<<<<<<
@@ -55151,7 +55151,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1287
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1287
  *                 return 0
  * 
  *             if allow_high_x == 0 and f_back_high[0] > f_high:             # <<<<<<<<<<<<<<
@@ -55172,7 +55172,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     }
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1289
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1289
  *             if allow_high_x == 0 and f_back_high[0] > f_high:
  *                 # FAIL: extension on high side not allowed
  *                 return 0             # <<<<<<<<<<<<<<
@@ -55183,7 +55183,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1291
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1291
  *                 return 0
  * 
  *             if f_low != f_back_low[0]:             # <<<<<<<<<<<<<<
@@ -55193,7 +55193,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     __pyx_t_4 = ((__pyx_v_f_low != (__pyx_v_f_back_low[0])) != 0);
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1292
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1292
  * 
  *             if f_low != f_back_low[0]:
  *                 if new_low_x == 0:             # <<<<<<<<<<<<<<
@@ -55203,7 +55203,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       __pyx_t_4 = ((__pyx_v_new_low_x == 0) != 0);
       if (__pyx_t_4) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1293
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1293
  *             if f_low != f_back_low[0]:
  *                 if new_low_x == 0:
  *                     if new_x >= max_new_x:             # <<<<<<<<<<<<<<
@@ -55213,7 +55213,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
         __pyx_t_4 = ((__pyx_v_new_x >= __pyx_v_max_new_x) != 0);
         if (__pyx_t_4) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1295
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1295
  *                     if new_x >= max_new_x:
  *                         # FAIL: extension required on low side violates max # of gaps
  *                         return 0             # <<<<<<<<<<<<<<
@@ -55225,7 +55225,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
         }
         /*else*/ {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1297
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1297
  *                         return 0
  *                     else:
  *                         new_x = new_x + 1             # <<<<<<<<<<<<<<
@@ -55234,7 +55234,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
           __pyx_v_new_x = (__pyx_v_new_x + 1);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1298
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1298
  *                     else:
  *                         new_x = new_x + 1
  *                         new_low_x = 1             # <<<<<<<<<<<<<<
@@ -55247,7 +55247,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       }
       __pyx_L19:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1299
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1299
  *                         new_x = new_x + 1
  *                         new_low_x = 1
  *                 if f_low - f_back_low[0] < min_fx_size:             # <<<<<<<<<<<<<<
@@ -55257,7 +55257,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       __pyx_t_4 = (((__pyx_v_f_low - (__pyx_v_f_back_low[0])) < __pyx_v_min_fx_size) != 0);
       if (__pyx_t_4) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1300
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1300
  *                         new_low_x = 1
  *                 if f_low - f_back_low[0] < min_fx_size:
  *                     f_back_low[0] = f_low - min_fx_size             # <<<<<<<<<<<<<<
@@ -55266,7 +55266,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
         (__pyx_v_f_back_low[0]) = (__pyx_v_f_low - __pyx_v_min_fx_size);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1301
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1301
  *                 if f_low - f_back_low[0] < min_fx_size:
  *                     f_back_low[0] = f_low - min_fx_size
  *                     if f_back_high[0] - f_back_low[0] > max_f_len:             # <<<<<<<<<<<<<<
@@ -55276,7 +55276,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
         __pyx_t_4 = ((((__pyx_v_f_back_high[0]) - (__pyx_v_f_back_low[0])) > __pyx_v_max_f_len) != 0);
         if (__pyx_t_4) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1303
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1303
  *                     if f_back_high[0] - f_back_low[0] > max_f_len:
  *                         # FAIL: extension required on low side violates max initial length
  *                         return 0             # <<<<<<<<<<<<<<
@@ -55287,7 +55287,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
           goto __pyx_L0;
         }
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1304
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1304
  *                         # FAIL: extension required on low side violates max initial length
  *                         return 0
  *                     if f_back_low[0] < 0:             # <<<<<<<<<<<<<<
@@ -55297,7 +55297,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
         __pyx_t_4 = (((__pyx_v_f_back_low[0]) < 0) != 0);
         if (__pyx_t_4) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1306
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1306
  *                     if f_back_low[0] < 0:
  *                         # FAIL: extension required on low side violates sentence boundary
  *                         return 0             # <<<<<<<<<<<<<<
@@ -55314,7 +55314,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     }
     __pyx_L18:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1308
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1308
  *                         return 0
  * 
  *             if f_high != f_back_high[0]:             # <<<<<<<<<<<<<<
@@ -55329,7 +55329,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     if (__pyx_t_4) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1309
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1309
  * 
  *             if f_high != f_back_high[0]:
  *                 if new_high_x == 0:             # <<<<<<<<<<<<<<
@@ -55339,7 +55339,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       __pyx_t_4 = ((__pyx_v_new_high_x == 0) != 0);
       if (__pyx_t_4) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1310
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1310
  *             if f_high != f_back_high[0]:
  *                 if new_high_x == 0:
  *                     if new_x >= max_new_x:             # <<<<<<<<<<<<<<
@@ -55349,7 +55349,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
         __pyx_t_4 = ((__pyx_v_new_x >= __pyx_v_max_new_x) != 0);
         if (__pyx_t_4) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1312
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1312
  *                     if new_x >= max_new_x:
  *                         # FAIL: extension required on high side violates max # of gaps
  *                         return 0             # <<<<<<<<<<<<<<
@@ -55361,7 +55361,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
         }
         /*else*/ {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1314
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1314
  *                         return 0
  *                     else:
  *                         new_x = new_x + 1             # <<<<<<<<<<<<<<
@@ -55370,7 +55370,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
           __pyx_v_new_x = (__pyx_v_new_x + 1);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1315
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1315
  *                     else:
  *                         new_x = new_x + 1
  *                         new_high_x = 1             # <<<<<<<<<<<<<<
@@ -55383,7 +55383,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       }
       __pyx_L25:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1316
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1316
  *                         new_x = new_x + 1
  *                         new_high_x = 1
  *                 if f_back_high[0] - f_high < min_fx_size:             # <<<<<<<<<<<<<<
@@ -55404,7 +55404,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
       if (__pyx_t_4) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1317
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1317
  *                         new_high_x = 1
  *                 if f_back_high[0] - f_high < min_fx_size:
  *                     f_back_high[0] = f_high + min_fx_size             # <<<<<<<<<<<<<<
@@ -55420,7 +55420,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
         __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
         (__pyx_v_f_back_high[0]) = __pyx_t_1;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1318
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1318
  *                 if f_back_high[0] - f_high < min_fx_size:
  *                     f_back_high[0] = f_high + min_fx_size
  *                     if f_back_high[0] - f_back_low[0] > max_f_len:             # <<<<<<<<<<<<<<
@@ -55430,7 +55430,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
         __pyx_t_4 = ((((__pyx_v_f_back_high[0]) - (__pyx_v_f_back_low[0])) > __pyx_v_max_f_len) != 0);
         if (__pyx_t_4) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1320
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1320
  *                     if f_back_high[0] - f_back_low[0] > max_f_len:
  *                         # FAIL: extension required on high side violates max initial length
  *                         return 0             # <<<<<<<<<<<<<<
@@ -55441,7 +55441,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
           goto __pyx_L0;
         }
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1321
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1321
  *                         # FAIL: extension required on high side violates max initial length
  *                         return 0
  *                     if f_back_high[0] > f_sent_len:             # <<<<<<<<<<<<<<
@@ -55451,7 +55451,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
         __pyx_t_4 = (((__pyx_v_f_back_high[0]) > __pyx_v_f_sent_len) != 0);
         if (__pyx_t_4) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1323
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1323
  *                     if f_back_high[0] > f_sent_len:
  *                         # FAIL: extension required on high side violates sentence boundary
  *                         return 0             # <<<<<<<<<<<<<<
@@ -55468,7 +55468,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     }
     __pyx_L24:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1325
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1325
  *                         return 0
  * 
  *             e_low_prev = e_low[0]             # <<<<<<<<<<<<<<
@@ -55477,7 +55477,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
     __pyx_v_e_low_prev = (__pyx_v_e_low[0]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1326
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1326
  * 
  *             e_low_prev = e_low[0]
  *             e_high_prev = e_high[0]             # <<<<<<<<<<<<<<
@@ -55486,7 +55486,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
     __pyx_v_e_high_prev = (__pyx_v_e_high[0]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1328
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1328
  *             e_high_prev = e_high[0]
  * 
  *             self.find_projection(f_back_low[0], f_low_prev, f_links_low, f_links_high, e_low, e_high)             # <<<<<<<<<<<<<<
@@ -55497,7 +55497,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1329
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1329
  * 
  *             self.find_projection(f_back_low[0], f_low_prev, f_links_low, f_links_high, e_low, e_high)
  *             self.find_projection(f_high_prev, f_back_high[0], f_links_low, f_links_high, e_low, e_high)             # <<<<<<<<<<<<<<
@@ -55508,7 +55508,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     __Pyx_GOTREF(__pyx_t_6);
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1330
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1330
  *             self.find_projection(f_back_low[0], f_low_prev, f_links_low, f_links_high, e_low, e_high)
  *             self.find_projection(f_high_prev, f_back_high[0], f_links_low, f_links_high, e_low, e_high)
  *             if e_low[0] == e_low_prev and e_high[0] == e_high_prev:             # <<<<<<<<<<<<<<
@@ -55524,7 +55524,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     }
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1331
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1331
  *             self.find_projection(f_high_prev, f_back_high[0], f_links_low, f_links_high, e_low, e_high)
  *             if e_low[0] == e_low_prev and e_high[0] == e_high_prev:
  *                 return 1             # <<<<<<<<<<<<<<
@@ -55535,7 +55535,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1332
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1332
  *             if e_low[0] == e_low_prev and e_high[0] == e_high_prev:
  *                 return 1
  *             if allow_arbitrary_x == 0:             # <<<<<<<<<<<<<<
@@ -55545,7 +55545,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     __pyx_t_3 = ((__pyx_v_allow_arbitrary_x == 0) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1334
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1334
  *             if allow_arbitrary_x == 0:
  *                 # FAIL: arbitrary expansion not permitted
  *                 return 0             # <<<<<<<<<<<<<<
@@ -55556,7 +55556,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1335
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1335
  *                 # FAIL: arbitrary expansion not permitted
  *                 return 0
  *             if e_high[0] - e_low[0] > max_e_len:             # <<<<<<<<<<<<<<
@@ -55566,7 +55566,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     __pyx_t_3 = ((((__pyx_v_e_high[0]) - (__pyx_v_e_low[0])) > __pyx_v_max_e_len) != 0);
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1337
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1337
  *             if e_high[0] - e_low[0] > max_e_len:
  *                 # FAIL: re-projection violates sentence max phrase length
  *                 return 0             # <<<<<<<<<<<<<<
@@ -55577,7 +55577,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1338
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1338
  *                 # FAIL: re-projection violates sentence max phrase length
  *                 return 0
  *             f_low_prev = f_back_low[0]             # <<<<<<<<<<<<<<
@@ -55586,7 +55586,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
  */
     __pyx_v_f_low_prev = (__pyx_v_f_back_low[0]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1339
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1339
  *                 return 0
  *             f_low_prev = f_back_low[0]
  *             f_high_prev = f_back_high[0]             # <<<<<<<<<<<<<<
@@ -55596,7 +55596,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
     __pyx_v_f_high_prev = (__pyx_v_f_back_high[0]);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1215
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1215
  * 
  * 
  *     cdef int find_fixpoint(self,             # <<<<<<<<<<<<<<
@@ -55618,7 +55618,7 @@ static int __pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_fixpoint(struct
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1342
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1342
  * 
  * 
  *     cdef find_projection(self, int in_low, int in_high, int* in_links_low, int* in_links_high,             # <<<<<<<<<<<<<<
@@ -55636,7 +55636,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_projectio
   int __pyx_t_4;
   __Pyx_RefNannySetupContext("find_projection", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1345
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1345
  *                         int* out_low, int* out_high):
  *         cdef int i
  *         for i from in_low <= i < in_high:             # <<<<<<<<<<<<<<
@@ -55646,7 +55646,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_projectio
   __pyx_t_1 = __pyx_v_in_high;
   for (__pyx_v_i = __pyx_v_in_low; __pyx_v_i < __pyx_t_1; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1346
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1346
  *         cdef int i
  *         for i from in_low <= i < in_high:
  *             if in_links_low[i] != -1:             # <<<<<<<<<<<<<<
@@ -55656,7 +55656,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_projectio
     __pyx_t_2 = (((__pyx_v_in_links_low[__pyx_v_i]) != -1) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1347
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1347
  *         for i from in_low <= i < in_high:
  *             if in_links_low[i] != -1:
  *                 if out_low[0] == -1 or in_links_low[i] < out_low[0]:             # <<<<<<<<<<<<<<
@@ -55672,7 +55672,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_projectio
       }
       if (__pyx_t_4) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1348
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1348
  *             if in_links_low[i] != -1:
  *                 if out_low[0] == -1 or in_links_low[i] < out_low[0]:
  *                     out_low[0] = in_links_low[i]             # <<<<<<<<<<<<<<
@@ -55684,7 +55684,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_projectio
       }
       __pyx_L6:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1349
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1349
  *                 if out_low[0] == -1 or in_links_low[i] < out_low[0]:
  *                     out_low[0] = in_links_low[i]
  *                 if out_high[0] == -1 or in_links_high[i] > out_high[0]:             # <<<<<<<<<<<<<<
@@ -55700,7 +55700,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_projectio
       }
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1350
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1350
  *                     out_low[0] = in_links_low[i]
  *                 if out_high[0] == -1 or in_links_high[i] > out_high[0]:
  *                     out_high[0] = in_links_high[i]             # <<<<<<<<<<<<<<
@@ -55716,7 +55716,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_projectio
     __pyx_L5:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1342
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1342
  * 
  * 
  *     cdef find_projection(self, int in_low, int in_high, int* in_links_low, int* in_links_high,             # <<<<<<<<<<<<<<
@@ -55731,7 +55731,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_find_projectio
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1353
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1353
  * 
  * 
  *     cdef int* int_arr_extend(self, int* arr, int* arr_len, int* data, int data_len):             # <<<<<<<<<<<<<<
@@ -55745,7 +55745,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_int_arr_extend(CYTH
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("int_arr_extend", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1355
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1355
  *     cdef int* int_arr_extend(self, int* arr, int* arr_len, int* data, int data_len):
  *         cdef int new_len
  *         new_len = arr_len[0] + data_len             # <<<<<<<<<<<<<<
@@ -55754,7 +55754,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_int_arr_extend(CYTH
  */
   __pyx_v_new_len = ((__pyx_v_arr_len[0]) + __pyx_v_data_len);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1356
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1356
  *         cdef int new_len
  *         new_len = arr_len[0] + data_len
  *         arr = <int*> realloc(arr, new_len*sizeof(int))             # <<<<<<<<<<<<<<
@@ -55763,7 +55763,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_int_arr_extend(CYTH
  */
   __pyx_v_arr = ((int *)realloc(__pyx_v_arr, (__pyx_v_new_len * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1357
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1357
  *         new_len = arr_len[0] + data_len
  *         arr = <int*> realloc(arr, new_len*sizeof(int))
  *         memcpy(arr+arr_len[0], data, data_len*sizeof(int))             # <<<<<<<<<<<<<<
@@ -55772,7 +55772,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_int_arr_extend(CYTH
  */
   memcpy((__pyx_v_arr + (__pyx_v_arr_len[0])), __pyx_v_data, (__pyx_v_data_len * (sizeof(int))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1358
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1358
  *         arr = <int*> realloc(arr, new_len*sizeof(int))
  *         memcpy(arr+arr_len[0], data, data_len*sizeof(int))
  *         arr_len[0] = new_len             # <<<<<<<<<<<<<<
@@ -55781,7 +55781,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_int_arr_extend(CYTH
  */
   (__pyx_v_arr_len[0]) = __pyx_v_new_len;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1359
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1359
  *         memcpy(arr+arr_len[0], data, data_len*sizeof(int))
  *         arr_len[0] = new_len
  *         return arr             # <<<<<<<<<<<<<<
@@ -55791,7 +55791,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_int_arr_extend(CYTH
   __pyx_r = __pyx_v_arr;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1353
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1353
  * 
  * 
  *     cdef int* int_arr_extend(self, int* arr, int* arr_len, int* data, int data_len):             # <<<<<<<<<<<<<<
@@ -55805,7 +55805,7 @@ static int *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_int_arr_extend(CYTH
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1362
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1362
  * 
  * 
  *     cdef extract_phrases(self, int e_low, int e_high, int* e_gap_low, int* e_gap_high, int* e_links_low, int num_gaps,             # <<<<<<<<<<<<<<
@@ -55851,7 +55851,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("extract_phrases", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1370
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1370
  *         cdef result
  * 
  *         result = []             # <<<<<<<<<<<<<<
@@ -55863,7 +55863,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
   __pyx_v_result = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1371
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1371
  * 
  *         result = []
  *         len1 = 0             # <<<<<<<<<<<<<<
@@ -55872,7 +55872,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   __pyx_v_len1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1372
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1372
  *         result = []
  *         len1 = 0
  *         e_gaps1 = <int*> malloc(0)             # <<<<<<<<<<<<<<
@@ -55881,7 +55881,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   __pyx_v_e_gaps1 = ((int *)malloc(0));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1373
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1373
  *         len1 = 0
  *         e_gaps1 = <int*> malloc(0)
  *         ephr_arr = IntList()             # <<<<<<<<<<<<<<
@@ -55893,7 +55893,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
   __pyx_v_ephr_arr = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1375
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1375
  *         ephr_arr = IntList()
  * 
  *         e_gap_order = <int*> malloc(num_gaps*sizeof(int))             # <<<<<<<<<<<<<<
@@ -55902,7 +55902,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   __pyx_v_e_gap_order = ((int *)malloc((__pyx_v_num_gaps * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1376
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1376
  * 
  *         e_gap_order = <int*> malloc(num_gaps*sizeof(int))
  *         if num_gaps > 0:             # <<<<<<<<<<<<<<
@@ -55912,7 +55912,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
   __pyx_t_2 = ((__pyx_v_num_gaps > 0) != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1377
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1377
  *         e_gap_order = <int*> malloc(num_gaps*sizeof(int))
  *         if num_gaps > 0:
  *             e_gap_order[0] = 0             # <<<<<<<<<<<<<<
@@ -55921,7 +55921,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
     (__pyx_v_e_gap_order[0]) = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1378
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1378
  *         if num_gaps > 0:
  *             e_gap_order[0] = 0
  *             for i from 1 <= i < num_gaps:             # <<<<<<<<<<<<<<
@@ -55931,7 +55931,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
     __pyx_t_3 = __pyx_v_num_gaps;
     for (__pyx_v_i = 1; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1379
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1379
  *             e_gap_order[0] = 0
  *             for i from 1 <= i < num_gaps:
  *                 for j from 0 <= j < i:             # <<<<<<<<<<<<<<
@@ -55941,7 +55941,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       __pyx_t_4 = __pyx_v_i;
       for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_4; __pyx_v_j++) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1380
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1380
  *             for i from 1 <= i < num_gaps:
  *                 for j from 0 <= j < i:
  *                     if e_gap_low[i] < e_gap_low[j]:             # <<<<<<<<<<<<<<
@@ -55951,7 +55951,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
         __pyx_t_2 = (((__pyx_v_e_gap_low[__pyx_v_i]) < (__pyx_v_e_gap_low[__pyx_v_j])) != 0);
         if (__pyx_t_2) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1381
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1381
  *                 for j from 0 <= j < i:
  *                     if e_gap_low[i] < e_gap_low[j]:
  *                         for k from j <= k < i:             # <<<<<<<<<<<<<<
@@ -55961,7 +55961,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
           __pyx_t_5 = __pyx_v_i;
           for (__pyx_v_k = __pyx_v_j; __pyx_v_k < __pyx_t_5; __pyx_v_k++) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1382
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1382
  *                     if e_gap_low[i] < e_gap_low[j]:
  *                         for k from j <= k < i:
  *                             e_gap_order[k+1] = e_gap_order[k]             # <<<<<<<<<<<<<<
@@ -55971,7 +55971,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
             (__pyx_v_e_gap_order[(__pyx_v_k + 1)]) = (__pyx_v_e_gap_order[__pyx_v_k]);
           }
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1383
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1383
  *                         for k from j <= k < i:
  *                             e_gap_order[k+1] = e_gap_order[k]
  *                         e_gap_order[j] = i             # <<<<<<<<<<<<<<
@@ -55980,7 +55980,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
           (__pyx_v_e_gap_order[__pyx_v_j]) = __pyx_v_i;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1384
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1384
  *                             e_gap_order[k+1] = e_gap_order[k]
  *                         e_gap_order[j] = i
  *                         break             # <<<<<<<<<<<<<<
@@ -55992,7 +55992,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       }
       /*else*/ {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1386
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1386
  *                         break
  *                 else:
  *                     e_gap_order[i] = i             # <<<<<<<<<<<<<<
@@ -56007,7 +56007,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
   }
   __pyx_L3:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1388
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1388
  *                     e_gap_order[i] = i
  * 
  *         e_x_low = e_low             # <<<<<<<<<<<<<<
@@ -56016,7 +56016,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   __pyx_v_e_x_low = __pyx_v_e_low;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1389
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1389
  * 
  *         e_x_low = e_low
  *         e_x_high = e_high             # <<<<<<<<<<<<<<
@@ -56025,7 +56025,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   __pyx_v_e_x_high = __pyx_v_e_high;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1390
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1390
  *         e_x_low = e_low
  *         e_x_high = e_high
  *         if not self.tight_phrases:             # <<<<<<<<<<<<<<
@@ -56035,7 +56035,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
   __pyx_t_2 = ((!(__pyx_v_self->tight_phrases != 0)) != 0);
   if (__pyx_t_2) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1391
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1391
  *         e_x_high = e_high
  *         if not self.tight_phrases:
  *             while e_x_low > 0 and e_high - e_x_low < self.train_max_initial_size and e_links_low[e_x_low-1] == -1:             # <<<<<<<<<<<<<<
@@ -56058,7 +56058,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       }
       if (!__pyx_t_6) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1392
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1392
  *         if not self.tight_phrases:
  *             while e_x_low > 0 and e_high - e_x_low < self.train_max_initial_size and e_links_low[e_x_low-1] == -1:
  *                 e_x_low = e_x_low - 1             # <<<<<<<<<<<<<<
@@ -56068,7 +56068,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       __pyx_v_e_x_low = (__pyx_v_e_x_low - 1);
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1393
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1393
  *             while e_x_low > 0 and e_high - e_x_low < self.train_max_initial_size and e_links_low[e_x_low-1] == -1:
  *                 e_x_low = e_x_low - 1
  *             while e_x_high < e_sent_len and e_x_high - e_low < self.train_max_initial_size and e_links_low[e_x_high] == -1:             # <<<<<<<<<<<<<<
@@ -56091,7 +56091,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       }
       if (!__pyx_t_2) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1394
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1394
  *                 e_x_low = e_x_low - 1
  *             while e_x_high < e_sent_len and e_x_high - e_low < self.train_max_initial_size and e_links_low[e_x_high] == -1:
  *                 e_x_high = e_x_high + 1             # <<<<<<<<<<<<<<
@@ -56104,7 +56104,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
   }
   __pyx_L11:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1396
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1396
  *                 e_x_high = e_x_high + 1
  * 
  *         for i from e_x_low <= i <= e_low:             # <<<<<<<<<<<<<<
@@ -56114,7 +56114,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
   __pyx_t_3 = __pyx_v_e_low;
   for (__pyx_v_i = __pyx_v_e_x_low; __pyx_v_i <= __pyx_t_3; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1397
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1397
  * 
  *         for i from e_x_low <= i <= e_low:
  *             e_gaps1 = self.int_arr_extend(e_gaps1, &len1, &i, 1)             # <<<<<<<<<<<<<<
@@ -56124,7 +56124,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
     __pyx_v_e_gaps1 = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->int_arr_extend(__pyx_v_self, __pyx_v_e_gaps1, (&__pyx_v_len1), (&__pyx_v_i), 1);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1399
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1399
  *             e_gaps1 = self.int_arr_extend(e_gaps1, &len1, &i, 1)
  * 
  *         for i from 0 <= i < num_gaps:             # <<<<<<<<<<<<<<
@@ -56134,7 +56134,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
   __pyx_t_3 = __pyx_v_num_gaps;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_3; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1400
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1400
  * 
  *         for i from 0 <= i < num_gaps:
  *             e_gaps2 = <int*> malloc(0)             # <<<<<<<<<<<<<<
@@ -56143,7 +56143,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
     __pyx_v_e_gaps2 = ((int *)malloc(0));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1401
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1401
  *         for i from 0 <= i < num_gaps:
  *             e_gaps2 = <int*> malloc(0)
  *             len2 = 0             # <<<<<<<<<<<<<<
@@ -56152,7 +56152,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
     __pyx_v_len2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1403
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1403
  *             len2 = 0
  * 
  *             j = e_gap_order[i]             # <<<<<<<<<<<<<<
@@ -56161,7 +56161,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
     __pyx_v_j = (__pyx_v_e_gap_order[__pyx_v_i]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1404
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1404
  * 
  *             j = e_gap_order[i]
  *             e_x_gap_low = e_gap_low[j]             # <<<<<<<<<<<<<<
@@ -56170,7 +56170,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
     __pyx_v_e_x_gap_low = (__pyx_v_e_gap_low[__pyx_v_j]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1405
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1405
  *             j = e_gap_order[i]
  *             e_x_gap_low = e_gap_low[j]
  *             e_x_gap_high = e_gap_high[j]             # <<<<<<<<<<<<<<
@@ -56179,7 +56179,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
     __pyx_v_e_x_gap_high = (__pyx_v_e_gap_high[__pyx_v_j]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1406
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1406
  *             e_x_gap_low = e_gap_low[j]
  *             e_x_gap_high = e_gap_high[j]
  *             if not self.tight_phrases:             # <<<<<<<<<<<<<<
@@ -56189,7 +56189,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
     __pyx_t_2 = ((!(__pyx_v_self->tight_phrases != 0)) != 0);
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1407
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1407
  *             e_x_gap_high = e_gap_high[j]
  *             if not self.tight_phrases:
  *                 while e_x_gap_low > e_x_low and e_links_low[e_x_gap_low-1] == -1:             # <<<<<<<<<<<<<<
@@ -56206,7 +56206,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
         }
         if (!__pyx_t_7) break;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1408
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1408
  *             if not self.tight_phrases:
  *                 while e_x_gap_low > e_x_low and e_links_low[e_x_gap_low-1] == -1:
  *                     e_x_gap_low = e_x_gap_low - 1             # <<<<<<<<<<<<<<
@@ -56216,7 +56216,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
         __pyx_v_e_x_gap_low = (__pyx_v_e_x_gap_low - 1);
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1409
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1409
  *                 while e_x_gap_low > e_x_low and e_links_low[e_x_gap_low-1] == -1:
  *                     e_x_gap_low = e_x_gap_low - 1
  *                 while e_x_gap_high < e_x_high and e_links_low[e_x_gap_high] == -1:             # <<<<<<<<<<<<<<
@@ -56233,7 +56233,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
         }
         if (!__pyx_t_6) break;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1410
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1410
  *                     e_x_gap_low = e_x_gap_low - 1
  *                 while e_x_gap_high < e_x_high and e_links_low[e_x_gap_high] == -1:
  *                     e_x_gap_high = e_x_gap_high + 1             # <<<<<<<<<<<<<<
@@ -56246,7 +56246,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
     }
     __pyx_L20:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1412
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1412
  *                     e_x_gap_high = e_x_gap_high + 1
  * 
  *             k = 0             # <<<<<<<<<<<<<<
@@ -56255,7 +56255,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
     __pyx_v_k = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1413
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1413
  * 
  *             k = 0
  *             step = 1+(i*2)             # <<<<<<<<<<<<<<
@@ -56264,7 +56264,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
     __pyx_v_step = (1 + (__pyx_v_i * 2));
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1414
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1414
  *             k = 0
  *             step = 1+(i*2)
  *             while k < len1:             # <<<<<<<<<<<<<<
@@ -56275,7 +56275,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       __pyx_t_6 = ((__pyx_v_k < __pyx_v_len1) != 0);
       if (!__pyx_t_6) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1415
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1415
  *             step = 1+(i*2)
  *             while k < len1:
  *                 for m from e_x_gap_low <= m <= e_gap_low[j]:             # <<<<<<<<<<<<<<
@@ -56285,7 +56285,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       __pyx_t_4 = (__pyx_v_e_gap_low[__pyx_v_j]);
       for (__pyx_v_m = __pyx_v_e_x_gap_low; __pyx_v_m <= __pyx_t_4; __pyx_v_m++) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1416
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1416
  *             while k < len1:
  *                 for m from e_x_gap_low <= m <= e_gap_low[j]:
  *                     if m >= e_gaps1[k+step-1]:             # <<<<<<<<<<<<<<
@@ -56295,7 +56295,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
         __pyx_t_6 = ((__pyx_v_m >= (__pyx_v_e_gaps1[((__pyx_v_k + __pyx_v_step) - 1)])) != 0);
         if (__pyx_t_6) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1417
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1417
  *                 for m from e_x_gap_low <= m <= e_gap_low[j]:
  *                     if m >= e_gaps1[k+step-1]:
  *                         for n from e_gap_high[j] <= n <= e_x_gap_high:             # <<<<<<<<<<<<<<
@@ -56305,7 +56305,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
           __pyx_t_5 = __pyx_v_e_x_gap_high;
           for (__pyx_v_n = (__pyx_v_e_gap_high[__pyx_v_j]); __pyx_v_n <= __pyx_t_5; __pyx_v_n++) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1418
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1418
  *                     if m >= e_gaps1[k+step-1]:
  *                         for n from e_gap_high[j] <= n <= e_x_gap_high:
  *                             if n-m >= 1:    # extractor.py doesn't restrict target-side gap length             # <<<<<<<<<<<<<<
@@ -56315,7 +56315,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
             __pyx_t_6 = (((__pyx_v_n - __pyx_v_m) >= 1) != 0);
             if (__pyx_t_6) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1419
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1419
  *                         for n from e_gap_high[j] <= n <= e_x_gap_high:
  *                             if n-m >= 1:    # extractor.py doesn't restrict target-side gap length
  *                                 e_gaps2 = self.int_arr_extend(e_gaps2, &len2, e_gaps1+k, step)             # <<<<<<<<<<<<<<
@@ -56324,7 +56324,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
               __pyx_v_e_gaps2 = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->int_arr_extend(__pyx_v_self, __pyx_v_e_gaps2, (&__pyx_v_len2), (__pyx_v_e_gaps1 + __pyx_v_k), __pyx_v_step);
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1420
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1420
  *                             if n-m >= 1:    # extractor.py doesn't restrict target-side gap length
  *                                 e_gaps2 = self.int_arr_extend(e_gaps2, &len2, e_gaps1+k, step)
  *                                 e_gaps2 = self.int_arr_extend(e_gaps2, &len2, &m, 1)             # <<<<<<<<<<<<<<
@@ -56333,7 +56333,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
               __pyx_v_e_gaps2 = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->int_arr_extend(__pyx_v_self, __pyx_v_e_gaps2, (&__pyx_v_len2), (&__pyx_v_m), 1);
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1421
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1421
  *                                 e_gaps2 = self.int_arr_extend(e_gaps2, &len2, e_gaps1+k, step)
  *                                 e_gaps2 = self.int_arr_extend(e_gaps2, &len2, &m, 1)
  *                                 e_gaps2 = self.int_arr_extend(e_gaps2, &len2, &n, 1)             # <<<<<<<<<<<<<<
@@ -56350,7 +56350,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
         __pyx_L29:;
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1422
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1422
  *                                 e_gaps2 = self.int_arr_extend(e_gaps2, &len2, &m, 1)
  *                                 e_gaps2 = self.int_arr_extend(e_gaps2, &len2, &n, 1)
  *                 k = k + step             # <<<<<<<<<<<<<<
@@ -56360,7 +56360,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       __pyx_v_k = (__pyx_v_k + __pyx_v_step);
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1423
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1423
  *                                 e_gaps2 = self.int_arr_extend(e_gaps2, &len2, &n, 1)
  *                 k = k + step
  *             free(e_gaps1)             # <<<<<<<<<<<<<<
@@ -56369,7 +56369,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
     free(__pyx_v_e_gaps1);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1424
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1424
  *                 k = k + step
  *             free(e_gaps1)
  *             e_gaps1 = e_gaps2             # <<<<<<<<<<<<<<
@@ -56378,7 +56378,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
     __pyx_v_e_gaps1 = __pyx_v_e_gaps2;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1425
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1425
  *             free(e_gaps1)
  *             e_gaps1 = e_gaps2
  *             len1 = len2             # <<<<<<<<<<<<<<
@@ -56388,7 +56388,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
     __pyx_v_len1 = __pyx_v_len2;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1427
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1427
  *             len1 = len2
  * 
  *         step = 1+(num_gaps*2)             # <<<<<<<<<<<<<<
@@ -56397,7 +56397,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   __pyx_v_step = (1 + (__pyx_v_num_gaps * 2));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1428
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1428
  * 
  *         step = 1+(num_gaps*2)
  *         e_gaps2 = <int*> malloc(0)             # <<<<<<<<<<<<<<
@@ -56406,7 +56406,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   __pyx_v_e_gaps2 = ((int *)malloc(0));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1429
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1429
  *         step = 1+(num_gaps*2)
  *         e_gaps2 = <int*> malloc(0)
  *         len2 = 0             # <<<<<<<<<<<<<<
@@ -56415,7 +56415,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   __pyx_v_len2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1430
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1430
  *         e_gaps2 = <int*> malloc(0)
  *         len2 = 0
  *         for i from e_high <= i <= e_x_high:             # <<<<<<<<<<<<<<
@@ -56425,7 +56425,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
   __pyx_t_3 = __pyx_v_e_x_high;
   for (__pyx_v_i = __pyx_v_e_high; __pyx_v_i <= __pyx_t_3; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1431
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1431
  *         len2 = 0
  *         for i from e_high <= i <= e_x_high:
  *             j = 0             # <<<<<<<<<<<<<<
@@ -56434,7 +56434,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
     __pyx_v_j = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1432
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1432
  *         for i from e_high <= i <= e_x_high:
  *             j = 0
  *             while j < len1:             # <<<<<<<<<<<<<<
@@ -56445,7 +56445,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       __pyx_t_6 = ((__pyx_v_j < __pyx_v_len1) != 0);
       if (!__pyx_t_6) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1433
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1433
  *             j = 0
  *             while j < len1:
  *                 if i - e_gaps1[j] <= self.train_max_initial_size and i >= e_gaps1[j+step-1]:             # <<<<<<<<<<<<<<
@@ -56461,7 +56461,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       }
       if (__pyx_t_2) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1434
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1434
  *             while j < len1:
  *                 if i - e_gaps1[j] <= self.train_max_initial_size and i >= e_gaps1[j+step-1]:
  *                     e_gaps2 = self.int_arr_extend(e_gaps2, &len2, e_gaps1+j, step)             # <<<<<<<<<<<<<<
@@ -56470,7 +56470,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
         __pyx_v_e_gaps2 = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->int_arr_extend(__pyx_v_self, __pyx_v_e_gaps2, (&__pyx_v_len2), (__pyx_v_e_gaps1 + __pyx_v_j), __pyx_v_step);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1435
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1435
  *                 if i - e_gaps1[j] <= self.train_max_initial_size and i >= e_gaps1[j+step-1]:
  *                     e_gaps2 = self.int_arr_extend(e_gaps2, &len2, e_gaps1+j, step)
  *                     e_gaps2 = self.int_arr_extend(e_gaps2, &len2, &i, 1)             # <<<<<<<<<<<<<<
@@ -56482,7 +56482,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       }
       __pyx_L37:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1436
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1436
  *                     e_gaps2 = self.int_arr_extend(e_gaps2, &len2, e_gaps1+j, step)
  *                     e_gaps2 = self.int_arr_extend(e_gaps2, &len2, &i, 1)
  *                 j = j + step             # <<<<<<<<<<<<<<
@@ -56493,7 +56493,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
     }
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1437
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1437
  *                     e_gaps2 = self.int_arr_extend(e_gaps2, &len2, &i, 1)
  *                 j = j + step
  *         free(e_gaps1)             # <<<<<<<<<<<<<<
@@ -56502,7 +56502,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   free(__pyx_v_e_gaps1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1438
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1438
  *                 j = j + step
  *         free(e_gaps1)
  *         e_gaps1 = e_gaps2             # <<<<<<<<<<<<<<
@@ -56511,7 +56511,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   __pyx_v_e_gaps1 = __pyx_v_e_gaps2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1439
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1439
  *         free(e_gaps1)
  *         e_gaps1 = e_gaps2
  *         len1 = len2             # <<<<<<<<<<<<<<
@@ -56520,7 +56520,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   __pyx_v_len1 = __pyx_v_len2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1441
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1441
  *         len1 = len2
  * 
  *         step = (num_gaps+1)*2             # <<<<<<<<<<<<<<
@@ -56529,7 +56529,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   __pyx_v_step = ((__pyx_v_num_gaps + 1) * 2);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1442
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1442
  * 
  *         step = (num_gaps+1)*2
  *         i = 0             # <<<<<<<<<<<<<<
@@ -56538,7 +56538,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   __pyx_v_i = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1445
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1445
  * 
  *         cdef IntList indexes
  *         while i < len1:             # <<<<<<<<<<<<<<
@@ -56549,7 +56549,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
     __pyx_t_2 = ((__pyx_v_i < __pyx_v_len1) != 0);
     if (!__pyx_t_2) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1446
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1446
  *         cdef IntList indexes
  *         while i < len1:
  *             ephr_arr._clear()             # <<<<<<<<<<<<<<
@@ -56558,7 +56558,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
     ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_ephr_arr->__pyx_vtab)->_clear(__pyx_v_ephr_arr);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1447
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1447
  *         while i < len1:
  *             ephr_arr._clear()
  *             num_chunks = 0             # <<<<<<<<<<<<<<
@@ -56567,7 +56567,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
     __pyx_v_num_chunks = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1448
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1448
  *             ephr_arr._clear()
  *             num_chunks = 0
  *             indexes = IntList()             # <<<<<<<<<<<<<<
@@ -56579,7 +56579,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
     __Pyx_XDECREF_SET(__pyx_v_indexes, ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1));
     __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1449
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1449
  *             num_chunks = 0
  *             indexes = IntList()
  *             for j from 0 <= j < num_gaps+1:             # <<<<<<<<<<<<<<
@@ -56589,7 +56589,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
     __pyx_t_9 = (__pyx_v_num_gaps + 1);
     for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_9; __pyx_v_j++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1450
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1450
  *             indexes = IntList()
  *             for j from 0 <= j < num_gaps+1:
  *                 if e_gaps1[i+2*j] < e_gaps1[i+(2*j)+1]:             # <<<<<<<<<<<<<<
@@ -56599,7 +56599,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       __pyx_t_2 = (((__pyx_v_e_gaps1[(__pyx_v_i + (2 * __pyx_v_j))]) < (__pyx_v_e_gaps1[((__pyx_v_i + (2 * __pyx_v_j)) + 1)])) != 0);
       if (__pyx_t_2) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1451
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1451
  *             for j from 0 <= j < num_gaps+1:
  *                 if e_gaps1[i+2*j] < e_gaps1[i+(2*j)+1]:
  *                     num_chunks = num_chunks + 1             # <<<<<<<<<<<<<<
@@ -56611,7 +56611,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       }
       __pyx_L42:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1452
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1452
  *                 if e_gaps1[i+2*j] < e_gaps1[i+(2*j)+1]:
  *                     num_chunks = num_chunks + 1
  *                 for k from e_gaps1[i+2*j] <= k < e_gaps1[i+(2*j)+1]:             # <<<<<<<<<<<<<<
@@ -56621,7 +56621,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       __pyx_t_3 = (__pyx_v_e_gaps1[((__pyx_v_i + (2 * __pyx_v_j)) + 1)]);
       for (__pyx_v_k = (__pyx_v_e_gaps1[(__pyx_v_i + (2 * __pyx_v_j))]); __pyx_v_k < __pyx_t_3; __pyx_v_k++) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1453
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1453
  *                     num_chunks = num_chunks + 1
  *                 for k from e_gaps1[i+2*j] <= k < e_gaps1[i+(2*j)+1]:
  *                     indexes.append(k)             # <<<<<<<<<<<<<<
@@ -56633,7 +56633,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
         __pyx_t_10 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_indexes), __pyx_t_1); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1453; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1454
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1454
  *                 for k from e_gaps1[i+2*j] <= k < e_gaps1[i+(2*j)+1]:
  *                     indexes.append(k)
  *                     ephr_arr._append(self.eid2symid[self.eda.data.arr[e_sent_start+k]])             # <<<<<<<<<<<<<<
@@ -56648,7 +56648,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
         ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_ephr_arr->__pyx_vtab)->_append(__pyx_v_ephr_arr, __pyx_t_4);
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1455
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1455
  *                     indexes.append(k)
  *                     ephr_arr._append(self.eid2symid[self.eda.data.arr[e_sent_start+k]])
  *                 if j < num_gaps:             # <<<<<<<<<<<<<<
@@ -56658,7 +56658,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       __pyx_t_2 = ((__pyx_v_j < __pyx_v_num_gaps) != 0);
       if (__pyx_t_2) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1456
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1456
  *                     ephr_arr._append(self.eid2symid[self.eda.data.arr[e_sent_start+k]])
  *                 if j < num_gaps:
  *                     indexes.append(sym_setindex(self.category, e_gap_order[j]+1))             # <<<<<<<<<<<<<<
@@ -56670,7 +56670,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
         __pyx_t_10 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_indexes), __pyx_t_1); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1456; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1457
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1457
  *                 if j < num_gaps:
  *                     indexes.append(sym_setindex(self.category, e_gap_order[j]+1))
  *                     ephr_arr._append(sym_setindex(self.category, e_gap_order[j]+1))             # <<<<<<<<<<<<<<
@@ -56683,7 +56683,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
       __pyx_L45:;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1458
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1458
  *                     indexes.append(sym_setindex(self.category, e_gap_order[j]+1))
  *                     ephr_arr._append(sym_setindex(self.category, e_gap_order[j]+1))
  *             i = i + step             # <<<<<<<<<<<<<<
@@ -56692,7 +56692,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
     __pyx_v_i = (__pyx_v_i + __pyx_v_step);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1459
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1459
  *                     ephr_arr._append(sym_setindex(self.category, e_gap_order[j]+1))
  *             i = i + step
  *             if ephr_arr.len <= self.max_target_length and num_chunks <= self.max_target_chunks:             # <<<<<<<<<<<<<<
@@ -56708,7 +56708,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
     }
     if (__pyx_t_7) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1460
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1460
  *             i = i + step
  *             if ephr_arr.len <= self.max_target_length and num_chunks <= self.max_target_chunks:
  *                 result.append((Phrase(ephr_arr),indexes))             # <<<<<<<<<<<<<<
@@ -56738,7 +56738,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
     __pyx_L46:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1462
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1462
  *                 result.append((Phrase(ephr_arr),indexes))
  * 
  *         free(e_gaps1)             # <<<<<<<<<<<<<<
@@ -56747,7 +56747,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   free(__pyx_v_e_gaps1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1463
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1463
  * 
  *         free(e_gaps1)
  *         free(e_gap_order)             # <<<<<<<<<<<<<<
@@ -56756,7 +56756,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
  */
   free(__pyx_v_e_gap_order);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1464
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1464
  *         free(e_gaps1)
  *         free(e_gap_order)
  *         return result             # <<<<<<<<<<<<<<
@@ -56768,7 +56768,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
   __pyx_r = __pyx_v_result;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1362
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1362
  * 
  * 
  *     cdef extract_phrases(self, int e_low, int e_high, int* e_gap_low, int* e_gap_high, int* e_links_low, int num_gaps,             # <<<<<<<<<<<<<<
@@ -56791,7 +56791,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract_phrase
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1466
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1466
  *         return result
  * 
  *     cdef IntList create_alignments(self, int* sent_links, int num_links,             # <<<<<<<<<<<<<<
@@ -56820,7 +56820,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_IntList *__pyx_f_4cdec_2sa_3_sa_23HieroCa
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("create_alignments", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1469
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1469
  *             IntList findexes, IntList eindexes):
  *         cdef unsigned i
  *         cdef IntList ret = IntList()             # <<<<<<<<<<<<<<
@@ -56832,7 +56832,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_IntList *__pyx_f_4cdec_2sa_3_sa_23HieroCa
   __pyx_v_ret = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1470
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1470
  *         cdef unsigned i
  *         cdef IntList ret = IntList()
  *         for i in range(findexes.len):             # <<<<<<<<<<<<<<
@@ -56843,7 +56843,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_IntList *__pyx_f_4cdec_2sa_3_sa_23HieroCa
   for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) {
     __pyx_v_i = __pyx_t_3;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1471
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1471
  *         cdef IntList ret = IntList()
  *         for i in range(findexes.len):
  *             s = findexes.arr[i]             # <<<<<<<<<<<<<<
@@ -56852,7 +56852,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_IntList *__pyx_f_4cdec_2sa_3_sa_23HieroCa
  */
     __pyx_v_s = (__pyx_v_findexes->arr[__pyx_v_i]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1472
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1472
  *         for i in range(findexes.len):
  *             s = findexes.arr[i]
  *             if s < 0: continue             # <<<<<<<<<<<<<<
@@ -56864,7 +56864,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_IntList *__pyx_f_4cdec_2sa_3_sa_23HieroCa
       goto __pyx_L3_continue;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1473
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1473
  *             s = findexes.arr[i]
  *             if s < 0: continue
  *             idx = 0             # <<<<<<<<<<<<<<
@@ -56874,7 +56874,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_IntList *__pyx_f_4cdec_2sa_3_sa_23HieroCa
     __Pyx_INCREF(__pyx_int_0);
     __Pyx_XDECREF_SET(__pyx_v_idx, __pyx_int_0);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1474
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1474
  *             if s < 0: continue
  *             idx = 0
  *             while idx < num_links * 2:             # <<<<<<<<<<<<<<
@@ -56890,7 +56890,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_IntList *__pyx_f_4cdec_2sa_3_sa_23HieroCa
       __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       if (!__pyx_t_4) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1475
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1475
  *             idx = 0
  *             while idx < num_links * 2:
  *                 if sent_links[idx] == s:             # <<<<<<<<<<<<<<
@@ -56901,7 +56901,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_IntList *__pyx_f_4cdec_2sa_3_sa_23HieroCa
       __pyx_t_4 = (((__pyx_v_sent_links[__pyx_t_6]) == __pyx_v_s) != 0);
       if (__pyx_t_4) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1476
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1476
  *             while idx < num_links * 2:
  *                 if sent_links[idx] == s:
  *                     j = eindexes.index(sent_links[idx+1])             # <<<<<<<<<<<<<<
@@ -56928,7 +56928,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_IntList *__pyx_f_4cdec_2sa_3_sa_23HieroCa
         __Pyx_XDECREF_SET(__pyx_v_j, __pyx_t_1);
         __pyx_t_1 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1477
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1477
  *                 if sent_links[idx] == s:
  *                     j = eindexes.index(sent_links[idx+1])
  *                     ret.append(i * ALIGNMENT_CODE + j)             # <<<<<<<<<<<<<<
@@ -56946,7 +56946,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_IntList *__pyx_f_4cdec_2sa_3_sa_23HieroCa
       }
       __pyx_L8:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1478
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1478
  *                     j = eindexes.index(sent_links[idx+1])
  *                     ret.append(i * ALIGNMENT_CODE + j)
  *                 idx += 2             # <<<<<<<<<<<<<<
@@ -56961,7 +56961,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_IntList *__pyx_f_4cdec_2sa_3_sa_23HieroCa
     __pyx_L3_continue:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1479
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1479
  *                     ret.append(i * ALIGNMENT_CODE + j)
  *                 idx += 2
  *         return ret             # <<<<<<<<<<<<<<
@@ -56973,7 +56973,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_IntList *__pyx_f_4cdec_2sa_3_sa_23HieroCa
   __pyx_r = __pyx_v_ret;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1466
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1466
  *         return result
  * 
  *     cdef IntList create_alignments(self, int* sent_links, int num_links,             # <<<<<<<<<<<<<<
@@ -56997,7 +56997,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_IntList *__pyx_f_4cdec_2sa_3_sa_23HieroCa
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1481
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1481
  *         return ret
  * 
  *     cdef extract(self, Phrase phrase, Matching* matching, int* chunklen, int num_chunks):             # <<<<<<<<<<<<<<
@@ -57091,7 +57091,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("extract", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1494
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1494
  *         cdef reason_for_failure
  * 
  *         fphr_arr = IntList()             # <<<<<<<<<<<<<<
@@ -57103,7 +57103,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   __pyx_v_fphr_arr = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1495
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1495
  * 
  *         fphr_arr = IntList()
  *         phrase_len = phrase.n             # <<<<<<<<<<<<<<
@@ -57113,7 +57113,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   __pyx_t_2 = __pyx_v_phrase->n;
   __pyx_v_phrase_len = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1496
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1496
  *         fphr_arr = IntList()
  *         phrase_len = phrase.n
  *         extracts = []             # <<<<<<<<<<<<<<
@@ -57125,7 +57125,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   __pyx_v_extracts = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1497
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1497
  *         phrase_len = phrase.n
  *         extracts = []
  *         sent_links = self.alignment._get_sent_links(matching.sent_id, &num_links)             # <<<<<<<<<<<<<<
@@ -57134,7 +57134,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_sent_links = ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_Alignment *)__pyx_v_self->alignment->__pyx_vtab)->_get_sent_links(__pyx_v_self->alignment, __pyx_v_matching->sent_id, (&__pyx_v_num_links));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1499
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1499
  *         sent_links = self.alignment._get_sent_links(matching.sent_id, &num_links)
  * 
  *         e_sent_start = self.eda.sent_index.arr[matching.sent_id]             # <<<<<<<<<<<<<<
@@ -57143,7 +57143,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_e_sent_start = (__pyx_v_self->eda->sent_index->arr[__pyx_v_matching->sent_id]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1500
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1500
  * 
  *         e_sent_start = self.eda.sent_index.arr[matching.sent_id]
  *         e_sent_end = self.eda.sent_index.arr[matching.sent_id+1]             # <<<<<<<<<<<<<<
@@ -57152,7 +57152,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_e_sent_end = (__pyx_v_self->eda->sent_index->arr[(__pyx_v_matching->sent_id + 1)]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1501
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1501
  *         e_sent_start = self.eda.sent_index.arr[matching.sent_id]
  *         e_sent_end = self.eda.sent_index.arr[matching.sent_id+1]
  *         e_sent_len = e_sent_end - e_sent_start - 1             # <<<<<<<<<<<<<<
@@ -57161,7 +57161,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_e_sent_len = ((__pyx_v_e_sent_end - __pyx_v_e_sent_start) - 1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1502
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1502
  *         e_sent_end = self.eda.sent_index.arr[matching.sent_id+1]
  *         e_sent_len = e_sent_end - e_sent_start - 1
  *         f_sent_start = self.fda.sent_index.arr[matching.sent_id]             # <<<<<<<<<<<<<<
@@ -57170,7 +57170,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_f_sent_start = (__pyx_v_self->fda->sent_index->arr[__pyx_v_matching->sent_id]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1503
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1503
  *         e_sent_len = e_sent_end - e_sent_start - 1
  *         f_sent_start = self.fda.sent_index.arr[matching.sent_id]
  *         f_sent_end = self.fda.sent_index.arr[matching.sent_id+1]             # <<<<<<<<<<<<<<
@@ -57179,7 +57179,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_f_sent_end = (__pyx_v_self->fda->sent_index->arr[(__pyx_v_matching->sent_id + 1)]);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1504
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1504
  *         f_sent_start = self.fda.sent_index.arr[matching.sent_id]
  *         f_sent_end = self.fda.sent_index.arr[matching.sent_id+1]
  *         f_sent_len = f_sent_end - f_sent_start - 1             # <<<<<<<<<<<<<<
@@ -57188,7 +57188,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_f_sent_len = ((__pyx_v_f_sent_end - __pyx_v_f_sent_start) - 1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1506
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1506
  *         f_sent_len = f_sent_end - f_sent_start - 1
  * 
  *         self.findexes1.reset()             # <<<<<<<<<<<<<<
@@ -57202,7 +57202,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1507
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1507
  * 
  *         self.findexes1.reset()
  *         sofar = 0             # <<<<<<<<<<<<<<
@@ -57212,7 +57212,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   __Pyx_INCREF(__pyx_int_0);
   __pyx_v_sofar = __pyx_int_0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1508
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1508
  *         self.findexes1.reset()
  *         sofar = 0
  *         for i in range(num_chunks):             # <<<<<<<<<<<<<<
@@ -57223,7 +57223,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   for (__pyx_t_4 = 0; __pyx_t_4 < __pyx_t_2; __pyx_t_4+=1) {
     __pyx_v_i = __pyx_t_4;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1509
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1509
  *         sofar = 0
  *         for i in range(num_chunks):
  *             for j in range(chunklen[i]):             # <<<<<<<<<<<<<<
@@ -57234,7 +57234,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_5; __pyx_t_6+=1) {
       __pyx_v_j = __pyx_t_6;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1510
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1510
  *         for i in range(num_chunks):
  *             for j in range(chunklen[i]):
  *                 self.findexes1.append(matching.arr[matching.start+i]+j-f_sent_start);             # <<<<<<<<<<<<<<
@@ -57246,7 +57246,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       __pyx_t_7 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_self->findexes1), __pyx_t_3); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1510; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1511
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1511
  *             for j in range(chunklen[i]):
  *                 self.findexes1.append(matching.arr[matching.start+i]+j-f_sent_start);
  *                 sofar += 1             # <<<<<<<<<<<<<<
@@ -57259,7 +57259,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       __pyx_t_3 = 0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1512
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1512
  *                 self.findexes1.append(matching.arr[matching.start+i]+j-f_sent_start);
  *                 sofar += 1
  *             if i+1 < num_chunks:             # <<<<<<<<<<<<<<
@@ -57269,7 +57269,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     __pyx_t_8 = (((__pyx_v_i + 1) < __pyx_v_num_chunks) != 0);
     if (__pyx_t_8) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1513
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1513
  *                 sofar += 1
  *             if i+1 < num_chunks:
  *                 self.findexes1.append(phrase[sofar])             # <<<<<<<<<<<<<<
@@ -57281,7 +57281,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       __pyx_t_7 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_self->findexes1), __pyx_t_3); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1513; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1514
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1514
  *             if i+1 < num_chunks:
  *                 self.findexes1.append(phrase[sofar])
  *                 sofar += 1             # <<<<<<<<<<<<<<
@@ -57297,7 +57297,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     __pyx_L7:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1517
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1517
  * 
  * 
  *         e_links_low = <int*> malloc(e_sent_len*sizeof(int))             # <<<<<<<<<<<<<<
@@ -57306,7 +57306,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_e_links_low = ((int *)malloc((__pyx_v_e_sent_len * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1518
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1518
  * 
  *         e_links_low = <int*> malloc(e_sent_len*sizeof(int))
  *         e_links_high = <int*> malloc(e_sent_len*sizeof(int))             # <<<<<<<<<<<<<<
@@ -57315,7 +57315,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_e_links_high = ((int *)malloc((__pyx_v_e_sent_len * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1519
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1519
  *         e_links_low = <int*> malloc(e_sent_len*sizeof(int))
  *         e_links_high = <int*> malloc(e_sent_len*sizeof(int))
  *         f_links_low = <int*> malloc(f_sent_len*sizeof(int))             # <<<<<<<<<<<<<<
@@ -57324,7 +57324,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_f_links_low = ((int *)malloc((__pyx_v_f_sent_len * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1520
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1520
  *         e_links_high = <int*> malloc(e_sent_len*sizeof(int))
  *         f_links_low = <int*> malloc(f_sent_len*sizeof(int))
  *         f_links_high = <int*> malloc(f_sent_len*sizeof(int))             # <<<<<<<<<<<<<<
@@ -57333,7 +57333,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_f_links_high = ((int *)malloc((__pyx_v_f_sent_len * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1521
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1521
  *         f_links_low = <int*> malloc(f_sent_len*sizeof(int))
  *         f_links_high = <int*> malloc(f_sent_len*sizeof(int))
  *         f_gap_low = <int*> malloc((num_chunks+1)*sizeof(int))             # <<<<<<<<<<<<<<
@@ -57342,7 +57342,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_f_gap_low = ((int *)malloc(((__pyx_v_num_chunks + 1) * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1522
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1522
  *         f_links_high = <int*> malloc(f_sent_len*sizeof(int))
  *         f_gap_low = <int*> malloc((num_chunks+1)*sizeof(int))
  *         f_gap_high = <int*> malloc((num_chunks+1)*sizeof(int))             # <<<<<<<<<<<<<<
@@ -57351,7 +57351,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_f_gap_high = ((int *)malloc(((__pyx_v_num_chunks + 1) * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1523
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1523
  *         f_gap_low = <int*> malloc((num_chunks+1)*sizeof(int))
  *         f_gap_high = <int*> malloc((num_chunks+1)*sizeof(int))
  *         e_gap_low = <int*> malloc((num_chunks+1)*sizeof(int))             # <<<<<<<<<<<<<<
@@ -57360,7 +57360,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_e_gap_low = ((int *)malloc(((__pyx_v_num_chunks + 1) * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1524
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1524
  *         f_gap_high = <int*> malloc((num_chunks+1)*sizeof(int))
  *         e_gap_low = <int*> malloc((num_chunks+1)*sizeof(int))
  *         e_gap_high = <int*> malloc((num_chunks+1)*sizeof(int))             # <<<<<<<<<<<<<<
@@ -57369,7 +57369,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_e_gap_high = ((int *)malloc(((__pyx_v_num_chunks + 1) * (sizeof(int)))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1525
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1525
  *         e_gap_low = <int*> malloc((num_chunks+1)*sizeof(int))
  *         e_gap_high = <int*> malloc((num_chunks+1)*sizeof(int))
  *         memset(f_gap_low, 0, (num_chunks+1)*sizeof(int))             # <<<<<<<<<<<<<<
@@ -57378,7 +57378,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   memset(__pyx_v_f_gap_low, 0, ((__pyx_v_num_chunks + 1) * (sizeof(int))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1526
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1526
  *         e_gap_high = <int*> malloc((num_chunks+1)*sizeof(int))
  *         memset(f_gap_low, 0, (num_chunks+1)*sizeof(int))
  *         memset(f_gap_high, 0, (num_chunks+1)*sizeof(int))             # <<<<<<<<<<<<<<
@@ -57387,7 +57387,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   memset(__pyx_v_f_gap_high, 0, ((__pyx_v_num_chunks + 1) * (sizeof(int))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1527
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1527
  *         memset(f_gap_low, 0, (num_chunks+1)*sizeof(int))
  *         memset(f_gap_high, 0, (num_chunks+1)*sizeof(int))
  *         memset(e_gap_low, 0, (num_chunks+1)*sizeof(int))             # <<<<<<<<<<<<<<
@@ -57396,7 +57396,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   memset(__pyx_v_e_gap_low, 0, ((__pyx_v_num_chunks + 1) * (sizeof(int))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1528
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1528
  *         memset(f_gap_high, 0, (num_chunks+1)*sizeof(int))
  *         memset(e_gap_low, 0, (num_chunks+1)*sizeof(int))
  *         memset(e_gap_high, 0, (num_chunks+1)*sizeof(int))             # <<<<<<<<<<<<<<
@@ -57405,7 +57405,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   memset(__pyx_v_e_gap_high, 0, ((__pyx_v_num_chunks + 1) * (sizeof(int))));
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1530
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1530
  *         memset(e_gap_high, 0, (num_chunks+1)*sizeof(int))
  * 
  *         reason_for_failure = ""             # <<<<<<<<<<<<<<
@@ -57415,7 +57415,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   __Pyx_INCREF(__pyx_kp_s__32);
   __pyx_v_reason_for_failure = __pyx_kp_s__32;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1532
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1532
  *         reason_for_failure = ""
  * 
  *         for i from 0 <= i < e_sent_len:             # <<<<<<<<<<<<<<
@@ -57425,7 +57425,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   __pyx_t_2 = __pyx_v_e_sent_len;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1533
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1533
  * 
  *         for i from 0 <= i < e_sent_len:
  *             e_links_low[i] = -1             # <<<<<<<<<<<<<<
@@ -57434,7 +57434,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
     (__pyx_v_e_links_low[__pyx_v_i]) = -1;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1534
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1534
  *         for i from 0 <= i < e_sent_len:
  *             e_links_low[i] = -1
  *             e_links_high[i] = -1             # <<<<<<<<<<<<<<
@@ -57444,7 +57444,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     (__pyx_v_e_links_high[__pyx_v_i]) = -1;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1535
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1535
  *             e_links_low[i] = -1
  *             e_links_high[i] = -1
  *         for i from 0 <= i < f_sent_len:             # <<<<<<<<<<<<<<
@@ -57454,7 +57454,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   __pyx_t_2 = __pyx_v_f_sent_len;
   for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1536
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1536
  *             e_links_high[i] = -1
  *         for i from 0 <= i < f_sent_len:
  *             f_links_low[i] = -1             # <<<<<<<<<<<<<<
@@ -57463,7 +57463,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
     (__pyx_v_f_links_low[__pyx_v_i]) = -1;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1537
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1537
  *         for i from 0 <= i < f_sent_len:
  *             f_links_low[i] = -1
  *             f_links_high[i] = -1             # <<<<<<<<<<<<<<
@@ -57473,7 +57473,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     (__pyx_v_f_links_high[__pyx_v_i]) = -1;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1543
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1543
  *         # links that we care about (but then how to look up
  *         # when we want to check something on the e side?)
  *         i = 0             # <<<<<<<<<<<<<<
@@ -57482,7 +57482,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_i = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1544
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1544
  *         # when we want to check something on the e side?)
  *         i = 0
  *         while i < num_links*2:             # <<<<<<<<<<<<<<
@@ -57493,7 +57493,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     __pyx_t_8 = ((__pyx_v_i < (__pyx_v_num_links * 2)) != 0);
     if (!__pyx_t_8) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1545
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1545
  *         i = 0
  *         while i < num_links*2:
  *             f_i = sent_links[i]             # <<<<<<<<<<<<<<
@@ -57502,7 +57502,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
     __pyx_v_f_i = (__pyx_v_sent_links[__pyx_v_i]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1546
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1546
  *         while i < num_links*2:
  *             f_i = sent_links[i]
  *             e_i = sent_links[i+1]             # <<<<<<<<<<<<<<
@@ -57511,7 +57511,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
     __pyx_v_e_i = (__pyx_v_sent_links[(__pyx_v_i + 1)]);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1547
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1547
  *             f_i = sent_links[i]
  *             e_i = sent_links[i+1]
  *             if f_links_low[f_i] == -1 or f_links_low[f_i] > e_i:             # <<<<<<<<<<<<<<
@@ -57527,7 +57527,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     }
     if (__pyx_t_10) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1548
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1548
  *             e_i = sent_links[i+1]
  *             if f_links_low[f_i] == -1 or f_links_low[f_i] > e_i:
  *                 f_links_low[f_i] = e_i             # <<<<<<<<<<<<<<
@@ -57539,7 +57539,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     }
     __pyx_L14:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1549
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1549
  *             if f_links_low[f_i] == -1 or f_links_low[f_i] > e_i:
  *                 f_links_low[f_i] = e_i
  *             if f_links_high[f_i] == -1 or f_links_high[f_i] < e_i + 1:             # <<<<<<<<<<<<<<
@@ -57555,7 +57555,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     }
     if (__pyx_t_9) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1550
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1550
  *                 f_links_low[f_i] = e_i
  *             if f_links_high[f_i] == -1 or f_links_high[f_i] < e_i + 1:
  *                 f_links_high[f_i] = e_i + 1             # <<<<<<<<<<<<<<
@@ -57567,7 +57567,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     }
     __pyx_L15:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1551
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1551
  *             if f_links_high[f_i] == -1 or f_links_high[f_i] < e_i + 1:
  *                 f_links_high[f_i] = e_i + 1
  *             if e_links_low[e_i] == -1 or e_links_low[e_i] > f_i:             # <<<<<<<<<<<<<<
@@ -57583,7 +57583,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     }
     if (__pyx_t_8) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1552
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1552
  *                 f_links_high[f_i] = e_i + 1
  *             if e_links_low[e_i] == -1 or e_links_low[e_i] > f_i:
  *                 e_links_low[e_i] = f_i             # <<<<<<<<<<<<<<
@@ -57595,7 +57595,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     }
     __pyx_L16:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1553
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1553
  *             if e_links_low[e_i] == -1 or e_links_low[e_i] > f_i:
  *                 e_links_low[e_i] = f_i
  *             if e_links_high[e_i] == -1 or e_links_high[e_i] < f_i + 1:             # <<<<<<<<<<<<<<
@@ -57611,7 +57611,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     }
     if (__pyx_t_10) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1554
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1554
  *                 e_links_low[e_i] = f_i
  *             if e_links_high[e_i] == -1 or e_links_high[e_i] < f_i + 1:
  *                 e_links_high[e_i] = f_i + 1             # <<<<<<<<<<<<<<
@@ -57623,7 +57623,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     }
     __pyx_L17:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1555
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1555
  *             if e_links_high[e_i] == -1 or e_links_high[e_i] < f_i + 1:
  *                 e_links_high[e_i] = f_i + 1
  *             i = i + 2             # <<<<<<<<<<<<<<
@@ -57633,7 +57633,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     __pyx_v_i = (__pyx_v_i + 2);
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1557
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1557
  *             i = i + 2
  * 
  *         als = []             # <<<<<<<<<<<<<<
@@ -57645,7 +57645,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   __pyx_v_als = ((PyObject*)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1558
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1558
  * 
  *         als = []
  *         for x in range(matching.start,matching.end):             # <<<<<<<<<<<<<<
@@ -57656,7 +57656,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   for (__pyx_t_4 = __pyx_v_matching->start; __pyx_t_4 < __pyx_t_2; __pyx_t_4+=1) {
     __pyx_v_x = __pyx_t_4;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1559
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1559
  *         als = []
  *         for x in range(matching.start,matching.end):
  *             al = (matching.arr[x]-f_sent_start,f_links_low[matching.arr[x]-f_sent_start])             # <<<<<<<<<<<<<<
@@ -57678,7 +57678,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     __Pyx_XDECREF_SET(__pyx_v_al, ((PyObject*)__pyx_t_11));
     __pyx_t_11 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1560
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1560
  *         for x in range(matching.start,matching.end):
  *             al = (matching.arr[x]-f_sent_start,f_links_low[matching.arr[x]-f_sent_start])
  *             als.append(al)             # <<<<<<<<<<<<<<
@@ -57688,7 +57688,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     __pyx_t_7 = __Pyx_PyList_Append(__pyx_v_als, __pyx_v_al); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1560; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1562
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1562
  *             als.append(al)
  *         # check all source-side alignment constraints
  *         met_constraints = 1             # <<<<<<<<<<<<<<
@@ -57697,7 +57697,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_met_constraints = 1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1563
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1563
  *         # check all source-side alignment constraints
  *         met_constraints = 1
  *         if self.require_aligned_terminal:             # <<<<<<<<<<<<<<
@@ -57707,7 +57707,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   __pyx_t_10 = (__pyx_v_self->require_aligned_terminal != 0);
   if (__pyx_t_10) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1564
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1564
  *         met_constraints = 1
  *         if self.require_aligned_terminal:
  *             num_aligned_chunks = 0             # <<<<<<<<<<<<<<
@@ -57716,7 +57716,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
     __pyx_v_num_aligned_chunks = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1565
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1565
  *         if self.require_aligned_terminal:
  *             num_aligned_chunks = 0
  *             for i from 0 <= i < num_chunks:             # <<<<<<<<<<<<<<
@@ -57726,7 +57726,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     __pyx_t_2 = __pyx_v_num_chunks;
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1566
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1566
  *             num_aligned_chunks = 0
  *             for i from 0 <= i < num_chunks:
  *                 for j from 0 <= j < chunklen[i]:             # <<<<<<<<<<<<<<
@@ -57736,7 +57736,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       __pyx_t_4 = (__pyx_v_chunklen[__pyx_v_i]);
       for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_4; __pyx_v_j++) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1567
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1567
  *             for i from 0 <= i < num_chunks:
  *                 for j from 0 <= j < chunklen[i]:
  *                     if f_links_low[matching.arr[matching.start+i]+j-f_sent_start] > -1:             # <<<<<<<<<<<<<<
@@ -57746,7 +57746,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __pyx_t_10 = (((__pyx_v_f_links_low[(((__pyx_v_matching->arr[(__pyx_v_matching->start + __pyx_v_i)]) + __pyx_v_j) - __pyx_v_f_sent_start)]) > -1) != 0);
         if (__pyx_t_10) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1568
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1568
  *                 for j from 0 <= j < chunklen[i]:
  *                     if f_links_low[matching.arr[matching.start+i]+j-f_sent_start] > -1:
  *                         num_aligned_chunks = num_aligned_chunks + 1             # <<<<<<<<<<<<<<
@@ -57755,7 +57755,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
           __pyx_v_num_aligned_chunks = (__pyx_v_num_aligned_chunks + 1);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1569
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1569
  *                     if f_links_low[matching.arr[matching.start+i]+j-f_sent_start] > -1:
  *                         num_aligned_chunks = num_aligned_chunks + 1
  *                         break             # <<<<<<<<<<<<<<
@@ -57768,7 +57768,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       __pyx_L24_break:;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1570
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1570
  *                         num_aligned_chunks = num_aligned_chunks + 1
  *                         break
  *             if num_aligned_chunks == 0:             # <<<<<<<<<<<<<<
@@ -57778,7 +57778,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     __pyx_t_10 = ((__pyx_v_num_aligned_chunks == 0) != 0);
     if (__pyx_t_10) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1571
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1571
  *                         break
  *             if num_aligned_chunks == 0:
  *                 reason_for_failure = "No aligned terminals"             # <<<<<<<<<<<<<<
@@ -57788,7 +57788,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       __Pyx_INCREF(__pyx_kp_s_No_aligned_terminals);
       __Pyx_DECREF_SET(__pyx_v_reason_for_failure, __pyx_kp_s_No_aligned_terminals);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1572
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1572
  *             if num_aligned_chunks == 0:
  *                 reason_for_failure = "No aligned terminals"
  *                 met_constraints = 0             # <<<<<<<<<<<<<<
@@ -57800,7 +57800,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     }
     __pyx_L26:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1573
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1573
  *                 reason_for_failure = "No aligned terminals"
  *                 met_constraints = 0
  *             if self.require_aligned_chunks and num_aligned_chunks < num_chunks:             # <<<<<<<<<<<<<<
@@ -57815,7 +57815,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     }
     if (__pyx_t_8) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1574
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1574
  *                 met_constraints = 0
  *             if self.require_aligned_chunks and num_aligned_chunks < num_chunks:
  *                 reason_for_failure = "Unaligned chunk"             # <<<<<<<<<<<<<<
@@ -57825,7 +57825,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       __Pyx_INCREF(__pyx_kp_s_Unaligned_chunk);
       __Pyx_DECREF_SET(__pyx_v_reason_for_failure, __pyx_kp_s_Unaligned_chunk);
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1575
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1575
  *             if self.require_aligned_chunks and num_aligned_chunks < num_chunks:
  *                 reason_for_failure = "Unaligned chunk"
  *                 met_constraints = 0             # <<<<<<<<<<<<<<
@@ -57840,7 +57840,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   }
   __pyx_L20:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1577
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1577
  *                 met_constraints = 0
  * 
  *         if met_constraints and self.tight_phrases:             # <<<<<<<<<<<<<<
@@ -57855,7 +57855,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   }
   if (__pyx_t_10) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1579
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1579
  *         if met_constraints and self.tight_phrases:
  *             # outside edge constraints are checked later
  *             for i from 0 <= i < num_chunks-1:             # <<<<<<<<<<<<<<
@@ -57865,7 +57865,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     __pyx_t_12 = (__pyx_v_num_chunks - 1);
     for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_12; __pyx_v_i++) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1580
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1580
  *             # outside edge constraints are checked later
  *             for i from 0 <= i < num_chunks-1:
  *                 if f_links_low[matching.arr[matching.start+i]+chunklen[i]-f_sent_start] == -1:             # <<<<<<<<<<<<<<
@@ -57875,7 +57875,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       __pyx_t_10 = (((__pyx_v_f_links_low[(((__pyx_v_matching->arr[(__pyx_v_matching->start + __pyx_v_i)]) + (__pyx_v_chunklen[__pyx_v_i])) - __pyx_v_f_sent_start)]) == -1) != 0);
       if (__pyx_t_10) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1581
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1581
  *             for i from 0 <= i < num_chunks-1:
  *                 if f_links_low[matching.arr[matching.start+i]+chunklen[i]-f_sent_start] == -1:
  *                     reason_for_failure = "Gaps are not tight phrases"             # <<<<<<<<<<<<<<
@@ -57885,7 +57885,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __Pyx_INCREF(__pyx_kp_s_Gaps_are_not_tight_phrases);
         __Pyx_DECREF_SET(__pyx_v_reason_for_failure, __pyx_kp_s_Gaps_are_not_tight_phrases);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1582
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1582
  *                 if f_links_low[matching.arr[matching.start+i]+chunklen[i]-f_sent_start] == -1:
  *                     reason_for_failure = "Gaps are not tight phrases"
  *                     met_constraints = 0             # <<<<<<<<<<<<<<
@@ -57894,7 +57894,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         __pyx_v_met_constraints = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1583
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1583
  *                     reason_for_failure = "Gaps are not tight phrases"
  *                     met_constraints = 0
  *                     break             # <<<<<<<<<<<<<<
@@ -57904,7 +57904,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         goto __pyx_L30_break;
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1584
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1584
  *                     met_constraints = 0
  *                     break
  *                 if f_links_low[matching.arr[matching.start+i+1]-1-f_sent_start] == -1:             # <<<<<<<<<<<<<<
@@ -57914,7 +57914,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       __pyx_t_10 = (((__pyx_v_f_links_low[(((__pyx_v_matching->arr[((__pyx_v_matching->start + __pyx_v_i) + 1)]) - 1) - __pyx_v_f_sent_start)]) == -1) != 0);
       if (__pyx_t_10) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1585
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1585
  *                     break
  *                 if f_links_low[matching.arr[matching.start+i+1]-1-f_sent_start] == -1:
  *                     reason_for_failure = "Gaps are not tight phrases"             # <<<<<<<<<<<<<<
@@ -57924,7 +57924,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __Pyx_INCREF(__pyx_kp_s_Gaps_are_not_tight_phrases);
         __Pyx_DECREF_SET(__pyx_v_reason_for_failure, __pyx_kp_s_Gaps_are_not_tight_phrases);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1586
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1586
  *                 if f_links_low[matching.arr[matching.start+i+1]-1-f_sent_start] == -1:
  *                     reason_for_failure = "Gaps are not tight phrases"
  *                     met_constraints = 0             # <<<<<<<<<<<<<<
@@ -57933,7 +57933,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         __pyx_v_met_constraints = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1587
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1587
  *                     reason_for_failure = "Gaps are not tight phrases"
  *                     met_constraints = 0
  *                     break             # <<<<<<<<<<<<<<
@@ -57948,7 +57948,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   }
   __pyx_L28:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1589
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1589
  *                     break
  * 
  *         f_low = matching.arr[matching.start] - f_sent_start             # <<<<<<<<<<<<<<
@@ -57957,7 +57957,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_f_low = ((__pyx_v_matching->arr[__pyx_v_matching->start]) - __pyx_v_f_sent_start);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1590
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1590
  * 
  *         f_low = matching.arr[matching.start] - f_sent_start
  *         f_high = matching.arr[matching.start + matching.size - 1] + chunklen[num_chunks-1] - f_sent_start             # <<<<<<<<<<<<<<
@@ -57966,7 +57966,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   __pyx_v_f_high = (((__pyx_v_matching->arr[((__pyx_v_matching->start + __pyx_v_matching->size) - 1)]) + (__pyx_v_chunklen[(__pyx_v_num_chunks - 1)])) - __pyx_v_f_sent_start);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1591
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1591
  *         f_low = matching.arr[matching.start] - f_sent_start
  *         f_high = matching.arr[matching.start + matching.size - 1] + chunklen[num_chunks-1] - f_sent_start
  *         if met_constraints:             # <<<<<<<<<<<<<<
@@ -57976,7 +57976,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   __pyx_t_10 = (__pyx_v_met_constraints != 0);
   if (__pyx_t_10) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1593
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1593
  *         if met_constraints:
  * 
  *             if self.find_fixpoint(f_low, f_high, f_links_low, f_links_high, e_links_low, e_links_high,             # <<<<<<<<<<<<<<
@@ -57986,7 +57986,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     __pyx_t_11 = __Pyx_PyInt_From_int(__pyx_v_f_high); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1593; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_11);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1597
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1597
  *                                 self.train_max_initial_size, self.train_max_initial_size,
  *                                 self.train_min_gap_size, 0,
  *                                 self.max_nonterminals - num_chunks + 1, 1, 1, 0, 0):             # <<<<<<<<<<<<<<
@@ -57997,7 +57997,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
     if (__pyx_t_10) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1598
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1598
  *                                 self.train_min_gap_size, 0,
  *                                 self.max_nonterminals - num_chunks + 1, 1, 1, 0, 0):
  *                 gap_error = 0             # <<<<<<<<<<<<<<
@@ -58006,7 +58006,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
       __pyx_v_gap_error = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1599
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1599
  *                                 self.max_nonterminals - num_chunks + 1, 1, 1, 0, 0):
  *                 gap_error = 0
  *                 num_gaps = 0             # <<<<<<<<<<<<<<
@@ -58015,7 +58015,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
       __pyx_v_num_gaps = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1601
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1601
  *                 num_gaps = 0
  * 
  *                 if f_back_low < f_low:             # <<<<<<<<<<<<<<
@@ -58025,7 +58025,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       __pyx_t_10 = ((__pyx_v_f_back_low < __pyx_v_f_low) != 0);
       if (__pyx_t_10) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1602
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1602
  * 
  *                 if f_back_low < f_low:
  *                     f_gap_low[0] = f_back_low             # <<<<<<<<<<<<<<
@@ -58034,7 +58034,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         (__pyx_v_f_gap_low[0]) = __pyx_v_f_back_low;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1603
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1603
  *                 if f_back_low < f_low:
  *                     f_gap_low[0] = f_back_low
  *                     f_gap_high[0] = f_low             # <<<<<<<<<<<<<<
@@ -58043,7 +58043,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         (__pyx_v_f_gap_high[0]) = __pyx_v_f_low;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1604
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1604
  *                     f_gap_low[0] = f_back_low
  *                     f_gap_high[0] = f_low
  *                     num_gaps = 1             # <<<<<<<<<<<<<<
@@ -58052,7 +58052,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         __pyx_v_num_gaps = 1;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1605
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1605
  *                     f_gap_high[0] = f_low
  *                     num_gaps = 1
  *                     gap_start = 0             # <<<<<<<<<<<<<<
@@ -58061,7 +58061,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         __pyx_v_gap_start = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1606
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1606
  *                     num_gaps = 1
  *                     gap_start = 0
  *                     phrase_len = phrase_len+1             # <<<<<<<<<<<<<<
@@ -58070,7 +58070,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         __pyx_v_phrase_len = (__pyx_v_phrase_len + 1);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1607
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1607
  *                     gap_start = 0
  *                     phrase_len = phrase_len+1
  *                     if phrase_len > self.max_length:             # <<<<<<<<<<<<<<
@@ -58080,7 +58080,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __pyx_t_10 = ((__pyx_v_phrase_len > __pyx_v_self->max_length) != 0);
         if (__pyx_t_10) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1608
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1608
  *                     phrase_len = phrase_len+1
  *                     if phrase_len > self.max_length:
  *                         gap_error = 1             # <<<<<<<<<<<<<<
@@ -58092,7 +58092,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         }
         __pyx_L36:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1609
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1609
  *                     if phrase_len > self.max_length:
  *                         gap_error = 1
  *                     if self.tight_phrases:             # <<<<<<<<<<<<<<
@@ -58102,7 +58102,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __pyx_t_10 = (__pyx_v_self->tight_phrases != 0);
         if (__pyx_t_10) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1610
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1610
  *                         gap_error = 1
  *                     if self.tight_phrases:
  *                         if f_links_low[f_back_low] == -1 or f_links_low[f_low-1] == -1:             # <<<<<<<<<<<<<<
@@ -58118,7 +58118,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           }
           if (__pyx_t_9) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1611
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1611
  *                     if self.tight_phrases:
  *                         if f_links_low[f_back_low] == -1 or f_links_low[f_low-1] == -1:
  *                             gap_error = 1             # <<<<<<<<<<<<<<
@@ -58127,7 +58127,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             __pyx_v_gap_error = 1;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1612
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1612
  *                         if f_links_low[f_back_low] == -1 or f_links_low[f_low-1] == -1:
  *                             gap_error = 1
  *                             reason_for_failure = "Inside edges of preceding subphrase are not tight"             # <<<<<<<<<<<<<<
@@ -58146,7 +58146,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       }
       /*else*/ {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1614
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1614
  *                             reason_for_failure = "Inside edges of preceding subphrase are not tight"
  *                 else:
  *                     gap_start = 1             # <<<<<<<<<<<<<<
@@ -58155,7 +58155,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         __pyx_v_gap_start = 1;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1615
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1615
  *                 else:
  *                     gap_start = 1
  *                     if self.tight_phrases and f_links_low[f_low] == -1:             # <<<<<<<<<<<<<<
@@ -58170,7 +58170,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         }
         if (__pyx_t_10) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1618
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1618
  *                         # this is not a hard error.    we can't extract this phrase
  *                         # but we still might be able to extract a superphrase
  *                         met_constraints = 0             # <<<<<<<<<<<<<<
@@ -58184,7 +58184,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       }
       __pyx_L35:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1620
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1620
  *                         met_constraints = 0
  * 
  *                 for i from 0 <= i < matching.size - 1:             # <<<<<<<<<<<<<<
@@ -58194,7 +58194,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       __pyx_t_12 = (__pyx_v_matching->size - 1);
       for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_12; __pyx_v_i++) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1621
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1621
  * 
  *                 for i from 0 <= i < matching.size - 1:
  *                     f_gap_low[1+i] = matching.arr[matching.start+i] + chunklen[i] - f_sent_start             # <<<<<<<<<<<<<<
@@ -58203,7 +58203,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         (__pyx_v_f_gap_low[(1 + __pyx_v_i)]) = (((__pyx_v_matching->arr[(__pyx_v_matching->start + __pyx_v_i)]) + (__pyx_v_chunklen[__pyx_v_i])) - __pyx_v_f_sent_start);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1622
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1622
  *                 for i from 0 <= i < matching.size - 1:
  *                     f_gap_low[1+i] = matching.arr[matching.start+i] + chunklen[i] - f_sent_start
  *                     f_gap_high[1+i] = matching.arr[matching.start+i+1] - f_sent_start             # <<<<<<<<<<<<<<
@@ -58212,7 +58212,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         (__pyx_v_f_gap_high[(1 + __pyx_v_i)]) = ((__pyx_v_matching->arr[((__pyx_v_matching->start + __pyx_v_i) + 1)]) - __pyx_v_f_sent_start);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1623
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1623
  *                     f_gap_low[1+i] = matching.arr[matching.start+i] + chunklen[i] - f_sent_start
  *                     f_gap_high[1+i] = matching.arr[matching.start+i+1] - f_sent_start
  *                     num_gaps = num_gaps + 1             # <<<<<<<<<<<<<<
@@ -58222,7 +58222,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __pyx_v_num_gaps = (__pyx_v_num_gaps + 1);
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1625
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1625
  *                     num_gaps = num_gaps + 1
  * 
  *                 if f_high < f_back_high:             # <<<<<<<<<<<<<<
@@ -58232,7 +58232,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       __pyx_t_10 = ((__pyx_v_f_high < __pyx_v_f_back_high) != 0);
       if (__pyx_t_10) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1626
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1626
  * 
  *                 if f_high < f_back_high:
  *                     f_gap_low[gap_start+num_gaps] = f_high             # <<<<<<<<<<<<<<
@@ -58241,7 +58241,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         (__pyx_v_f_gap_low[(__pyx_v_gap_start + __pyx_v_num_gaps)]) = __pyx_v_f_high;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1627
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1627
  *                 if f_high < f_back_high:
  *                     f_gap_low[gap_start+num_gaps] = f_high
  *                     f_gap_high[gap_start+num_gaps] = f_back_high             # <<<<<<<<<<<<<<
@@ -58250,7 +58250,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         (__pyx_v_f_gap_high[(__pyx_v_gap_start + __pyx_v_num_gaps)]) = __pyx_v_f_back_high;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1628
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1628
  *                     f_gap_low[gap_start+num_gaps] = f_high
  *                     f_gap_high[gap_start+num_gaps] = f_back_high
  *                     num_gaps = num_gaps + 1             # <<<<<<<<<<<<<<
@@ -58259,7 +58259,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         __pyx_v_num_gaps = (__pyx_v_num_gaps + 1);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1629
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1629
  *                     f_gap_high[gap_start+num_gaps] = f_back_high
  *                     num_gaps = num_gaps + 1
  *                     phrase_len = phrase_len+1             # <<<<<<<<<<<<<<
@@ -58268,7 +58268,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         __pyx_v_phrase_len = (__pyx_v_phrase_len + 1);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1630
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1630
  *                     num_gaps = num_gaps + 1
  *                     phrase_len = phrase_len+1
  *                     if phrase_len > self.max_length:             # <<<<<<<<<<<<<<
@@ -58278,7 +58278,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __pyx_t_10 = ((__pyx_v_phrase_len > __pyx_v_self->max_length) != 0);
         if (__pyx_t_10) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1631
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1631
  *                     phrase_len = phrase_len+1
  *                     if phrase_len > self.max_length:
  *                         gap_error = 1             # <<<<<<<<<<<<<<
@@ -58290,7 +58290,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         }
         __pyx_L43:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1632
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1632
  *                     if phrase_len > self.max_length:
  *                         gap_error = 1
  *                     if self.tight_phrases:             # <<<<<<<<<<<<<<
@@ -58300,7 +58300,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __pyx_t_10 = (__pyx_v_self->tight_phrases != 0);
         if (__pyx_t_10) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1633
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1633
  *                         gap_error = 1
  *                     if self.tight_phrases:
  *                         if f_links_low[f_back_high-1] == -1 or f_links_low[f_high] == -1:             # <<<<<<<<<<<<<<
@@ -58316,7 +58316,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           }
           if (__pyx_t_8) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1634
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1634
  *                     if self.tight_phrases:
  *                         if f_links_low[f_back_high-1] == -1 or f_links_low[f_high] == -1:
  *                             gap_error = 1             # <<<<<<<<<<<<<<
@@ -58325,7 +58325,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             __pyx_v_gap_error = 1;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1635
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1635
  *                         if f_links_low[f_back_high-1] == -1 or f_links_low[f_high] == -1:
  *                             gap_error = 1
  *                             reason_for_failure = "Inside edges of following subphrase are not tight"             # <<<<<<<<<<<<<<
@@ -58344,7 +58344,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       }
       /*else*/ {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1637
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1637
  *                             reason_for_failure = "Inside edges of following subphrase are not tight"
  *                 else:
  *                     if self.tight_phrases and f_links_low[f_high-1] == -1:             # <<<<<<<<<<<<<<
@@ -58359,7 +58359,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         }
         if (__pyx_t_10) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1638
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1638
  *                 else:
  *                     if self.tight_phrases and f_links_low[f_high-1] == -1:
  *                         met_constraints = 0             # <<<<<<<<<<<<<<
@@ -58373,7 +58373,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       }
       __pyx_L42:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1640
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1640
  *                         met_constraints = 0
  * 
  *                 if gap_error == 0:             # <<<<<<<<<<<<<<
@@ -58383,7 +58383,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       __pyx_t_10 = ((__pyx_v_gap_error == 0) != 0);
       if (__pyx_t_10) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1641
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1641
  * 
  *                 if gap_error == 0:
  *                     e_word_count = e_high - e_low             # <<<<<<<<<<<<<<
@@ -58392,7 +58392,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         __pyx_v_e_word_count = (__pyx_v_e_high - __pyx_v_e_low);
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1642
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1642
  *                 if gap_error == 0:
  *                     e_word_count = e_high - e_low
  *                     for i from 0 <= i < num_gaps: # check integrity of subphrases             # <<<<<<<<<<<<<<
@@ -58402,7 +58402,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __pyx_t_2 = __pyx_v_num_gaps;
         for (__pyx_v_i = 0; __pyx_v_i < __pyx_t_2; __pyx_v_i++) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1643
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1643
  *                     e_word_count = e_high - e_low
  *                     for i from 0 <= i < num_gaps: # check integrity of subphrases
  *                         if self.find_fixpoint(f_gap_low[gap_start+i], f_gap_high[gap_start+i],             # <<<<<<<<<<<<<<
@@ -58412,7 +58412,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           __pyx_t_11 = __Pyx_PyInt_From_int((__pyx_v_f_gap_high[(__pyx_v_gap_start + __pyx_v_i)])); if (unlikely(!__pyx_t_11)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1643; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
           __Pyx_GOTREF(__pyx_t_11);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1649
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1649
  *                                             f_sent_len, e_sent_len,
  *                                             self.train_max_initial_size, self.train_max_initial_size,
  *                                             0, 0, 0, 0, 0, 0, 0) == 0:             # <<<<<<<<<<<<<<
@@ -58423,7 +58423,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
           if (__pyx_t_10) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1650
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1650
  *                                             self.train_max_initial_size, self.train_max_initial_size,
  *                                             0, 0, 0, 0, 0, 0, 0) == 0:
  *                             gap_error = 1             # <<<<<<<<<<<<<<
@@ -58432,7 +58432,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             __pyx_v_gap_error = 1;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1651
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1651
  *                                             0, 0, 0, 0, 0, 0, 0) == 0:
  *                             gap_error = 1
  *                             reason_for_failure = "Subphrase [%d, %d] failed integrity check" % (f_gap_low[gap_start+i], f_gap_high[gap_start+i])             # <<<<<<<<<<<<<<
@@ -58457,7 +58457,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             __Pyx_DECREF_SET(__pyx_v_reason_for_failure, __pyx_t_1);
             __pyx_t_1 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1652
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1652
  *                             gap_error = 1
  *                             reason_for_failure = "Subphrase [%d, %d] failed integrity check" % (f_gap_low[gap_start+i], f_gap_high[gap_start+i])
  *                             break             # <<<<<<<<<<<<<<
@@ -58472,7 +58472,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       }
       __pyx_L47:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1654
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1654
  *                             break
  * 
  *                 if gap_error == 0:             # <<<<<<<<<<<<<<
@@ -58482,7 +58482,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
       __pyx_t_10 = ((__pyx_v_gap_error == 0) != 0);
       if (__pyx_t_10) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1655
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1655
  * 
  *                 if gap_error == 0:
  *                     i = 1             # <<<<<<<<<<<<<<
@@ -58491,7 +58491,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
         __pyx_v_i = 1;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1656
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1656
  *                 if gap_error == 0:
  *                     i = 1
  *                     self.findexes.reset()             # <<<<<<<<<<<<<<
@@ -58505,7 +58505,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
         __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1657
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1657
  *                     i = 1
  *                     self.findexes.reset()
  *                     if f_back_low < f_low:             # <<<<<<<<<<<<<<
@@ -58515,7 +58515,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __pyx_t_10 = ((__pyx_v_f_back_low < __pyx_v_f_low) != 0);
         if (__pyx_t_10) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1658
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1658
  *                     self.findexes.reset()
  *                     if f_back_low < f_low:
  *                         fphr_arr._append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -58524,7 +58524,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
           ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_append(__pyx_v_fphr_arr, __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_v_self->category, __pyx_v_i));
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1659
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1659
  *                     if f_back_low < f_low:
  *                         fphr_arr._append(sym_setindex(self.category, i))
  *                         i = i+1             # <<<<<<<<<<<<<<
@@ -58533,7 +58533,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
           __pyx_v_i = (__pyx_v_i + 1);
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1660
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1660
  *                         fphr_arr._append(sym_setindex(self.category, i))
  *                         i = i+1
  *                         self.findexes.append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -58548,7 +58548,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         }
         __pyx_L52:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1661
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1661
  *                         i = i+1
  *                         self.findexes.append(sym_setindex(self.category, i))
  *                     self.findexes.extend(self.findexes1)             # <<<<<<<<<<<<<<
@@ -58568,7 +58568,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
         __Pyx_DECREF(__pyx_t_11); __pyx_t_11 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1662
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1662
  *                         self.findexes.append(sym_setindex(self.category, i))
  *                     self.findexes.extend(self.findexes1)
  *                     for j from 0 <= j < phrase.n:             # <<<<<<<<<<<<<<
@@ -58578,7 +58578,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __pyx_t_2 = __pyx_v_phrase->n;
         for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_2; __pyx_v_j++) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1663
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1663
  *                     self.findexes.extend(self.findexes1)
  *                     for j from 0 <= j < phrase.n:
  *                         if sym_isvar(phrase.syms[j]):             # <<<<<<<<<<<<<<
@@ -58588,7 +58588,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           __pyx_t_10 = (__pyx_f_4cdec_2sa_3_sa_sym_isvar((__pyx_v_phrase->syms[__pyx_v_j])) != 0);
           if (__pyx_t_10) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1664
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1664
  *                     for j from 0 <= j < phrase.n:
  *                         if sym_isvar(phrase.syms[j]):
  *                             fphr_arr._append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -58597,7 +58597,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_append(__pyx_v_fphr_arr, __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_v_self->category, __pyx_v_i));
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1665
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1665
  *                         if sym_isvar(phrase.syms[j]):
  *                             fphr_arr._append(sym_setindex(self.category, i))
  *                             i = i + 1             # <<<<<<<<<<<<<<
@@ -58609,7 +58609,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           }
           /*else*/ {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1667
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1667
  *                             i = i + 1
  *                         else:
  *                             fphr_arr._append(phrase.syms[j])             # <<<<<<<<<<<<<<
@@ -58621,7 +58621,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           __pyx_L55:;
         }
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1668
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1668
  *                         else:
  *                             fphr_arr._append(phrase.syms[j])
  *                     if f_back_high > f_high:             # <<<<<<<<<<<<<<
@@ -58631,7 +58631,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __pyx_t_10 = ((__pyx_v_f_back_high > __pyx_v_f_high) != 0);
         if (__pyx_t_10) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1669
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1669
  *                             fphr_arr._append(phrase.syms[j])
  *                     if f_back_high > f_high:
  *                         fphr_arr._append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -58640,7 +58640,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
           ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_append(__pyx_v_fphr_arr, __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_v_self->category, __pyx_v_i));
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1670
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1670
  *                     if f_back_high > f_high:
  *                         fphr_arr._append(sym_setindex(self.category, i))
  *                         self.findexes.append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -58655,7 +58655,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         }
         __pyx_L56:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1672
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1672
  *                         self.findexes.append(sym_setindex(self.category, i))
  * 
  *                     fphr = Phrase(fphr_arr)             # <<<<<<<<<<<<<<
@@ -58673,7 +58673,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __pyx_v_fphr = ((struct __pyx_obj_4cdec_2sa_3_sa_Phrase *)__pyx_t_1);
         __pyx_t_1 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1673
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1673
  * 
  *                     fphr = Phrase(fphr_arr)
  *                     if met_constraints:             # <<<<<<<<<<<<<<
@@ -58683,7 +58683,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __pyx_t_10 = (__pyx_v_met_constraints != 0);
         if (__pyx_t_10) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1674
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1674
  *                     fphr = Phrase(fphr_arr)
  *                     if met_constraints:
  *                         phrase_list = self.extract_phrases(e_low, e_high, e_gap_low + gap_start, e_gap_high + gap_start, e_links_low, num_gaps,             # <<<<<<<<<<<<<<
@@ -58695,7 +58695,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           __pyx_v_phrase_list = __pyx_t_1;
           __pyx_t_1 = 0;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1677
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1677
  *                                             f_back_low, f_back_high, f_gap_low + gap_start, f_gap_high + gap_start, f_links_low,
  *                                             matching.sent_id, e_sent_len, e_sent_start)
  *                         if len(phrase_list) > 0:             # <<<<<<<<<<<<<<
@@ -58706,7 +58706,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           __pyx_t_10 = ((__pyx_t_13 > 0) != 0);
           if (__pyx_t_10) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1678
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1678
  *                                             matching.sent_id, e_sent_len, e_sent_start)
  *                         if len(phrase_list) > 0:
  *                             pair_count = 1.0 / len(phrase_list)             # <<<<<<<<<<<<<<
@@ -58729,7 +58729,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           }
           /*else*/ {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1680
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1680
  *                             pair_count = 1.0 / len(phrase_list)
  *                         else:
  *                             pair_count = 0             # <<<<<<<<<<<<<<
@@ -58738,7 +58738,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             __pyx_v_pair_count = 0.0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1681
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1681
  *                         else:
  *                             pair_count = 0
  *                             reason_for_failure = "Didn't extract anything from [%d, %d] -> [%d, %d]" % (f_back_low, f_back_high, e_low, e_high)             # <<<<<<<<<<<<<<
@@ -58775,7 +58775,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           }
           __pyx_L58:;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1682
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1682
  *                             pair_count = 0
  *                             reason_for_failure = "Didn't extract anything from [%d, %d] -> [%d, %d]" % (f_back_low, f_back_high, e_low, e_high)
  *                         for phrase2, eindexes in phrase_list:             # <<<<<<<<<<<<<<
@@ -58872,7 +58872,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             __Pyx_XDECREF_SET(__pyx_v_eindexes, __pyx_t_11);
             __pyx_t_11 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1683
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1683
  *                             reason_for_failure = "Didn't extract anything from [%d, %d] -> [%d, %d]" % (f_back_low, f_back_high, e_low, e_high)
  *                         for phrase2, eindexes in phrase_list:
  *                             als1 = self.create_alignments(sent_links,num_links,self.findexes,eindexes)             # <<<<<<<<<<<<<<
@@ -58888,7 +58888,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             __Pyx_XDECREF_SET(__pyx_v_als1, ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_11));
             __pyx_t_11 = 0;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1684
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1684
  *                         for phrase2, eindexes in phrase_list:
  *                             als1 = self.create_alignments(sent_links,num_links,self.findexes,eindexes)
  *                             extracts.append((fphr, phrase2, pair_count, tuple(als1)))             # <<<<<<<<<<<<<<
@@ -58927,7 +58927,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         }
         __pyx_L57:;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1685
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1685
  *                             als1 = self.create_alignments(sent_links,num_links,self.findexes,eindexes)
  *                             extracts.append((fphr, phrase2, pair_count, tuple(als1)))
  *                     if (num_gaps < self.max_nonterminals and             # <<<<<<<<<<<<<<
@@ -58937,7 +58937,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         __pyx_t_10 = ((__pyx_v_num_gaps < __pyx_v_self->max_nonterminals) != 0);
         if (__pyx_t_10) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1686
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1686
  *                             extracts.append((fphr, phrase2, pair_count, tuple(als1)))
  *                     if (num_gaps < self.max_nonterminals and
  *                         phrase_len < self.max_length and             # <<<<<<<<<<<<<<
@@ -58947,7 +58947,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           __pyx_t_8 = ((__pyx_v_phrase_len < __pyx_v_self->max_length) != 0);
           if (__pyx_t_8) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1687
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1687
  *                     if (num_gaps < self.max_nonterminals and
  *                         phrase_len < self.max_length and
  *                         f_back_high - f_back_low + self.train_min_gap_size <= self.train_max_initial_size):             # <<<<<<<<<<<<<<
@@ -58965,7 +58965,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
         }
         if (__pyx_t_8) {
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1688
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1688
  *                         phrase_len < self.max_length and
  *                         f_back_high - f_back_low + self.train_min_gap_size <= self.train_max_initial_size):
  *                         if (f_back_low == f_low and             # <<<<<<<<<<<<<<
@@ -58975,7 +58975,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           __pyx_t_8 = ((__pyx_v_f_back_low == __pyx_v_f_low) != 0);
           if (__pyx_t_8) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1689
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1689
  *                         f_back_high - f_back_low + self.train_min_gap_size <= self.train_max_initial_size):
  *                         if (f_back_low == f_low and
  *                                 f_low >= self.train_min_gap_size and             # <<<<<<<<<<<<<<
@@ -58985,7 +58985,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             __pyx_t_10 = ((__pyx_v_f_low >= __pyx_v_self->train_min_gap_size) != 0);
             if (__pyx_t_10) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1690
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1690
  *                         if (f_back_low == f_low and
  *                                 f_low >= self.train_min_gap_size and
  *                                 ((not self.tight_phrases) or (f_links_low[f_low-1] != -1 and f_links_low[f_back_high-1] != -1))):             # <<<<<<<<<<<<<<
@@ -59015,7 +59015,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           }
           if (__pyx_t_10) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1691
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1691
  *                                 f_low >= self.train_min_gap_size and
  *                                 ((not self.tight_phrases) or (f_links_low[f_low-1] != -1 and f_links_low[f_back_high-1] != -1))):
  *                             f_x_low = f_low-self.train_min_gap_size             # <<<<<<<<<<<<<<
@@ -59024,7 +59024,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             __pyx_v_f_x_low = (__pyx_v_f_low - __pyx_v_self->train_min_gap_size);
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1692
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1692
  *                                 ((not self.tight_phrases) or (f_links_low[f_low-1] != -1 and f_links_low[f_back_high-1] != -1))):
  *                             f_x_low = f_low-self.train_min_gap_size
  *                             met_constraints = 1             # <<<<<<<<<<<<<<
@@ -59033,7 +59033,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             __pyx_v_met_constraints = 1;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1693
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1693
  *                             f_x_low = f_low-self.train_min_gap_size
  *                             met_constraints = 1
  *                             if self.tight_phrases:             # <<<<<<<<<<<<<<
@@ -59043,7 +59043,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             __pyx_t_10 = (__pyx_v_self->tight_phrases != 0);
             if (__pyx_t_10) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1694
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1694
  *                             met_constraints = 1
  *                             if self.tight_phrases:
  *                                 while f_x_low >= 0 and f_links_low[f_x_low] == -1:             # <<<<<<<<<<<<<<
@@ -59060,7 +59060,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 }
                 if (!__pyx_t_18) break;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1695
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1695
  *                             if self.tight_phrases:
  *                                 while f_x_low >= 0 and f_links_low[f_x_low] == -1:
  *                                     f_x_low = f_x_low - 1             # <<<<<<<<<<<<<<
@@ -59073,7 +59073,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             }
             __pyx_L65:;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1696
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1696
  *                                 while f_x_low >= 0 and f_links_low[f_x_low] == -1:
  *                                     f_x_low = f_x_low - 1
  *                             if f_x_low < 0 or f_back_high - f_x_low > self.train_max_initial_size:             # <<<<<<<<<<<<<<
@@ -59089,7 +59089,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             }
             if (__pyx_t_8) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1697
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1697
  *                                     f_x_low = f_x_low - 1
  *                             if f_x_low < 0 or f_back_high - f_x_low > self.train_max_initial_size:
  *                                 met_constraints = 0             # <<<<<<<<<<<<<<
@@ -59101,7 +59101,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             }
             __pyx_L68:;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1699
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1699
  *                                 met_constraints = 0
  * 
  *                             if (met_constraints and             # <<<<<<<<<<<<<<
@@ -59110,7 +59110,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             if ((__pyx_v_met_constraints != 0)) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1700
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1700
  * 
  *                             if (met_constraints and
  *                                 (self.find_fixpoint(f_x_low, f_back_high,             # <<<<<<<<<<<<<<
@@ -59120,7 +59120,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_14 = __Pyx_PyInt_From_int(__pyx_v_f_back_high); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1700; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
               __Pyx_GOTREF(__pyx_t_14);
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1705
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1705
  *                                             f_sent_len, e_sent_len,
  *                                             self.train_max_initial_size, self.train_max_initial_size,
  *                                             1, 1, 1, 1, 0, 1, 0) == 1) and             # <<<<<<<<<<<<<<
@@ -59131,7 +59131,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
               if (__pyx_t_8) {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1706
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1706
  *                                             self.train_max_initial_size, self.train_max_initial_size,
  *                                             1, 1, 1, 1, 0, 1, 0) == 1) and
  *                                 ((not self.tight_phrases) or f_links_low[f_x_low] != -1) and             # <<<<<<<<<<<<<<
@@ -59147,7 +59147,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 }
                 if (__pyx_t_9) {
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1707
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1707
  *                                             1, 1, 1, 1, 0, 1, 0) == 1) and
  *                                 ((not self.tight_phrases) or f_links_low[f_x_low] != -1) and
  *                                 self.find_fixpoint(f_x_low, f_low,    # check integrity of new subphrase             # <<<<<<<<<<<<<<
@@ -59157,7 +59157,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                   __pyx_t_14 = __Pyx_PyInt_From_int(__pyx_v_f_low); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1707; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
                   __Pyx_GOTREF(__pyx_t_14);
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1711
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1711
  *                                             -1, -1, e_gap_low, e_gap_high, f_gap_low, f_gap_high,
  *                                             f_sent_len, e_sent_len,
  *                                             self.train_max_initial_size, self.train_max_initial_size,             # <<<<<<<<<<<<<<
@@ -59179,7 +59179,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             }
             if (__pyx_t_8) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1713
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1713
  *                                             self.train_max_initial_size, self.train_max_initial_size,
  *                                             0, 0, 0, 0, 0, 0, 0)):
  *                                 fphr_arr._clear()             # <<<<<<<<<<<<<<
@@ -59188,7 +59188,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
               ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_clear(__pyx_v_fphr_arr);
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1714
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1714
  *                                             0, 0, 0, 0, 0, 0, 0)):
  *                                 fphr_arr._clear()
  *                                 i = 1             # <<<<<<<<<<<<<<
@@ -59197,7 +59197,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
               __pyx_v_i = 1;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1715
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1715
  *                                 fphr_arr._clear()
  *                                 i = 1
  *                                 self.findexes.reset()             # <<<<<<<<<<<<<<
@@ -59211,7 +59211,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
               __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1716
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1716
  *                                 i = 1
  *                                 self.findexes.reset()
  *                                 self.findexes.append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -59223,7 +59223,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_7 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_self->findexes), __pyx_t_15); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1716; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
               __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1717
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1717
  *                                 self.findexes.reset()
  *                                 self.findexes.append(sym_setindex(self.category, i))
  *                                 fphr_arr._append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -59232,7 +59232,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
               ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_append(__pyx_v_fphr_arr, __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_v_self->category, __pyx_v_i));
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1718
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1718
  *                                 self.findexes.append(sym_setindex(self.category, i))
  *                                 fphr_arr._append(sym_setindex(self.category, i))
  *                                 i = i+1             # <<<<<<<<<<<<<<
@@ -59241,7 +59241,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
               __pyx_v_i = (__pyx_v_i + 1);
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1719
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1719
  *                                 fphr_arr._append(sym_setindex(self.category, i))
  *                                 i = i+1
  *                                 self.findexes.extend(self.findexes1)             # <<<<<<<<<<<<<<
@@ -59261,7 +59261,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
               __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1720
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1720
  *                                 i = i+1
  *                                 self.findexes.extend(self.findexes1)
  *                                 for j from 0 <= j < phrase.n:             # <<<<<<<<<<<<<<
@@ -59271,7 +59271,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_2 = __pyx_v_phrase->n;
               for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_2; __pyx_v_j++) {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1721
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1721
  *                                 self.findexes.extend(self.findexes1)
  *                                 for j from 0 <= j < phrase.n:
  *                                     if sym_isvar(phrase.syms[j]):             # <<<<<<<<<<<<<<
@@ -59281,7 +59281,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 __pyx_t_8 = (__pyx_f_4cdec_2sa_3_sa_sym_isvar((__pyx_v_phrase->syms[__pyx_v_j])) != 0);
                 if (__pyx_t_8) {
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1722
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1722
  *                                 for j from 0 <= j < phrase.n:
  *                                     if sym_isvar(phrase.syms[j]):
  *                                         fphr_arr._append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -59290,7 +59290,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
                   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_append(__pyx_v_fphr_arr, __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_v_self->category, __pyx_v_i));
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1723
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1723
  *                                     if sym_isvar(phrase.syms[j]):
  *                                         fphr_arr._append(sym_setindex(self.category, i))
  *                                         i = i + 1             # <<<<<<<<<<<<<<
@@ -59302,7 +59302,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 }
                 /*else*/ {
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1725
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1725
  *                                         i = i + 1
  *                                     else:
  *                                         fphr_arr._append(phrase.syms[j])             # <<<<<<<<<<<<<<
@@ -59314,7 +59314,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 __pyx_L72:;
               }
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1726
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1726
  *                                     else:
  *                                         fphr_arr._append(phrase.syms[j])
  *                                 if f_back_high > f_high:             # <<<<<<<<<<<<<<
@@ -59324,7 +59324,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_8 = ((__pyx_v_f_back_high > __pyx_v_f_high) != 0);
               if (__pyx_t_8) {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1727
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1727
  *                                         fphr_arr._append(phrase.syms[j])
  *                                 if f_back_high > f_high:
  *                                     fphr_arr._append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -59333,7 +59333,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
                 ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_append(__pyx_v_fphr_arr, __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_v_self->category, __pyx_v_i));
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1728
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1728
  *                                 if f_back_high > f_high:
  *                                     fphr_arr._append(sym_setindex(self.category, i))
  *                                     self.findexes.append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -59348,7 +59348,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               }
               __pyx_L73:;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1729
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1729
  *                                     fphr_arr._append(sym_setindex(self.category, i))
  *                                     self.findexes.append(sym_setindex(self.category, i))
  *                                 fphr = Phrase(fphr_arr)             # <<<<<<<<<<<<<<
@@ -59366,7 +59366,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __Pyx_DECREF_SET(__pyx_v_fphr, ((struct __pyx_obj_4cdec_2sa_3_sa_Phrase *)__pyx_t_14));
               __pyx_t_14 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1730
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1730
  *                                     self.findexes.append(sym_setindex(self.category, i))
  *                                 fphr = Phrase(fphr_arr)
  *                                 phrase_list = self.extract_phrases(e_x_low, e_x_high, e_gap_low, e_gap_high, e_links_low, num_gaps+1,             # <<<<<<<<<<<<<<
@@ -59378,7 +59378,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __Pyx_XDECREF_SET(__pyx_v_phrase_list, __pyx_t_14);
               __pyx_t_14 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1733
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1733
  *                                                     f_x_low, f_x_high, f_gap_low, f_gap_high, f_links_low, matching.sent_id,
  *                                                     e_sent_len, e_sent_start)
  *                                 if len(phrase_list) > 0:             # <<<<<<<<<<<<<<
@@ -59389,7 +59389,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_8 = ((__pyx_t_13 > 0) != 0);
               if (__pyx_t_8) {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1734
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1734
  *                                                     e_sent_len, e_sent_start)
  *                                 if len(phrase_list) > 0:
  *                                     pair_count = 1.0 / len(phrase_list)             # <<<<<<<<<<<<<<
@@ -59412,7 +59412,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               }
               /*else*/ {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1736
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1736
  *                                     pair_count = 1.0 / len(phrase_list)
  *                                 else:
  *                                     pair_count = 0             # <<<<<<<<<<<<<<
@@ -59423,7 +59423,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               }
               __pyx_L74:;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1737
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1737
  *                                 else:
  *                                     pair_count = 0
  *                                 for phrase2, eindexes in phrase_list:             # <<<<<<<<<<<<<<
@@ -59520,7 +59520,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 __Pyx_XDECREF_SET(__pyx_v_eindexes, __pyx_t_11);
                 __pyx_t_11 = 0;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1738
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1738
  *                                     pair_count = 0
  *                                 for phrase2, eindexes in phrase_list:
  *                                     als2 = self.create_alignments(sent_links,num_links,self.findexes,eindexes)             # <<<<<<<<<<<<<<
@@ -59536,7 +59536,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 __Pyx_XDECREF_SET(__pyx_v_als2, ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_11));
                 __pyx_t_11 = 0;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1739
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1739
  *                                 for phrase2, eindexes in phrase_list:
  *                                     als2 = self.create_alignments(sent_links,num_links,self.findexes,eindexes)
  *                                     extracts.append((fphr, phrase2, pair_count, tuple(als2)))             # <<<<<<<<<<<<<<
@@ -59578,7 +59578,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           }
           __pyx_L64:;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1741
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1741
  *                                     extracts.append((fphr, phrase2, pair_count, tuple(als2)))
  * 
  *                         if (f_back_high == f_high and             # <<<<<<<<<<<<<<
@@ -59588,7 +59588,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           __pyx_t_8 = ((__pyx_v_f_back_high == __pyx_v_f_high) != 0);
           if (__pyx_t_8) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1742
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1742
  * 
  *                         if (f_back_high == f_high and
  *                             f_sent_len - f_high >= self.train_min_gap_size and             # <<<<<<<<<<<<<<
@@ -59598,7 +59598,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             __pyx_t_9 = (((__pyx_v_f_sent_len - __pyx_v_f_high) >= __pyx_v_self->train_min_gap_size) != 0);
             if (__pyx_t_9) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1743
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1743
  *                         if (f_back_high == f_high and
  *                             f_sent_len - f_high >= self.train_min_gap_size and
  *                             ((not self.tight_phrases) or (f_links_low[f_high] != -1 and f_links_low[f_back_low] != -1))):             # <<<<<<<<<<<<<<
@@ -59628,7 +59628,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           }
           if (__pyx_t_9) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1744
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1744
  *                             f_sent_len - f_high >= self.train_min_gap_size and
  *                             ((not self.tight_phrases) or (f_links_low[f_high] != -1 and f_links_low[f_back_low] != -1))):
  *                             f_x_high = f_high+self.train_min_gap_size             # <<<<<<<<<<<<<<
@@ -59637,7 +59637,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             __pyx_v_f_x_high = (__pyx_v_f_high + __pyx_v_self->train_min_gap_size);
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1745
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1745
  *                             ((not self.tight_phrases) or (f_links_low[f_high] != -1 and f_links_low[f_back_low] != -1))):
  *                             f_x_high = f_high+self.train_min_gap_size
  *                             met_constraints = 1             # <<<<<<<<<<<<<<
@@ -59646,7 +59646,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             __pyx_v_met_constraints = 1;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1746
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1746
  *                             f_x_high = f_high+self.train_min_gap_size
  *                             met_constraints = 1
  *                             if self.tight_phrases:             # <<<<<<<<<<<<<<
@@ -59656,7 +59656,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             __pyx_t_9 = (__pyx_v_self->tight_phrases != 0);
             if (__pyx_t_9) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1747
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1747
  *                             met_constraints = 1
  *                             if self.tight_phrases:
  *                                 while f_x_high <= f_sent_len and f_links_low[f_x_high-1] == -1:             # <<<<<<<<<<<<<<
@@ -59673,7 +59673,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 }
                 if (!__pyx_t_18) break;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1748
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1748
  *                             if self.tight_phrases:
  *                                 while f_x_high <= f_sent_len and f_links_low[f_x_high-1] == -1:
  *                                     f_x_high = f_x_high + 1             # <<<<<<<<<<<<<<
@@ -59686,7 +59686,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             }
             __pyx_L80:;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1749
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1749
  *                                 while f_x_high <= f_sent_len and f_links_low[f_x_high-1] == -1:
  *                                     f_x_high = f_x_high + 1
  *                             if f_x_high > f_sent_len or f_x_high - f_back_low > self.train_max_initial_size:             # <<<<<<<<<<<<<<
@@ -59702,7 +59702,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             }
             if (__pyx_t_8) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1750
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1750
  *                                     f_x_high = f_x_high + 1
  *                             if f_x_high > f_sent_len or f_x_high - f_back_low > self.train_max_initial_size:
  *                                 met_constraints = 0             # <<<<<<<<<<<<<<
@@ -59714,7 +59714,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             }
             __pyx_L83:;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1752
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1752
  *                                 met_constraints = 0
  * 
  *                             if (met_constraints and             # <<<<<<<<<<<<<<
@@ -59723,7 +59723,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             if ((__pyx_v_met_constraints != 0)) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1753
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1753
  * 
  *                             if (met_constraints and
  *                                 self.find_fixpoint(f_back_low, f_x_high,             # <<<<<<<<<<<<<<
@@ -59733,7 +59733,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_14 = __Pyx_PyInt_From_int(__pyx_v_f_x_high); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1753; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
               __Pyx_GOTREF(__pyx_t_14);
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1757
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1757
  *                                             e_low, e_high, &e_x_low, &e_x_high, &f_x_low, &f_x_high,
  *                                             f_sent_len, e_sent_len,
  *                                             self.train_max_initial_size, self.train_max_initial_size,             # <<<<<<<<<<<<<<
@@ -59743,7 +59743,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               if ((((struct __pyx_vtabstruct_4cdec_2sa_3_sa_HieroCachingRuleFactory *)__pyx_v_self->__pyx_vtab)->find_fixpoint(__pyx_v_self, __pyx_v_f_back_low, __pyx_t_14, __pyx_v_f_links_low, __pyx_v_f_links_high, __pyx_v_e_links_low, __pyx_v_e_links_high, __pyx_v_e_low, __pyx_v_e_high, (&__pyx_v_e_x_low), (&__pyx_v_e_x_high), (&__pyx_v_f_x_low), (&__pyx_v_f_x_high), __pyx_v_f_sent_len, __pyx_v_e_sent_len, __pyx_v_self->train_max_initial_size, __pyx_v_self->train_max_initial_size, 1, 1, 1, 0, 1, 1, 0) != 0)) {
                 __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1759
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1759
  *                                             self.train_max_initial_size, self.train_max_initial_size,
  *                                             1, 1, 1, 0, 1, 1, 0) and
  *                                 ((not self.tight_phrases) or f_links_low[f_x_high-1] != -1) and             # <<<<<<<<<<<<<<
@@ -59759,7 +59759,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 }
                 if (__pyx_t_9) {
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1760
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1760
  *                                             1, 1, 1, 0, 1, 1, 0) and
  *                                 ((not self.tight_phrases) or f_links_low[f_x_high-1] != -1) and
  *                                 self.find_fixpoint(f_high, f_x_high,             # <<<<<<<<<<<<<<
@@ -59769,7 +59769,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                   __pyx_t_3 = __Pyx_PyInt_From_int(__pyx_v_f_x_high); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1760; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
                   __Pyx_GOTREF(__pyx_t_3);
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1765
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1765
  *                                             f_gap_low+gap_start+num_gaps, f_gap_high+gap_start+num_gaps,
  *                                             f_sent_len, e_sent_len,
  *                                             self.train_max_initial_size, self.train_max_initial_size,             # <<<<<<<<<<<<<<
@@ -59792,7 +59792,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             }
             if (__pyx_t_8) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1767
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1767
  *                                             self.train_max_initial_size, self.train_max_initial_size,
  *                                             0, 0, 0, 0, 0, 0, 0)):
  *                                 fphr_arr._clear()             # <<<<<<<<<<<<<<
@@ -59801,7 +59801,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
               ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_clear(__pyx_v_fphr_arr);
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1768
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1768
  *                                             0, 0, 0, 0, 0, 0, 0)):
  *                                 fphr_arr._clear()
  *                                 i = 1             # <<<<<<<<<<<<<<
@@ -59810,7 +59810,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
               __pyx_v_i = 1;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1769
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1769
  *                                 fphr_arr._clear()
  *                                 i = 1
  *                                 self.findexes.reset()             # <<<<<<<<<<<<<<
@@ -59824,7 +59824,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
               __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1770
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1770
  *                                 i = 1
  *                                 self.findexes.reset()
  *                                 if f_back_low < f_low:             # <<<<<<<<<<<<<<
@@ -59834,7 +59834,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_8 = ((__pyx_v_f_back_low < __pyx_v_f_low) != 0);
               if (__pyx_t_8) {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1771
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1771
  *                                 self.findexes.reset()
  *                                 if f_back_low < f_low:
  *                                     fphr_arr._append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -59843,7 +59843,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
                 ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_append(__pyx_v_fphr_arr, __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_v_self->category, __pyx_v_i));
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1772
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1772
  *                                 if f_back_low < f_low:
  *                                     fphr_arr._append(sym_setindex(self.category, i))
  *                                     i = i+1             # <<<<<<<<<<<<<<
@@ -59852,7 +59852,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
                 __pyx_v_i = (__pyx_v_i + 1);
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1773
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1773
  *                                     fphr_arr._append(sym_setindex(self.category, i))
  *                                     i = i+1
  *                                     self.findexes.append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -59867,7 +59867,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               }
               __pyx_L85:;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1774
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1774
  *                                     i = i+1
  *                                     self.findexes.append(sym_setindex(self.category, i))
  *                                 self.findexes.extend(self.findexes1)             # <<<<<<<<<<<<<<
@@ -59887,7 +59887,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
               __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1775
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1775
  *                                     self.findexes.append(sym_setindex(self.category, i))
  *                                 self.findexes.extend(self.findexes1)
  *                                 for j from 0 <= j < phrase.n:             # <<<<<<<<<<<<<<
@@ -59897,7 +59897,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_2 = __pyx_v_phrase->n;
               for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_2; __pyx_v_j++) {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1776
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1776
  *                                 self.findexes.extend(self.findexes1)
  *                                 for j from 0 <= j < phrase.n:
  *                                     if sym_isvar(phrase.syms[j]):             # <<<<<<<<<<<<<<
@@ -59907,7 +59907,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 __pyx_t_8 = (__pyx_f_4cdec_2sa_3_sa_sym_isvar((__pyx_v_phrase->syms[__pyx_v_j])) != 0);
                 if (__pyx_t_8) {
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1777
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1777
  *                                 for j from 0 <= j < phrase.n:
  *                                     if sym_isvar(phrase.syms[j]):
  *                                         fphr_arr._append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -59916,7 +59916,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
                   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_append(__pyx_v_fphr_arr, __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_v_self->category, __pyx_v_i));
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1778
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1778
  *                                     if sym_isvar(phrase.syms[j]):
  *                                         fphr_arr._append(sym_setindex(self.category, i))
  *                                         i = i + 1             # <<<<<<<<<<<<<<
@@ -59928,7 +59928,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 }
                 /*else*/ {
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1780
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1780
  *                                         i = i + 1
  *                                     else:
  *                                         fphr_arr._append(phrase.syms[j])             # <<<<<<<<<<<<<<
@@ -59940,7 +59940,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 __pyx_L88:;
               }
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1781
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1781
  *                                     else:
  *                                         fphr_arr._append(phrase.syms[j])
  *                                 fphr_arr._append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -59949,7 +59949,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
               ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_append(__pyx_v_fphr_arr, __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_v_self->category, __pyx_v_i));
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1782
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1782
  *                                         fphr_arr._append(phrase.syms[j])
  *                                 fphr_arr._append(sym_setindex(self.category, i))
  *                                 self.findexes.append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -59961,7 +59961,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_7 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_self->findexes), __pyx_t_15); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1782; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
               __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1783
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1783
  *                                 fphr_arr._append(sym_setindex(self.category, i))
  *                                 self.findexes.append(sym_setindex(self.category, i))
  *                                 fphr = Phrase(fphr_arr)             # <<<<<<<<<<<<<<
@@ -59979,7 +59979,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __Pyx_DECREF_SET(__pyx_v_fphr, ((struct __pyx_obj_4cdec_2sa_3_sa_Phrase *)__pyx_t_14));
               __pyx_t_14 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1784
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1784
  *                                 self.findexes.append(sym_setindex(self.category, i))
  *                                 fphr = Phrase(fphr_arr)
  *                                 phrase_list = self.extract_phrases(e_x_low, e_x_high, e_gap_low+gap_start, e_gap_high+gap_start, e_links_low, num_gaps+1,             # <<<<<<<<<<<<<<
@@ -59991,7 +59991,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __Pyx_XDECREF_SET(__pyx_v_phrase_list, __pyx_t_14);
               __pyx_t_14 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1787
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1787
  *                                                     f_x_low, f_x_high, f_gap_low+gap_start, f_gap_high+gap_start, f_links_low,
  *                                                     matching.sent_id, e_sent_len, e_sent_start)
  *                                 if len(phrase_list) > 0:             # <<<<<<<<<<<<<<
@@ -60002,7 +60002,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_8 = ((__pyx_t_13 > 0) != 0);
               if (__pyx_t_8) {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1788
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1788
  *                                                     matching.sent_id, e_sent_len, e_sent_start)
  *                                 if len(phrase_list) > 0:
  *                                     pair_count = 1.0 / len(phrase_list)             # <<<<<<<<<<<<<<
@@ -60025,7 +60025,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               }
               /*else*/ {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1790
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1790
  *                                     pair_count = 1.0 / len(phrase_list)
  *                                 else:
  *                                     pair_count = 0             # <<<<<<<<<<<<<<
@@ -60036,7 +60036,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               }
               __pyx_L89:;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1791
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1791
  *                                 else:
  *                                     pair_count = 0
  *                                 for phrase2, eindexes in phrase_list:             # <<<<<<<<<<<<<<
@@ -60133,7 +60133,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 __Pyx_XDECREF_SET(__pyx_v_eindexes, __pyx_t_11);
                 __pyx_t_11 = 0;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1792
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1792
  *                                     pair_count = 0
  *                                 for phrase2, eindexes in phrase_list:
  *                                     als3 = self.create_alignments(sent_links,num_links,self.findexes,eindexes)             # <<<<<<<<<<<<<<
@@ -60149,7 +60149,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 __Pyx_XDECREF_SET(__pyx_v_als3, ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_11));
                 __pyx_t_11 = 0;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1793
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1793
  *                                 for phrase2, eindexes in phrase_list:
  *                                     als3 = self.create_alignments(sent_links,num_links,self.findexes,eindexes)
  *                                     extracts.append((fphr, phrase2, pair_count, tuple(als3)))             # <<<<<<<<<<<<<<
@@ -60191,7 +60191,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           }
           __pyx_L79:;
 
-          /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1794
+          /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1794
  *                                     als3 = self.create_alignments(sent_links,num_links,self.findexes,eindexes)
  *                                     extracts.append((fphr, phrase2, pair_count, tuple(als3)))
  *                         if (num_gaps < self.max_nonterminals - 1 and             # <<<<<<<<<<<<<<
@@ -60201,7 +60201,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           __pyx_t_8 = ((__pyx_v_num_gaps < (__pyx_v_self->max_nonterminals - 1)) != 0);
           if (__pyx_t_8) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1795
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1795
  *                                     extracts.append((fphr, phrase2, pair_count, tuple(als3)))
  *                         if (num_gaps < self.max_nonterminals - 1 and
  *                             phrase_len+1 < self.max_length and             # <<<<<<<<<<<<<<
@@ -60211,7 +60211,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             __pyx_t_9 = (((__pyx_v_phrase_len + 1) < __pyx_v_self->max_length) != 0);
             if (__pyx_t_9) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1796
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1796
  *                         if (num_gaps < self.max_nonterminals - 1 and
  *                             phrase_len+1 < self.max_length and
  *                             f_back_high == f_high and             # <<<<<<<<<<<<<<
@@ -60221,7 +60221,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_18 = ((__pyx_v_f_back_high == __pyx_v_f_high) != 0);
               if (__pyx_t_18) {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1797
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1797
  *                             phrase_len+1 < self.max_length and
  *                             f_back_high == f_high and
  *                             f_back_low == f_low and             # <<<<<<<<<<<<<<
@@ -60231,7 +60231,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 __pyx_t_10 = ((__pyx_v_f_back_low == __pyx_v_f_low) != 0);
                 if (__pyx_t_10) {
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1798
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1798
  *                             f_back_high == f_high and
  *                             f_back_low == f_low and
  *                             f_back_high - f_back_low + (2*self.train_min_gap_size) <= self.train_max_initial_size and             # <<<<<<<<<<<<<<
@@ -60241,7 +60241,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                   __pyx_t_19 = ((((__pyx_v_f_back_high - __pyx_v_f_back_low) + (2 * __pyx_v_self->train_min_gap_size)) <= __pyx_v_self->train_max_initial_size) != 0);
                   if (__pyx_t_19) {
 
-                    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1799
+                    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1799
  *                             f_back_low == f_low and
  *                             f_back_high - f_back_low + (2*self.train_min_gap_size) <= self.train_max_initial_size and
  *                             f_low >= self.train_min_gap_size and             # <<<<<<<<<<<<<<
@@ -60251,7 +60251,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                     __pyx_t_20 = ((__pyx_v_f_low >= __pyx_v_self->train_min_gap_size) != 0);
                     if (__pyx_t_20) {
 
-                      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1800
+                      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1800
  *                             f_back_high - f_back_low + (2*self.train_min_gap_size) <= self.train_max_initial_size and
  *                             f_low >= self.train_min_gap_size and
  *                             f_high <= f_sent_len - self.train_min_gap_size and             # <<<<<<<<<<<<<<
@@ -60261,7 +60261,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                       __pyx_t_21 = ((__pyx_v_f_high <= (__pyx_v_f_sent_len - __pyx_v_self->train_min_gap_size)) != 0);
                       if (__pyx_t_21) {
 
-                        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1801
+                        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1801
  *                             f_low >= self.train_min_gap_size and
  *                             f_high <= f_sent_len - self.train_min_gap_size and
  *                             ((not self.tight_phrases) or (f_links_low[f_low-1] != -1 and f_links_low[f_high] != -1))):             # <<<<<<<<<<<<<<
@@ -60311,7 +60311,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
           }
           if (__pyx_t_9) {
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1803
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1803
  *                             ((not self.tight_phrases) or (f_links_low[f_low-1] != -1 and f_links_low[f_high] != -1))):
  * 
  *                             met_constraints = 1             # <<<<<<<<<<<<<<
@@ -60320,7 +60320,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             __pyx_v_met_constraints = 1;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1804
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1804
  * 
  *                             met_constraints = 1
  *                             f_x_low = f_low-self.train_min_gap_size             # <<<<<<<<<<<<<<
@@ -60329,7 +60329,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             __pyx_v_f_x_low = (__pyx_v_f_low - __pyx_v_self->train_min_gap_size);
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1805
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1805
  *                             met_constraints = 1
  *                             f_x_low = f_low-self.train_min_gap_size
  *                             if self.tight_phrases:             # <<<<<<<<<<<<<<
@@ -60339,7 +60339,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             __pyx_t_9 = (__pyx_v_self->tight_phrases != 0);
             if (__pyx_t_9) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1806
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1806
  *                             f_x_low = f_low-self.train_min_gap_size
  *                             if self.tight_phrases:
  *                                 while f_x_low >= 0 and f_links_low[f_x_low] == -1:             # <<<<<<<<<<<<<<
@@ -60356,7 +60356,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 }
                 if (!__pyx_t_18) break;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1807
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1807
  *                             if self.tight_phrases:
  *                                 while f_x_low >= 0 and f_links_low[f_x_low] == -1:
  *                                     f_x_low = f_x_low - 1             # <<<<<<<<<<<<<<
@@ -60369,7 +60369,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             }
             __pyx_L95:;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1808
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1808
  *                                 while f_x_low >= 0 and f_links_low[f_x_low] == -1:
  *                                     f_x_low = f_x_low - 1
  *                             if f_x_low < 0:             # <<<<<<<<<<<<<<
@@ -60379,7 +60379,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             __pyx_t_18 = ((__pyx_v_f_x_low < 0) != 0);
             if (__pyx_t_18) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1809
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1809
  *                                     f_x_low = f_x_low - 1
  *                             if f_x_low < 0:
  *                                 met_constraints = 0             # <<<<<<<<<<<<<<
@@ -60391,7 +60391,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             }
             __pyx_L98:;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1811
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1811
  *                                 met_constraints = 0
  * 
  *                             f_x_high = f_high+self.train_min_gap_size             # <<<<<<<<<<<<<<
@@ -60400,7 +60400,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             __pyx_v_f_x_high = (__pyx_v_f_high + __pyx_v_self->train_min_gap_size);
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1812
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1812
  * 
  *                             f_x_high = f_high+self.train_min_gap_size
  *                             if self.tight_phrases:             # <<<<<<<<<<<<<<
@@ -60410,7 +60410,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             __pyx_t_18 = (__pyx_v_self->tight_phrases != 0);
             if (__pyx_t_18) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1813
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1813
  *                             f_x_high = f_high+self.train_min_gap_size
  *                             if self.tight_phrases:
  *                                 while f_x_high <= f_sent_len and f_links_low[f_x_high-1] == -1:             # <<<<<<<<<<<<<<
@@ -60427,7 +60427,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 }
                 if (!__pyx_t_8) break;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1814
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1814
  *                             if self.tight_phrases:
  *                                 while f_x_high <= f_sent_len and f_links_low[f_x_high-1] == -1:
  *                                     f_x_high = f_x_high + 1             # <<<<<<<<<<<<<<
@@ -60440,7 +60440,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             }
             __pyx_L99:;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1815
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1815
  *                                 while f_x_high <= f_sent_len and f_links_low[f_x_high-1] == -1:
  *                                     f_x_high = f_x_high + 1
  *                             if f_x_high > f_sent_len or f_x_high - f_x_low > self.train_max_initial_size:             # <<<<<<<<<<<<<<
@@ -60456,7 +60456,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             }
             if (__pyx_t_9) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1816
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1816
  *                                     f_x_high = f_x_high + 1
  *                             if f_x_high > f_sent_len or f_x_high - f_x_low > self.train_max_initial_size:
  *                                 met_constraints = 0             # <<<<<<<<<<<<<<
@@ -60468,7 +60468,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             }
             __pyx_L102:;
 
-            /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1818
+            /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1818
  *                                 met_constraints = 0
  * 
  *                             if (met_constraints and             # <<<<<<<<<<<<<<
@@ -60477,7 +60477,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
             if ((__pyx_v_met_constraints != 0)) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1819
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1819
  * 
  *                             if (met_constraints and
  *                                 (self.find_fixpoint(f_x_low, f_x_high,             # <<<<<<<<<<<<<<
@@ -60487,7 +60487,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_14 = __Pyx_PyInt_From_int(__pyx_v_f_x_high); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1819; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
               __Pyx_GOTREF(__pyx_t_14);
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1824
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1824
  *                                                 f_sent_len, e_sent_len,
  *                                                 self.train_max_initial_size, self.train_max_initial_size,
  *                                                 1, 1, 2, 1, 1, 1, 1) == 1) and             # <<<<<<<<<<<<<<
@@ -60498,7 +60498,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
               if (__pyx_t_9) {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1825
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1825
  *                                                 self.train_max_initial_size, self.train_max_initial_size,
  *                                                 1, 1, 2, 1, 1, 1, 1) == 1) and
  *                                 ((not self.tight_phrases) or (f_links_low[f_x_low] != -1 and f_links_low[f_x_high-1] != -1)) and             # <<<<<<<<<<<<<<
@@ -60520,7 +60520,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 }
                 if (__pyx_t_18) {
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1826
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1826
  *                                                 1, 1, 2, 1, 1, 1, 1) == 1) and
  *                                 ((not self.tight_phrases) or (f_links_low[f_x_low] != -1 and f_links_low[f_x_high-1] != -1)) and
  *                                 self.find_fixpoint(f_x_low, f_low,             # <<<<<<<<<<<<<<
@@ -60530,7 +60530,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                   __pyx_t_14 = __Pyx_PyInt_From_int(__pyx_v_f_low); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1826; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
                   __Pyx_GOTREF(__pyx_t_14);
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1830
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1830
  *                                                 -1, -1, e_gap_low, e_gap_high, f_gap_low, f_gap_high,
  *                                                 f_sent_len, e_sent_len,
  *                                                 self.train_max_initial_size, self.train_max_initial_size,             # <<<<<<<<<<<<<<
@@ -60541,7 +60541,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                   __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
                   if (__pyx_t_8) {
 
-                    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1832
+                    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1832
  *                                                 self.train_max_initial_size, self.train_max_initial_size,
  *                                                 0, 0, 0, 0, 0, 0, 0) and
  *                                 self.find_fixpoint(f_high, f_x_high,             # <<<<<<<<<<<<<<
@@ -60551,7 +60551,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                     __pyx_t_14 = __Pyx_PyInt_From_int(__pyx_v_f_x_high); if (unlikely(!__pyx_t_14)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1832; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
                     __Pyx_GOTREF(__pyx_t_14);
 
-                    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1837
+                    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1837
  *                                                 f_gap_low+1+num_gaps, f_gap_high+1+num_gaps,
  *                                                 f_sent_len, e_sent_len,
  *                                                 self.train_max_initial_size, self.train_max_initial_size,             # <<<<<<<<<<<<<<
@@ -60578,7 +60578,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
             }
             if (__pyx_t_9) {
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1839
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1839
  *                                                 self.train_max_initial_size, self.train_max_initial_size,
  *                                                 0, 0, 0, 0, 0, 0, 0)):
  *                                 fphr_arr._clear()             # <<<<<<<<<<<<<<
@@ -60587,7 +60587,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
               ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_clear(__pyx_v_fphr_arr);
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1840
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1840
  *                                                 0, 0, 0, 0, 0, 0, 0)):
  *                                 fphr_arr._clear()
  *                                 i = 1             # <<<<<<<<<<<<<<
@@ -60596,7 +60596,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
               __pyx_v_i = 1;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1841
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1841
  *                                 fphr_arr._clear()
  *                                 i = 1
  *                                 self.findexes.reset()             # <<<<<<<<<<<<<<
@@ -60610,7 +60610,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
               __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1842
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1842
  *                                 i = 1
  *                                 self.findexes.reset()
  *                                 self.findexes.append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -60622,7 +60622,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_7 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_self->findexes), __pyx_t_15); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1842; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
               __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1843
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1843
  *                                 self.findexes.reset()
  *                                 self.findexes.append(sym_setindex(self.category, i))
  *                                 fphr_arr._append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -60631,7 +60631,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
               ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_append(__pyx_v_fphr_arr, __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_v_self->category, __pyx_v_i));
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1844
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1844
  *                                 self.findexes.append(sym_setindex(self.category, i))
  *                                 fphr_arr._append(sym_setindex(self.category, i))
  *                                 i = i+1             # <<<<<<<<<<<<<<
@@ -60640,7 +60640,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
               __pyx_v_i = (__pyx_v_i + 1);
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1845
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1845
  *                                 fphr_arr._append(sym_setindex(self.category, i))
  *                                 i = i+1
  *                                 self.findexes.extend(self.findexes1)             # <<<<<<<<<<<<<<
@@ -60660,7 +60660,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
               __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1846
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1846
  *                                 i = i+1
  *                                 self.findexes.extend(self.findexes1)
  *                                 for j from 0 <= j < phrase.n:             # <<<<<<<<<<<<<<
@@ -60670,7 +60670,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_2 = __pyx_v_phrase->n;
               for (__pyx_v_j = 0; __pyx_v_j < __pyx_t_2; __pyx_v_j++) {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1847
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1847
  *                                 self.findexes.extend(self.findexes1)
  *                                 for j from 0 <= j < phrase.n:
  *                                     if sym_isvar(phrase.syms[j]):             # <<<<<<<<<<<<<<
@@ -60680,7 +60680,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 __pyx_t_9 = (__pyx_f_4cdec_2sa_3_sa_sym_isvar((__pyx_v_phrase->syms[__pyx_v_j])) != 0);
                 if (__pyx_t_9) {
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1848
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1848
  *                                 for j from 0 <= j < phrase.n:
  *                                     if sym_isvar(phrase.syms[j]):
  *                                         fphr_arr._append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -60689,7 +60689,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
                   ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_append(__pyx_v_fphr_arr, __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_v_self->category, __pyx_v_i));
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1849
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1849
  *                                     if sym_isvar(phrase.syms[j]):
  *                                         fphr_arr._append(sym_setindex(self.category, i))
  *                                         i = i + 1             # <<<<<<<<<<<<<<
@@ -60701,7 +60701,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 }
                 /*else*/ {
 
-                  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1851
+                  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1851
  *                                         i = i + 1
  *                                     else:
  *                                         fphr_arr._append(phrase.syms[j])             # <<<<<<<<<<<<<<
@@ -60713,7 +60713,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 __pyx_L106:;
               }
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1852
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1852
  *                                     else:
  *                                         fphr_arr._append(phrase.syms[j])
  *                                 fphr_arr._append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -60722,7 +60722,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
               ((struct __pyx_vtabstruct_4cdec_2sa_3_sa_IntList *)__pyx_v_fphr_arr->__pyx_vtab)->_append(__pyx_v_fphr_arr, __pyx_f_4cdec_2sa_3_sa_sym_setindex(__pyx_v_self->category, __pyx_v_i));
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1853
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1853
  *                                         fphr_arr._append(phrase.syms[j])
  *                                 fphr_arr._append(sym_setindex(self.category, i))
  *                                 self.findexes.append(sym_setindex(self.category, i))             # <<<<<<<<<<<<<<
@@ -60734,7 +60734,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_7 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_self->findexes), __pyx_t_3); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1853; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
               __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1854
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1854
  *                                 fphr_arr._append(sym_setindex(self.category, i))
  *                                 self.findexes.append(sym_setindex(self.category, i))
  *                                 fphr = Phrase(fphr_arr)             # <<<<<<<<<<<<<<
@@ -60752,7 +60752,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __Pyx_DECREF_SET(__pyx_v_fphr, ((struct __pyx_obj_4cdec_2sa_3_sa_Phrase *)__pyx_t_14));
               __pyx_t_14 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1855
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1855
  *                                 self.findexes.append(sym_setindex(self.category, i))
  *                                 fphr = Phrase(fphr_arr)
  *                                 phrase_list = self.extract_phrases(e_x_low, e_x_high, e_gap_low, e_gap_high, e_links_low, num_gaps+2,             # <<<<<<<<<<<<<<
@@ -60764,7 +60764,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __Pyx_XDECREF_SET(__pyx_v_phrase_list, __pyx_t_14);
               __pyx_t_14 = 0;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1858
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1858
  *                                                     f_x_low, f_x_high, f_gap_low, f_gap_high, f_links_low,
  *                                                     matching.sent_id, e_sent_len, e_sent_start)
  *                                 if len(phrase_list) > 0:             # <<<<<<<<<<<<<<
@@ -60775,7 +60775,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               __pyx_t_9 = ((__pyx_t_13 > 0) != 0);
               if (__pyx_t_9) {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1859
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1859
  *                                                     matching.sent_id, e_sent_len, e_sent_start)
  *                                 if len(phrase_list) > 0:
  *                                     pair_count = 1.0 / len(phrase_list)             # <<<<<<<<<<<<<<
@@ -60798,7 +60798,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               }
               /*else*/ {
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1861
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1861
  *                                     pair_count = 1.0 / len(phrase_list)
  *                                 else:
  *                                     pair_count = 0             # <<<<<<<<<<<<<<
@@ -60809,7 +60809,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
               }
               __pyx_L107:;
 
-              /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1862
+              /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1862
  *                                 else:
  *                                     pair_count = 0
  *                                 for phrase2, eindexes in phrase_list:             # <<<<<<<<<<<<<<
@@ -60906,7 +60906,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 __Pyx_XDECREF_SET(__pyx_v_eindexes, __pyx_t_11);
                 __pyx_t_11 = 0;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1863
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1863
  *                                     pair_count = 0
  *                                 for phrase2, eindexes in phrase_list:
  *                                     als4 = self.create_alignments(sent_links,num_links,self.findexes,eindexes)             # <<<<<<<<<<<<<<
@@ -60922,7 +60922,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
                 __Pyx_XDECREF_SET(__pyx_v_als4, ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_11));
                 __pyx_t_11 = 0;
 
-                /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1864
+                /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1864
  *                                 for phrase2, eindexes in phrase_list:
  *                                     als4 = self.create_alignments(sent_links,num_links,self.findexes,eindexes)
  *                                     extracts.append((fphr, phrase2, pair_count, tuple(als4)))             # <<<<<<<<<<<<<<
@@ -60973,7 +60973,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
     }
     /*else*/ {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1866
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1866
  *                                     extracts.append((fphr, phrase2, pair_count, tuple(als4)))
  *             else:
  *                 reason_for_failure = "Unable to extract basic phrase"             # <<<<<<<<<<<<<<
@@ -60988,7 +60988,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   }
   __pyx_L33:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1868
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1868
  *                 reason_for_failure = "Unable to extract basic phrase"
  * 
  *         free(sent_links)             # <<<<<<<<<<<<<<
@@ -60997,7 +60997,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   free(__pyx_v_sent_links);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1869
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1869
  * 
  *         free(sent_links)
  *         free(f_links_low)             # <<<<<<<<<<<<<<
@@ -61006,7 +61006,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   free(__pyx_v_f_links_low);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1870
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1870
  *         free(sent_links)
  *         free(f_links_low)
  *         free(f_links_high)             # <<<<<<<<<<<<<<
@@ -61015,7 +61015,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   free(__pyx_v_f_links_high);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1871
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1871
  *         free(f_links_low)
  *         free(f_links_high)
  *         free(e_links_low)             # <<<<<<<<<<<<<<
@@ -61024,7 +61024,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   free(__pyx_v_e_links_low);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1872
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1872
  *         free(f_links_high)
  *         free(e_links_low)
  *         free(e_links_high)             # <<<<<<<<<<<<<<
@@ -61033,7 +61033,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   free(__pyx_v_e_links_high);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1873
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1873
  *         free(e_links_low)
  *         free(e_links_high)
  *         free(f_gap_low)             # <<<<<<<<<<<<<<
@@ -61042,7 +61042,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   free(__pyx_v_f_gap_low);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1874
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1874
  *         free(e_links_high)
  *         free(f_gap_low)
  *         free(f_gap_high)             # <<<<<<<<<<<<<<
@@ -61051,7 +61051,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   free(__pyx_v_f_gap_high);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1875
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1875
  *         free(f_gap_low)
  *         free(f_gap_high)
  *         free(e_gap_low)             # <<<<<<<<<<<<<<
@@ -61060,7 +61060,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   free(__pyx_v_e_gap_low);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1876
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1876
  *         free(f_gap_high)
  *         free(e_gap_low)
  *         free(e_gap_high)             # <<<<<<<<<<<<<<
@@ -61069,7 +61069,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
  */
   free(__pyx_v_e_gap_high);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1878
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1878
  *         free(e_gap_high)
  * 
  *         return extracts             # <<<<<<<<<<<<<<
@@ -61081,7 +61081,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   __pyx_r = __pyx_v_extracts;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1481
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1481
  *         return ret
  * 
  *     cdef extract(self, Phrase phrase, Matching* matching, int* chunklen, int num_chunks):             # <<<<<<<<<<<<<<
@@ -61118,7 +61118,7 @@ static PyObject *__pyx_f_4cdec_2sa_3_sa_23HieroCachingRuleFactory_extract(struct
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1886
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1886
  *     # Aggregate stats from a training instance
  *     # (Extract rules, update counts)
  *     def add_instance(self, f_words, e_words, alignment, ctx_name=None):             # <<<<<<<<<<<<<<
@@ -61208,7 +61208,7 @@ static PyObject *__pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_26add_instanc
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1920
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1920
  *         # f_ i and j are current, e_ i and j are previous
  *         # We care _considering_ f_j, so it is not yet in counts
  *         def extract(f_i, f_j, e_i, e_j, min_bound, wc, links, nt, nt_open):             # <<<<<<<<<<<<<<
@@ -61378,7 +61378,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   __pyx_outer_scope = (struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_21_add_instance *) __Pyx_CyFunction_GetClosure(__pyx_self);
   __pyx_cur_scope = __pyx_outer_scope;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1922
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1922
  *         def extract(f_i, f_j, e_i, e_j, min_bound, wc, links, nt, nt_open):
  *             # Phrase extraction limits
  *             if f_j > (f_len - 1) or (f_j - f_i) + 1 > self.max_initial_size:             # <<<<<<<<<<<<<<
@@ -61412,7 +61412,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   }
   if (__pyx_t_6) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1923
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1923
  *             # Phrase extraction limits
  *             if f_j > (f_len - 1) or (f_j - f_i) + 1 > self.max_initial_size:
  *                 return             # <<<<<<<<<<<<<<
@@ -61424,7 +61424,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1925
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1925
  *                 return
  *             # Unaligned word
  *             if not al[f_j]:             # <<<<<<<<<<<<<<
@@ -61439,7 +61439,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   __pyx_t_3 = ((!__pyx_t_6) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1927
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1927
  *             if not al[f_j]:
  *                 # Adjacent to non-terminal: extend (non-terminal now open)
  *                 if nt and nt[-1][2] == f_j - 1:             # <<<<<<<<<<<<<<
@@ -61466,7 +61466,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     }
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1928
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1928
  *                 # Adjacent to non-terminal: extend (non-terminal now open)
  *                 if nt and nt[-1][2] == f_j - 1:
  *                     nt[-1][2] += 1             # <<<<<<<<<<<<<<
@@ -61485,7 +61485,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1929
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1929
  *                 if nt and nt[-1][2] == f_j - 1:
  *                     nt[-1][2] += 1
  *                     extract(f_i, f_j + 1, e_i, e_j, min_bound, wc, links, nt, True)             # <<<<<<<<<<<<<<
@@ -61500,7 +61500,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1930
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1930
  *                     nt[-1][2] += 1
  *                     extract(f_i, f_j + 1, e_i, e_j, min_bound, wc, links, nt, True)
  *                     nt[-1][2] -= 1             # <<<<<<<<<<<<<<
@@ -61522,7 +61522,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     }
     __pyx_L5:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1933
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1933
  *                 # Unless non-terminal already open, always extend with word
  *                 # Make sure adding a word doesn't exceed length
  *                 if not nt_open and wc < self.max_length:             # <<<<<<<<<<<<<<
@@ -61545,7 +61545,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     }
     if (__pyx_t_6) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1934
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1934
  *                 # Make sure adding a word doesn't exceed length
  *                 if not nt_open and wc < self.max_length:
  *                     extract(f_i, f_j + 1, e_i, e_j, min_bound, wc + 1, links, nt, False)             # <<<<<<<<<<<<<<
@@ -61566,7 +61566,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     }
     __pyx_L6:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1935
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1935
  *                 if not nt_open and wc < self.max_length:
  *                     extract(f_i, f_j + 1, e_i, e_j, min_bound, wc + 1, links, nt, False)
  *                 return             # <<<<<<<<<<<<<<
@@ -61578,7 +61578,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1937
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1937
  *                 return
  *             # Aligned word
  *             link_i = fe_span[f_j][0]             # <<<<<<<<<<<<<<
@@ -61598,7 +61598,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   __pyx_v_link_i = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1938
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1938
  *             # Aligned word
  *             link_i = fe_span[f_j][0]
  *             link_j = fe_span[f_j][1]             # <<<<<<<<<<<<<<
@@ -61618,7 +61618,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   __pyx_v_link_j = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1939
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1939
  *             link_i = fe_span[f_j][0]
  *             link_j = fe_span[f_j][1]
  *             new_e_i = min(link_i, e_i)             # <<<<<<<<<<<<<<
@@ -61647,7 +61647,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   __pyx_v_new_e_i = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1940
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1940
  *             link_j = fe_span[f_j][1]
  *             new_e_i = min(link_i, e_i)
  *             new_e_j = max(link_j, e_j)             # <<<<<<<<<<<<<<
@@ -61676,7 +61676,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   __pyx_v_new_e_j = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1943
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1943
  *             # Check reverse links of newly covered words to see if they violate left
  *             # bound (return) or extend minimum right bound for chunk
  *             new_min_bound = min_bound             # <<<<<<<<<<<<<<
@@ -61686,7 +61686,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   __Pyx_INCREF(__pyx_v_min_bound);
   __pyx_v_new_min_bound = __pyx_v_min_bound;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1945
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1945
  *             new_min_bound = min_bound
  *             # First aligned word creates span
  *             if e_j == -1:             # <<<<<<<<<<<<<<
@@ -61698,7 +61698,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_6) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1946
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1946
  *             # First aligned word creates span
  *             if e_j == -1:
  *                 for i from new_e_i <= i <= new_e_j:             # <<<<<<<<<<<<<<
@@ -61713,7 +61713,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_1);
       __pyx_t_1 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1947
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1947
  *             if e_j == -1:
  *                 for i from new_e_i <= i <= new_e_j:
  *                     if ef_span[i][0] < f_i:             # <<<<<<<<<<<<<<
@@ -61736,7 +61736,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
       if (__pyx_t_6) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1948
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1948
  *                 for i from new_e_i <= i <= new_e_j:
  *                     if ef_span[i][0] < f_i:
  *                         return             # <<<<<<<<<<<<<<
@@ -61748,7 +61748,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
         goto __pyx_L0;
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1949
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1949
  *                     if ef_span[i][0] < f_i:
  *                         return
  *                     new_min_bound = max(new_min_bound, ef_span[i][1])             # <<<<<<<<<<<<<<
@@ -61787,7 +61787,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __pyx_t_11 = __Pyx_PyInt_As_int(__pyx_v_i); if (unlikely((__pyx_t_11 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1946; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1946
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1946
  *             # First aligned word creates span
  *             if e_j == -1:
  *                 for i from new_e_i <= i <= new_e_j:             # <<<<<<<<<<<<<<
@@ -61802,7 +61802,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1952
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1952
  *             # Other aligned words extend span
  *             else:
  *                 for i from new_e_i <= i < e_i:             # <<<<<<<<<<<<<<
@@ -61817,7 +61817,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_2);
       __pyx_t_2 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1953
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1953
  *             else:
  *                 for i from new_e_i <= i < e_i:
  *                     if ef_span[i][0] < f_i:             # <<<<<<<<<<<<<<
@@ -61840,7 +61840,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       if (__pyx_t_6) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1954
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1954
  *                 for i from new_e_i <= i < e_i:
  *                     if ef_span[i][0] < f_i:
  *                         return             # <<<<<<<<<<<<<<
@@ -61852,7 +61852,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
         goto __pyx_L0;
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1955
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1955
  *                     if ef_span[i][0] < f_i:
  *                         return
  *                     new_min_bound = max(new_min_bound, ef_span[i][1])             # <<<<<<<<<<<<<<
@@ -61891,7 +61891,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __pyx_t_9 = __Pyx_PyInt_As_int(__pyx_v_i); if (unlikely((__pyx_t_9 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1952; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1952
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1952
  *             # Other aligned words extend span
  *             else:
  *                 for i from new_e_i <= i < e_i:             # <<<<<<<<<<<<<<
@@ -61903,7 +61903,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1956
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1956
  *                         return
  *                     new_min_bound = max(new_min_bound, ef_span[i][1])
  *                 for i from e_j < i <= new_e_j:             # <<<<<<<<<<<<<<
@@ -61918,7 +61918,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_4);
       __pyx_t_4 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1957
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1957
  *                     new_min_bound = max(new_min_bound, ef_span[i][1])
  *                 for i from e_j < i <= new_e_j:
  *                     if ef_span[i][0] < f_i:             # <<<<<<<<<<<<<<
@@ -61941,7 +61941,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       if (__pyx_t_6) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1958
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1958
  *                 for i from e_j < i <= new_e_j:
  *                     if ef_span[i][0] < f_i:
  *                         return             # <<<<<<<<<<<<<<
@@ -61953,7 +61953,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
         goto __pyx_L0;
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1959
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1959
  *                     if ef_span[i][0] < f_i:
  *                         return
  *                     new_min_bound = max(new_min_bound, ef_span[i][1])             # <<<<<<<<<<<<<<
@@ -61992,7 +61992,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __pyx_t_11 = __Pyx_PyInt_As_int(__pyx_v_i); if (unlikely((__pyx_t_11 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1956; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1956
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1956
  *                         return
  *                     new_min_bound = max(new_min_bound, ef_span[i][1])
  *                 for i from e_j < i <= new_e_j:             # <<<<<<<<<<<<<<
@@ -62006,7 +62006,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   }
   __pyx_L7:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1961
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1961
  *                     new_min_bound = max(new_min_bound, ef_span[i][1])
  *             # Extract, extend with word (unless non-terminal open)
  *             if not nt_open:             # <<<<<<<<<<<<<<
@@ -62017,7 +62017,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   __pyx_t_3 = ((!__pyx_t_6) != 0);
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1962
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1962
  *             # Extract, extend with word (unless non-terminal open)
  *             if not nt_open:
  *                 nt_collision = False             # <<<<<<<<<<<<<<
@@ -62026,7 +62026,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
  */
     __pyx_v_nt_collision = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1963
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1963
  *             if not nt_open:
  *                 nt_collision = False
  *                 for link in al[f_j]:             # <<<<<<<<<<<<<<
@@ -62075,7 +62075,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_XDECREF_SET(__pyx_v_link, __pyx_t_1);
       __pyx_t_1 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1964
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1964
  *                 nt_collision = False
  *                 for link in al[f_j]:
  *                     if e_nt_cover[link]:             # <<<<<<<<<<<<<<
@@ -62093,7 +62093,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1965
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1965
  *                 for link in al[f_j]:
  *                     if e_nt_cover[link]:
  *                         nt_collision = True             # <<<<<<<<<<<<<<
@@ -62107,7 +62107,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     }
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1968
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1968
  *                 # Non-terminal collisions block word extraction and extension, but
  *                 # may be okay for continuing non-terminals
  *                 if not nt_collision and wc < self.max_length:             # <<<<<<<<<<<<<<
@@ -62129,7 +62129,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     }
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1969
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1969
  *                 # may be okay for continuing non-terminals
  *                 if not nt_collision and wc < self.max_length:
  *                     plus_links = []             # <<<<<<<<<<<<<<
@@ -62141,7 +62141,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __pyx_v_plus_links = ((PyObject*)__pyx_t_1);
       __pyx_t_1 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1970
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1970
  *                 if not nt_collision and wc < self.max_length:
  *                     plus_links = []
  *                     for link in al[f_j]:             # <<<<<<<<<<<<<<
@@ -62190,7 +62190,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
         __Pyx_XDECREF_SET(__pyx_v_link, __pyx_t_1);
         __pyx_t_1 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1971
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1971
  *                     plus_links = []
  *                     for link in al[f_j]:
  *                         plus_links.append((f_j, link))             # <<<<<<<<<<<<<<
@@ -62208,7 +62208,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
         __pyx_t_13 = __Pyx_PyList_Append(__pyx_v_plus_links, __pyx_t_1); if (unlikely(__pyx_t_13 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1971; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1972
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1972
  *                     for link in al[f_j]:
  *                         plus_links.append((f_j, link))
  *                         cover[link] += 1             # <<<<<<<<<<<<<<
@@ -62244,7 +62244,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       }
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1973
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1973
  *                         plus_links.append((f_j, link))
  *                         cover[link] += 1
  *                     links.append(plus_links)             # <<<<<<<<<<<<<<
@@ -62253,7 +62253,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
  */
       __pyx_t_13 = __Pyx_PyObject_Append(__pyx_v_links, __pyx_v_plus_links); if (unlikely(__pyx_t_13 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1973; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1974
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1974
  *                         cover[link] += 1
  *                     links.append(plus_links)
  *                     if links and f_j >= new_min_bound:             # <<<<<<<<<<<<<<
@@ -62271,7 +62271,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       }
       if (__pyx_t_6) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1975
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1975
  *                     links.append(plus_links)
  *                     if links and f_j >= new_min_bound:
  *                         rules.add(self.form_rule(f_i, new_e_i, f_words[f_i:f_j + 1], e_words[new_e_i:new_e_j + 1], nt, links))             # <<<<<<<<<<<<<<
@@ -62328,7 +62328,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       }
       __pyx_L24:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1976
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1976
  *                     if links and f_j >= new_min_bound:
  *                         rules.add(self.form_rule(f_i, new_e_i, f_words[f_i:f_j + 1], e_words[new_e_i:new_e_j + 1], nt, links))
  *                     extract(f_i, f_j + 1, new_e_i, new_e_j, new_min_bound, wc + 1, links, nt, False)             # <<<<<<<<<<<<<<
@@ -62346,7 +62346,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1977
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1977
  *                         rules.add(self.form_rule(f_i, new_e_i, f_words[f_i:f_j + 1], e_words[new_e_i:new_e_j + 1], nt, links))
  *                     extract(f_i, f_j + 1, new_e_i, new_e_j, new_min_bound, wc + 1, links, nt, False)
  *                     links.pop()             # <<<<<<<<<<<<<<
@@ -62357,7 +62357,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1978
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1978
  *                     extract(f_i, f_j + 1, new_e_i, new_e_j, new_min_bound, wc + 1, links, nt, False)
  *                     links.pop()
  *                     for link in al[f_j]:             # <<<<<<<<<<<<<<
@@ -62406,7 +62406,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
         __Pyx_XDECREF_SET(__pyx_v_link, __pyx_t_2);
         __pyx_t_2 = 0;
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1979
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1979
  *                     links.pop()
  *                     for link in al[f_j]:
  *                         cover[link] -= 1             # <<<<<<<<<<<<<<
@@ -62448,7 +62448,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   }
   __pyx_L17:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1981
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1981
  *                         cover[link] -= 1
  *             # Try to add a word to current non-terminal (if any), extract, extend
  *             if nt and nt[-1][2] == f_j - 1:             # <<<<<<<<<<<<<<
@@ -62475,7 +62475,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   }
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1983
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1983
  *             if nt and nt[-1][2] == f_j - 1:
  *                 # Add to non-terminal, checking for collisions
  *                 old_last_nt = nt[-1][:]             # <<<<<<<<<<<<<<
@@ -62490,7 +62490,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     __pyx_v_old_last_nt = __pyx_t_1;
     __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1984
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1984
  *                 # Add to non-terminal, checking for collisions
  *                 old_last_nt = nt[-1][:]
  *                 nt[-1][2] = f_j             # <<<<<<<<<<<<<<
@@ -62502,7 +62502,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     if (unlikely(__Pyx_SetItemInt(__pyx_t_1, 2, __pyx_v_f_j, long, 1, __Pyx_PyInt_From_long, 0, 0, 1) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1984; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1985
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1985
  *                 old_last_nt = nt[-1][:]
  *                 nt[-1][2] = f_j
  *                 if link_i < nt[-1][3]:             # <<<<<<<<<<<<<<
@@ -62520,7 +62520,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1986
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1986
  *                 nt[-1][2] = f_j
  *                 if link_i < nt[-1][3]:
  *                     if not span_check(cover, link_i, nt[-1][3] - 1):             # <<<<<<<<<<<<<<
@@ -62558,7 +62558,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __pyx_t_6 = ((!__pyx_t_3) != 0);
       if (__pyx_t_6) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1987
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1987
  *                 if link_i < nt[-1][3]:
  *                     if not span_check(cover, link_i, nt[-1][3] - 1):
  *                         nt[-1] = old_last_nt             # <<<<<<<<<<<<<<
@@ -62567,7 +62567,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
  */
         if (unlikely(__Pyx_SetItemInt(__pyx_v_nt, -1, __pyx_v_old_last_nt, long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1987; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1988
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1988
  *                     if not span_check(cover, link_i, nt[-1][3] - 1):
  *                         nt[-1] = old_last_nt
  *                         return             # <<<<<<<<<<<<<<
@@ -62579,7 +62579,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
         goto __pyx_L0;
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1989
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1989
  *                         nt[-1] = old_last_nt
  *                         return
  *                     span_inc(cover, link_i, nt[-1][3] - 1)             # <<<<<<<<<<<<<<
@@ -62614,7 +62614,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1990
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1990
  *                         return
  *                     span_inc(cover, link_i, nt[-1][3] - 1)
  *                     span_inc(e_nt_cover, link_i, nt[-1][3] - 1)             # <<<<<<<<<<<<<<
@@ -62649,7 +62649,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1991
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1991
  *                     span_inc(cover, link_i, nt[-1][3] - 1)
  *                     span_inc(e_nt_cover, link_i, nt[-1][3] - 1)
  *                     nt[-1][3] = link_i             # <<<<<<<<<<<<<<
@@ -62664,7 +62664,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     }
     __pyx_L28:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1992
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1992
  *                     span_inc(e_nt_cover, link_i, nt[-1][3] - 1)
  *                     nt[-1][3] = link_i
  *                 if link_j > nt[-1][4]:             # <<<<<<<<<<<<<<
@@ -62682,7 +62682,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     if (__pyx_t_6) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1993
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1993
  *                     nt[-1][3] = link_i
  *                 if link_j > nt[-1][4]:
  *                     if not span_check(cover, nt[-1][4] + 1, link_j):             # <<<<<<<<<<<<<<
@@ -62720,7 +62720,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __pyx_t_3 = ((!__pyx_t_6) != 0);
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1994
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1994
  *                 if link_j > nt[-1][4]:
  *                     if not span_check(cover, nt[-1][4] + 1, link_j):
  *                         nt[-1] = old_last_nt             # <<<<<<<<<<<<<<
@@ -62729,7 +62729,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
  */
         if (unlikely(__Pyx_SetItemInt(__pyx_v_nt, -1, __pyx_v_old_last_nt, long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1994; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1995
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1995
  *                     if not span_check(cover, nt[-1][4] + 1, link_j):
  *                         nt[-1] = old_last_nt
  *                         return             # <<<<<<<<<<<<<<
@@ -62741,7 +62741,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
         goto __pyx_L0;
       }
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1996
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1996
  *                         nt[-1] = old_last_nt
  *                         return
  *                     span_inc(cover, nt[-1][4] + 1, link_j)             # <<<<<<<<<<<<<<
@@ -62776,7 +62776,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1997
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1997
  *                         return
  *                     span_inc(cover, nt[-1][4] + 1, link_j)
  *                     span_inc(e_nt_cover, nt[-1][4] + 1, link_j)             # <<<<<<<<<<<<<<
@@ -62811,7 +62811,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1998
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1998
  *                     span_inc(cover, nt[-1][4] + 1, link_j)
  *                     span_inc(e_nt_cover, nt[-1][4] + 1, link_j)
  *                     nt[-1][4] = link_j             # <<<<<<<<<<<<<<
@@ -62826,7 +62826,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     }
     __pyx_L30:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1999
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1999
  *                     span_inc(e_nt_cover, nt[-1][4] + 1, link_j)
  *                     nt[-1][4] = link_j
  *                 if links and f_j >= new_min_bound:             # <<<<<<<<<<<<<<
@@ -62844,7 +62844,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     }
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2000
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2000
  *                     nt[-1][4] = link_j
  *                 if links and f_j >= new_min_bound:
  *                     rules.add(self.form_rule(f_i, new_e_i, f_words[f_i:f_j + 1], e_words[new_e_i:new_e_j + 1], nt, links))             # <<<<<<<<<<<<<<
@@ -62901,7 +62901,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     }
     __pyx_L32:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2001
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2001
  *                 if links and f_j >= new_min_bound:
  *                     rules.add(self.form_rule(f_i, new_e_i, f_words[f_i:f_j + 1], e_words[new_e_i:new_e_j + 1], nt, links))
  *                 extract(f_i, f_j + 1, new_e_i, new_e_j, new_min_bound, wc, links, nt, False)             # <<<<<<<<<<<<<<
@@ -62916,7 +62916,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2002
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2002
  *                     rules.add(self.form_rule(f_i, new_e_i, f_words[f_i:f_j + 1], e_words[new_e_i:new_e_j + 1], nt, links))
  *                 extract(f_i, f_j + 1, new_e_i, new_e_j, new_min_bound, wc, links, nt, False)
  *                 nt[-1] = old_last_nt             # <<<<<<<<<<<<<<
@@ -62925,7 +62925,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
  */
     if (unlikely(__Pyx_SetItemInt(__pyx_v_nt, -1, __pyx_v_old_last_nt, long, 1, __Pyx_PyInt_From_long, 0, 1, 1) < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2002; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2003
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2003
  *                 extract(f_i, f_j + 1, new_e_i, new_e_j, new_min_bound, wc, links, nt, False)
  *                 nt[-1] = old_last_nt
  *                 if link_i < nt[-1][3]:             # <<<<<<<<<<<<<<
@@ -62943,7 +62943,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2004
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2004
  *                 nt[-1] = old_last_nt
  *                 if link_i < nt[-1][3]:
  *                     span_dec(cover, link_i, nt[-1][3] - 1)             # <<<<<<<<<<<<<<
@@ -62978,7 +62978,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2005
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2005
  *                 if link_i < nt[-1][3]:
  *                     span_dec(cover, link_i, nt[-1][3] - 1)
  *                     span_dec(e_nt_cover, link_i, nt[-1][3] - 1)             # <<<<<<<<<<<<<<
@@ -63016,7 +63016,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     }
     __pyx_L33:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2006
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2006
  *                     span_dec(cover, link_i, nt[-1][3] - 1)
  *                     span_dec(e_nt_cover, link_i, nt[-1][3] - 1)
  *                 if link_j > nt[-1][4]:             # <<<<<<<<<<<<<<
@@ -63034,7 +63034,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     if (__pyx_t_5) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2007
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2007
  *                     span_dec(e_nt_cover, link_i, nt[-1][3] - 1)
  *                 if link_j > nt[-1][4]:
  *                     span_dec(cover, nt[-1][4] + 1, link_j)             # <<<<<<<<<<<<<<
@@ -63069,7 +63069,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2008
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2008
  *                 if link_j > nt[-1][4]:
  *                     span_dec(cover, nt[-1][4] + 1, link_j)
  *                     span_dec(e_nt_cover, nt[-1][4] + 1, link_j)             # <<<<<<<<<<<<<<
@@ -63110,7 +63110,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   }
   __pyx_L27:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2010
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2010
  *                     span_dec(e_nt_cover, nt[-1][4] + 1, link_j)
  *             # Try to start a new non-terminal, extract, extend
  *             if (not nt or f_j - nt[-1][2] > 1) and wc < self.max_length and len(nt) < self.max_nonterminals:             # <<<<<<<<<<<<<<
@@ -63158,7 +63158,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   }
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2012
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2012
  *             if (not nt or f_j - nt[-1][2] > 1) and wc < self.max_length and len(nt) < self.max_nonterminals:
  *                 # Check for collisions
  *                 if not span_check(cover, link_i, link_j):             # <<<<<<<<<<<<<<
@@ -63188,7 +63188,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     __pyx_t_6 = ((!__pyx_t_3) != 0);
     if (__pyx_t_6) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2013
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2013
  *                 # Check for collisions
  *                 if not span_check(cover, link_i, link_j):
  *                     return             # <<<<<<<<<<<<<<
@@ -63200,7 +63200,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2014
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2014
  *                 if not span_check(cover, link_i, link_j):
  *                     return
  *                 span_inc(cover, link_i, link_j)             # <<<<<<<<<<<<<<
@@ -63227,7 +63227,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2015
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2015
  *                     return
  *                 span_inc(cover, link_i, link_j)
  *                 span_inc(e_nt_cover, link_i, link_j)             # <<<<<<<<<<<<<<
@@ -63254,7 +63254,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2016
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2016
  *                 span_inc(cover, link_i, link_j)
  *                 span_inc(e_nt_cover, link_i, link_j)
  *                 nt.append([(nt[-1][0] + 1) if nt else 1, f_j, f_j, link_i, link_j])             # <<<<<<<<<<<<<<
@@ -63297,7 +63297,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     __pyx_t_13 = __Pyx_PyObject_Append(__pyx_v_nt, __pyx_t_1); if (unlikely(__pyx_t_13 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2016; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2018
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2018
  *                 nt.append([(nt[-1][0] + 1) if nt else 1, f_j, f_j, link_i, link_j])
  *                 # Require at least one word in phrase
  *                 if links and f_j >= new_min_bound:             # <<<<<<<<<<<<<<
@@ -63315,7 +63315,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     }
     if (__pyx_t_15) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2019
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2019
  *                 # Require at least one word in phrase
  *                 if links and f_j >= new_min_bound:
  *                     rules.add(self.form_rule(f_i, new_e_i, f_words[f_i:f_j + 1], e_words[new_e_i:new_e_j + 1], nt, links))             # <<<<<<<<<<<<<<
@@ -63372,7 +63372,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     }
     __pyx_L37:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2020
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2020
  *                 if links and f_j >= new_min_bound:
  *                     rules.add(self.form_rule(f_i, new_e_i, f_words[f_i:f_j + 1], e_words[new_e_i:new_e_j + 1], nt, links))
  *                 extract(f_i, f_j + 1, new_e_i, new_e_j, new_min_bound, wc + 1, links, nt, False)             # <<<<<<<<<<<<<<
@@ -63390,7 +63390,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2021
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2021
  *                     rules.add(self.form_rule(f_i, new_e_i, f_words[f_i:f_j + 1], e_words[new_e_i:new_e_j + 1], nt, links))
  *                 extract(f_i, f_j + 1, new_e_i, new_e_j, new_min_bound, wc + 1, links, nt, False)
  *                 nt.pop()             # <<<<<<<<<<<<<<
@@ -63401,7 +63401,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2022
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2022
  *                 extract(f_i, f_j + 1, new_e_i, new_e_j, new_min_bound, wc + 1, links, nt, False)
  *                 nt.pop()
  *                 span_dec(cover, link_i, link_j)             # <<<<<<<<<<<<<<
@@ -63428,7 +63428,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
     __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0;
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2023
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2023
  *                 nt.pop()
  *                 span_dec(cover, link_i, link_j)
  *                 span_dec(e_nt_cover, link_i, link_j)             # <<<<<<<<<<<<<<
@@ -63458,7 +63458,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   }
   __pyx_L35:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1920
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1920
  *         # f_ i and j are current, e_ i and j are previous
  *         # We care _considering_ f_j, so it is not yet in counts
  *         def extract(f_i, f_j, e_i, e_j, min_bound, wc, links, nt, nt_open):             # <<<<<<<<<<<<<<
@@ -63492,7 +63492,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_12add_instanc
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1886
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1886
  *     # Aggregate stats from a training instance
  *     # (Extract rules, update counts)
  *     def add_instance(self, f_words, e_words, alignment, ctx_name=None):             # <<<<<<<<<<<<<<
@@ -63550,7 +63550,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   __Pyx_INCREF(__pyx_cur_scope->__pyx_v_e_words);
   __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_e_words);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1888
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1888
  *     def add_instance(self, f_words, e_words, alignment, ctx_name=None):
  * 
  *         self.online = True             # <<<<<<<<<<<<<<
@@ -63559,7 +63559,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
  */
   __pyx_cur_scope->__pyx_v_self->online = 1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1895
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1895
  *         # span more than once.
  *         # (f, e, al, lex_f_i, lex_f_j)
  *         rules = set()             # <<<<<<<<<<<<<<
@@ -63572,7 +63572,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   __pyx_cur_scope->__pyx_v_rules = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1897
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1897
  *         rules = set()
  * 
  *         f_len = len(f_words)             # <<<<<<<<<<<<<<
@@ -63589,7 +63589,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   __pyx_cur_scope->__pyx_v_f_len = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1898
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1898
  * 
  *         f_len = len(f_words)
  *         e_len = len(e_words)             # <<<<<<<<<<<<<<
@@ -63605,7 +63605,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   __pyx_v_e_len = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1901
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1901
  * 
  *         # Pre-compute alignment info
  *         al = [[] for i in range(f_len)]             # <<<<<<<<<<<<<<
@@ -63670,7 +63670,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   __pyx_cur_scope->__pyx_v_al = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1902
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1902
  *         # Pre-compute alignment info
  *         al = [[] for i in range(f_len)]
  *         fe_span = [[e_len + 1, -1] for i in range(f_len)]             # <<<<<<<<<<<<<<
@@ -63743,7 +63743,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   __pyx_cur_scope->__pyx_v_fe_span = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1903
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1903
  *         al = [[] for i in range(f_len)]
  *         fe_span = [[e_len + 1, -1] for i in range(f_len)]
  *         ef_span = [[f_len + 1, -1] for i in range(e_len)]             # <<<<<<<<<<<<<<
@@ -63816,7 +63816,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   __pyx_cur_scope->__pyx_v_ef_span = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1904
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1904
  *         fe_span = [[e_len + 1, -1] for i in range(f_len)]
  *         ef_span = [[f_len + 1, -1] for i in range(e_len)]
  *         for f, e in alignment:             # <<<<<<<<<<<<<<
@@ -63913,7 +63913,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
     __Pyx_XDECREF_SET(__pyx_v_e, __pyx_t_6);
     __pyx_t_6 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1905
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1905
  *         ef_span = [[f_len + 1, -1] for i in range(e_len)]
  *         for f, e in alignment:
  *             al[f].append(e)             # <<<<<<<<<<<<<<
@@ -63925,7 +63925,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
     __pyx_t_9 = __Pyx_PyObject_Append(__pyx_t_3, __pyx_v_e); if (unlikely(__pyx_t_9 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1905; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1906
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1906
  *         for f, e in alignment:
  *             al[f].append(e)
  *             fe_span[f][0] = min(fe_span[f][0], e)             # <<<<<<<<<<<<<<
@@ -63960,7 +63960,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1907
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1907
  *             al[f].append(e)
  *             fe_span[f][0] = min(fe_span[f][0], e)
  *             fe_span[f][1] = max(fe_span[f][1], e)             # <<<<<<<<<<<<<<
@@ -63995,7 +63995,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1908
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1908
  *             fe_span[f][0] = min(fe_span[f][0], e)
  *             fe_span[f][1] = max(fe_span[f][1], e)
  *             ef_span[e][0] = min(ef_span[e][0], f)             # <<<<<<<<<<<<<<
@@ -64030,7 +64030,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1909
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1909
  *             fe_span[f][1] = max(fe_span[f][1], e)
  *             ef_span[e][0] = min(ef_span[e][0], f)
  *             ef_span[e][1] = max(ef_span[e][1], f)             # <<<<<<<<<<<<<<
@@ -64067,7 +64067,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1912
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1912
  * 
  *         # Target side word coverage
  *         cover = [0] * e_len             # <<<<<<<<<<<<<<
@@ -64088,7 +64088,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   __pyx_cur_scope->__pyx_v_cover = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1914
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1914
  *         cover = [0] * e_len
  *         # Non-terminal coverage
  *         f_nt_cover = [0] * f_len             # <<<<<<<<<<<<<<
@@ -64108,7 +64108,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   __pyx_v_f_nt_cover = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1915
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1915
  *         # Non-terminal coverage
  *         f_nt_cover = [0] * f_len
  *         e_nt_cover = [0] * e_len             # <<<<<<<<<<<<<<
@@ -64129,7 +64129,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   __pyx_cur_scope->__pyx_v_e_nt_cover = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1920
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1920
  *         # f_ i and j are current, e_ i and j are previous
  *         # We care _considering_ f_j, so it is not yet in counts
  *         def extract(f_i, f_j, e_i, e_j, min_bound, wc, links, nt, nt_open):             # <<<<<<<<<<<<<<
@@ -64142,7 +64142,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   __pyx_cur_scope->__pyx_v_extract = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2026
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2026
  * 
  *         # Try to extract phrases from every f index
  *         for f_i from 0 <= f_i < f_len:             # <<<<<<<<<<<<<<
@@ -64152,7 +64152,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   __pyx_t_11 = __Pyx_PyInt_As_long(__pyx_cur_scope->__pyx_v_f_len); if (unlikely((__pyx_t_11 == (long)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2026; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   for (__pyx_v_f_i = 0; __pyx_v_f_i < __pyx_t_11; __pyx_v_f_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2028
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2028
  *         for f_i from 0 <= f_i < f_len:
  *             # Skip if phrases won't be tight on left side
  *             if not al[f_i]:             # <<<<<<<<<<<<<<
@@ -64166,7 +64166,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
     __pyx_t_12 = ((!__pyx_t_10) != 0);
     if (__pyx_t_12) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2029
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2029
  *             # Skip if phrases won't be tight on left side
  *             if not al[f_i]:
  *                 continue             # <<<<<<<<<<<<<<
@@ -64176,7 +64176,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
       goto __pyx_L13_continue;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2030
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2030
  *             if not al[f_i]:
  *                 continue
  *             extract(f_i, f_i, f_len + 1, -1, f_i, 0, [], [], False)             # <<<<<<<<<<<<<<
@@ -64207,7 +64207,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
     __pyx_L13_continue:;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2032
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2032
  *             extract(f_i, f_i, f_len + 1, -1, f_i, 0, [], [], False)
  * 
  *         stats = self.online_stats[ctx_name]             # <<<<<<<<<<<<<<
@@ -64219,7 +64219,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   __pyx_v_stats = __pyx_t_14;
   __pyx_t_14 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2037
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2037
  *         # This could be more efficiently integrated with extraction
  *         # at the cost of readability
  *         for f, lex_i, lex_j in self.get_f_phrases(f_words):             # <<<<<<<<<<<<<<
@@ -64337,7 +64337,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
     __Pyx_XDECREF_SET(__pyx_v_lex_j, __pyx_t_6);
     __pyx_t_6 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2038
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2038
  *         # at the cost of readability
  *         for f, lex_i, lex_j in self.get_f_phrases(f_words):
  *             stats.samples_f[f] += 1             # <<<<<<<<<<<<<<
@@ -64360,7 +64360,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   }
   __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2041
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2041
  * 
  *         # Update phrase counts
  *         for rule in rules:             # <<<<<<<<<<<<<<
@@ -64386,7 +64386,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
     __Pyx_XDECREF_SET(__pyx_v_rule, __pyx_t_7);
     __pyx_t_7 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2042
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2042
  *         # Update phrase counts
  *         for rule in rules:
  *             (f_ph, e_ph, al) = rule[:3]             # <<<<<<<<<<<<<<
@@ -64461,7 +64461,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
     __Pyx_GIVEREF(__pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2043
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2043
  *         for rule in rules:
  *             (f_ph, e_ph, al) = rule[:3]
  *             stats.phrases_f[f_ph] += 1             # <<<<<<<<<<<<<<
@@ -64482,7 +64482,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2044
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2044
  *             (f_ph, e_ph, al) = rule[:3]
  *             stats.phrases_f[f_ph] += 1
  *             stats.phrases_e[e_ph] += 1             # <<<<<<<<<<<<<<
@@ -64503,7 +64503,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2045
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2045
  *             stats.phrases_f[f_ph] += 1
  *             stats.phrases_e[e_ph] += 1
  *             stats.phrases_fe[f_ph][e_ph] += 1             # <<<<<<<<<<<<<<
@@ -64527,7 +64527,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
     __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2046
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2046
  *             stats.phrases_e[e_ph] += 1
  *             stats.phrases_fe[f_ph][e_ph] += 1
  *             if not stats.phrases_al[f_ph][e_ph]:             # <<<<<<<<<<<<<<
@@ -64547,7 +64547,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
     __pyx_t_10 = ((!__pyx_t_12) != 0);
     if (__pyx_t_10) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2047
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2047
  *             stats.phrases_fe[f_ph][e_ph] += 1
  *             if not stats.phrases_al[f_ph][e_ph]:
  *                 stats.phrases_al[f_ph][e_ph] = al             # <<<<<<<<<<<<<<
@@ -64567,7 +64567,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   }
   __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2050
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2050
  * 
  *         # Update bilexical dictionary (if exists)
  *         if self.bilex:             # <<<<<<<<<<<<<<
@@ -64577,7 +64577,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   __pyx_t_10 = __Pyx_PyObject_IsTrue(__pyx_cur_scope->__pyx_v_self->bilex); if (unlikely(__pyx_t_10 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2050; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_10) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2051
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2051
  *         # Update bilexical dictionary (if exists)
  *         if self.bilex:
  *             self.bilex.update(f_words, e_words, alignment)             # <<<<<<<<<<<<<<
@@ -64606,7 +64606,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   }
   /*else*/ {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2053
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2053
  *             self.bilex.update(f_words, e_words, alignment)
  *         else:
  *             logger.warning('No online bilexical dictionary specified, not updating lexical weights')             # <<<<<<<<<<<<<<
@@ -64625,7 +64625,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   }
   __pyx_L25:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1886
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1886
  *     # Aggregate stats from a training instance
  *     # (Extract rules, update counts)
  *     def add_instance(self, f_words, e_words, alignment, ctx_name=None):             # <<<<<<<<<<<<<<
@@ -64664,7 +64664,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_25add_instanc
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2056
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2056
  * 
  *     # Create a rule from source, target, non-terminals, and alignments
  *     def form_rule(self, f_i, e_i, f_span, e_span, nt, al):             # <<<<<<<<<<<<<<
@@ -64769,7 +64769,7 @@ static PyObject *__pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_28form_rule(P
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2059
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2059
  * 
  *         # Substitute in non-terminals
  *         nt_inv = sorted(nt, cmp=lambda x, y: cmp(x[3], y[3]))             # <<<<<<<<<<<<<<
@@ -64882,7 +64882,7 @@ static PyObject *__pyx_lambda_funcdef_lambda6(CYTHON_UNUSED PyObject *__pyx_self
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2083
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2083
  *         # Adjusting alignment links takes some doing
  *         links = [list(link) for sub in al for link in sub]
  *         links_inv = sorted(links, cmp=lambda x, y: cmp(x[1], y[1]))             # <<<<<<<<<<<<<<
@@ -64996,7 +64996,7 @@ static PyObject *__pyx_lambda_funcdef_lambda7(CYTHON_UNUSED PyObject *__pyx_self
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_9form_rule_4generator15(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2117
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2117
  *         f = Phrase(f_sym)
  *         e = Phrase(e_sym)
  *         a = tuple(self.alignment.link(i, j) for i, j in links)             # <<<<<<<<<<<<<<
@@ -65181,7 +65181,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_9form_rule_4g
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2056
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2056
  * 
  *     # Create a rule from source, target, non-terminals, and alignments
  *     def form_rule(self, f_i, e_i, f_span, e_span, nt, al):             # <<<<<<<<<<<<<<
@@ -65238,7 +65238,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __Pyx_INCREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
   __Pyx_GIVEREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2059
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2059
  * 
  *         # Substitute in non-terminals
  *         nt_inv = sorted(nt, cmp=lambda x, y: cmp(x[3], y[3]))             # <<<<<<<<<<<<<<
@@ -65263,7 +65263,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __pyx_v_nt_inv = __pyx_t_3;
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2060
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2060
  *         # Substitute in non-terminals
  *         nt_inv = sorted(nt, cmp=lambda x, y: cmp(x[3], y[3]))
  *         f_sym = list(f_span[:])             # <<<<<<<<<<<<<<
@@ -65283,7 +65283,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __pyx_v_f_sym = ((PyObject*)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2061
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2061
  *         nt_inv = sorted(nt, cmp=lambda x, y: cmp(x[3], y[3]))
  *         f_sym = list(f_span[:])
  *         off = f_i             # <<<<<<<<<<<<<<
@@ -65293,7 +65293,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __Pyx_INCREF(__pyx_v_f_i);
   __pyx_v_off = __pyx_v_f_i;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2062
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2062
  *         f_sym = list(f_span[:])
  *         off = f_i
  *         for next_nt in nt:             # <<<<<<<<<<<<<<
@@ -65338,7 +65338,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __Pyx_XDECREF_SET(__pyx_v_next_nt, __pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2063
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2063
  *         off = f_i
  *         for next_nt in nt:
  *             nt_len = (next_nt[2] - next_nt[1]) + 1             # <<<<<<<<<<<<<<
@@ -65359,7 +65359,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __Pyx_XDECREF_SET(__pyx_v_nt_len, __pyx_t_1);
     __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2064
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2064
  *         for next_nt in nt:
  *             nt_len = (next_nt[2] - next_nt[1]) + 1
  *             i = 0             # <<<<<<<<<<<<<<
@@ -65369,7 +65369,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __Pyx_INCREF(__pyx_int_0);
     __Pyx_XDECREF_SET(__pyx_v_i, __pyx_int_0);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2065
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2065
  *             nt_len = (next_nt[2] - next_nt[1]) + 1
  *             i = 0
  *             while i < nt_len:             # <<<<<<<<<<<<<<
@@ -65382,7 +65382,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
       if (!__pyx_t_7) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2066
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2066
  *             i = 0
  *             while i < nt_len:
  *                 f_sym.pop(next_nt[1] - off)             # <<<<<<<<<<<<<<
@@ -65400,7 +65400,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
       __Pyx_GOTREF(__pyx_t_6);
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2067
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2067
  *             while i < nt_len:
  *                 f_sym.pop(next_nt[1] - off)
  *                 i += 1             # <<<<<<<<<<<<<<
@@ -65413,7 +65413,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
       __pyx_t_6 = 0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2068
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2068
  *                 f_sym.pop(next_nt[1] - off)
  *                 i += 1
  *             f_sym.insert(next_nt[1] - off, sym_setindex(self.category, next_nt[0]))             # <<<<<<<<<<<<<<
@@ -65436,7 +65436,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __pyx_t_10 = PyList_Insert(__pyx_v_f_sym, __pyx_t_8, __pyx_t_1); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2068; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2069
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2069
  *                 i += 1
  *             f_sym.insert(next_nt[1] - off, sym_setindex(self.category, next_nt[0]))
  *             off += (nt_len - 1)             # <<<<<<<<<<<<<<
@@ -65453,7 +65453,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   }
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2070
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2070
  *             f_sym.insert(next_nt[1] - off, sym_setindex(self.category, next_nt[0]))
  *             off += (nt_len - 1)
  *         e_sym = list(e_span[:])             # <<<<<<<<<<<<<<
@@ -65473,7 +65473,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __pyx_v_e_sym = ((PyObject*)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2071
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2071
  *             off += (nt_len - 1)
  *         e_sym = list(e_span[:])
  *         off = e_i             # <<<<<<<<<<<<<<
@@ -65483,7 +65483,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __Pyx_INCREF(__pyx_v_e_i);
   __Pyx_DECREF_SET(__pyx_v_off, __pyx_v_e_i);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2072
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2072
  *         e_sym = list(e_span[:])
  *         off = e_i
  *         for next_nt in nt_inv:             # <<<<<<<<<<<<<<
@@ -65528,7 +65528,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __Pyx_XDECREF_SET(__pyx_v_next_nt, __pyx_t_6);
     __pyx_t_6 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2073
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2073
  *         off = e_i
  *         for next_nt in nt_inv:
  *             nt_len = (next_nt[4] - next_nt[3]) + 1             # <<<<<<<<<<<<<<
@@ -65549,7 +65549,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __Pyx_XDECREF_SET(__pyx_v_nt_len, __pyx_t_1);
     __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2074
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2074
  *         for next_nt in nt_inv:
  *             nt_len = (next_nt[4] - next_nt[3]) + 1
  *             i = 0             # <<<<<<<<<<<<<<
@@ -65559,7 +65559,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __Pyx_INCREF(__pyx_int_0);
     __Pyx_XDECREF_SET(__pyx_v_i, __pyx_int_0);
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2075
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2075
  *             nt_len = (next_nt[4] - next_nt[3]) + 1
  *             i = 0
  *             while i < nt_len:             # <<<<<<<<<<<<<<
@@ -65572,7 +65572,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
       if (!__pyx_t_7) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2076
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2076
  *             i = 0
  *             while i < nt_len:
  *                 e_sym.pop(next_nt[3] - off)             # <<<<<<<<<<<<<<
@@ -65590,7 +65590,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2077
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2077
  *             while i < nt_len:
  *                 e_sym.pop(next_nt[3] - off)
  *                 i += 1             # <<<<<<<<<<<<<<
@@ -65603,7 +65603,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
       __pyx_t_2 = 0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2078
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2078
  *                 e_sym.pop(next_nt[3] - off)
  *                 i += 1
  *             e_sym.insert(next_nt[3] - off, sym_setindex(self.category, next_nt[0]))             # <<<<<<<<<<<<<<
@@ -65626,7 +65626,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __pyx_t_10 = PyList_Insert(__pyx_v_e_sym, __pyx_t_8, __pyx_t_1); if (unlikely(__pyx_t_10 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2078; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2079
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2079
  *                 i += 1
  *             e_sym.insert(next_nt[3] - off, sym_setindex(self.category, next_nt[0]))
  *             off += (nt_len - 1)             # <<<<<<<<<<<<<<
@@ -65643,7 +65643,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   }
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2082
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2082
  * 
  *         # Adjusting alignment links takes some doing
  *         links = [list(link) for sub in al for link in sub]             # <<<<<<<<<<<<<<
@@ -65744,7 +65744,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __pyx_cur_scope->__pyx_v_links = ((PyObject*)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2083
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2083
  *         # Adjusting alignment links takes some doing
  *         links = [list(link) for sub in al for link in sub]
  *         links_inv = sorted(links, cmp=lambda x, y: cmp(x[1], y[1]))             # <<<<<<<<<<<<<<
@@ -65769,7 +65769,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __pyx_v_links_inv = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2084
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2084
  *         links = [list(link) for sub in al for link in sub]
  *         links_inv = sorted(links, cmp=lambda x, y: cmp(x[1], y[1]))
  *         links_len = len(links)             # <<<<<<<<<<<<<<
@@ -65786,7 +65786,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_v_links_len = __pyx_t_4;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2085
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2085
  *         links_inv = sorted(links, cmp=lambda x, y: cmp(x[1], y[1]))
  *         links_len = len(links)
  *         nt_len = len(nt)             # <<<<<<<<<<<<<<
@@ -65799,7 +65799,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __Pyx_XDECREF_SET(__pyx_v_nt_len, __pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2086
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2086
  *         links_len = len(links)
  *         nt_len = len(nt)
  *         nt_i = 0             # <<<<<<<<<<<<<<
@@ -65809,7 +65809,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __Pyx_INCREF(__pyx_int_0);
   __pyx_v_nt_i = __pyx_int_0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2087
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2087
  *         nt_len = len(nt)
  *         nt_i = 0
  *         off = f_i             # <<<<<<<<<<<<<<
@@ -65819,7 +65819,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __Pyx_INCREF(__pyx_v_f_i);
   __Pyx_DECREF_SET(__pyx_v_off, __pyx_v_f_i);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2088
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2088
  *         nt_i = 0
  *         off = f_i
  *         i = 0             # <<<<<<<<<<<<<<
@@ -65829,7 +65829,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __Pyx_INCREF(__pyx_int_0);
   __Pyx_XDECREF_SET(__pyx_v_i, __pyx_int_0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2089
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2089
  *         off = f_i
  *         i = 0
  *         while i < links_len:             # <<<<<<<<<<<<<<
@@ -65845,7 +65845,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (!__pyx_t_7) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2090
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2090
  *         i = 0
  *         while i < links_len:
  *             while nt_i < nt_len and links[i][0] > nt[nt_i][1]:             # <<<<<<<<<<<<<<
@@ -65878,7 +65878,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
       }
       if (!__pyx_t_14) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2091
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2091
  *         while i < links_len:
  *             while nt_i < nt_len and links[i][0] > nt[nt_i][1]:
  *                 off += (nt[nt_i][2] - nt[nt_i][1])             # <<<<<<<<<<<<<<
@@ -65905,7 +65905,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
       __Pyx_DECREF_SET(__pyx_v_off, __pyx_t_1);
       __pyx_t_1 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2092
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2092
  *             while nt_i < nt_len and links[i][0] > nt[nt_i][1]:
  *                 off += (nt[nt_i][2] - nt[nt_i][1])
  *                 nt_i += 1             # <<<<<<<<<<<<<<
@@ -65918,7 +65918,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
       __pyx_t_1 = 0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2093
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2093
  *                 off += (nt[nt_i][2] - nt[nt_i][1])
  *                 nt_i += 1
  *             links[i][0] -= off             # <<<<<<<<<<<<<<
@@ -65937,7 +65937,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2094
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2094
  *                 nt_i += 1
  *             links[i][0] -= off
  *             i += 1             # <<<<<<<<<<<<<<
@@ -65950,7 +65950,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __pyx_t_1 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2095
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2095
  *             links[i][0] -= off
  *             i += 1
  *         nt_i = 0             # <<<<<<<<<<<<<<
@@ -65960,7 +65960,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __Pyx_INCREF(__pyx_int_0);
   __Pyx_DECREF_SET(__pyx_v_nt_i, __pyx_int_0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2096
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2096
  *             i += 1
  *         nt_i = 0
  *         off = e_i             # <<<<<<<<<<<<<<
@@ -65970,7 +65970,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __Pyx_INCREF(__pyx_v_e_i);
   __Pyx_DECREF_SET(__pyx_v_off, __pyx_v_e_i);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2097
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2097
  *         nt_i = 0
  *         off = e_i
  *         i = 0             # <<<<<<<<<<<<<<
@@ -65980,7 +65980,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __Pyx_INCREF(__pyx_int_0);
   __Pyx_DECREF_SET(__pyx_v_i, __pyx_int_0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2098
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2098
  *         off = e_i
  *         i = 0
  *         while i < links_len:             # <<<<<<<<<<<<<<
@@ -65996,7 +65996,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     if (!__pyx_t_14) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2099
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2099
  *         i = 0
  *         while i < links_len:
  *             while nt_i < nt_len and links_inv[i][1] > nt_inv[nt_i][3]:             # <<<<<<<<<<<<<<
@@ -66029,7 +66029,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
       }
       if (!__pyx_t_13) break;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2100
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2100
  *         while i < links_len:
  *             while nt_i < nt_len and links_inv[i][1] > nt_inv[nt_i][3]:
  *                 off += (nt_inv[nt_i][4] - nt_inv[nt_i][3])             # <<<<<<<<<<<<<<
@@ -66056,7 +66056,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
       __Pyx_DECREF_SET(__pyx_v_off, __pyx_t_1);
       __pyx_t_1 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2101
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2101
  *             while nt_i < nt_len and links_inv[i][1] > nt_inv[nt_i][3]:
  *                 off += (nt_inv[nt_i][4] - nt_inv[nt_i][3])
  *                 nt_i += 1             # <<<<<<<<<<<<<<
@@ -66069,7 +66069,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
       __pyx_t_1 = 0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2102
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2102
  *                 off += (nt_inv[nt_i][4] - nt_inv[nt_i][3])
  *                 nt_i += 1
  *             links_inv[i][1] -= off             # <<<<<<<<<<<<<<
@@ -66088,7 +66088,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2103
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2103
  *                 nt_i += 1
  *             links_inv[i][1] -= off
  *             i += 1             # <<<<<<<<<<<<<<
@@ -66101,7 +66101,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __pyx_t_1 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2106
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2106
  * 
  *         # Find lexical span
  *         lex_f_i = f_i             # <<<<<<<<<<<<<<
@@ -66111,7 +66111,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __Pyx_INCREF(__pyx_v_f_i);
   __pyx_v_lex_f_i = __pyx_v_f_i;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2107
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2107
  *         # Find lexical span
  *         lex_f_i = f_i
  *         lex_f_j = f_i + (len(f_span) - 1)             # <<<<<<<<<<<<<<
@@ -66127,7 +66127,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __pyx_v_lex_f_j = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2108
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2108
  *         lex_f_i = f_i
  *         lex_f_j = f_i + (len(f_span) - 1)
  *         if nt:             # <<<<<<<<<<<<<<
@@ -66137,7 +66137,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __pyx_t_13 = __Pyx_PyObject_IsTrue(__pyx_v_nt); if (unlikely(__pyx_t_13 < 0)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2108; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_13) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2109
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2109
  *         lex_f_j = f_i + (len(f_span) - 1)
  *         if nt:
  *             if nt[0][1] == lex_f_i:             # <<<<<<<<<<<<<<
@@ -66155,7 +66155,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (__pyx_t_13) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2110
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2110
  *         if nt:
  *             if nt[0][1] == lex_f_i:
  *                 lex_f_i += (nt[0][2] - nt[0][1]) + 1             # <<<<<<<<<<<<<<
@@ -66188,7 +66188,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     }
     __pyx_L24:;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2111
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2111
  *             if nt[0][1] == lex_f_i:
  *                 lex_f_i += (nt[0][2] - nt[0][1]) + 1
  *             if nt[-1][2] == lex_f_j:             # <<<<<<<<<<<<<<
@@ -66206,7 +66206,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
     if (__pyx_t_13) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2112
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2112
  *                 lex_f_i += (nt[0][2] - nt[0][1]) + 1
  *             if nt[-1][2] == lex_f_j:
  *                 lex_f_j -= (nt[-1][2] - nt[-1][1]) + 1             # <<<<<<<<<<<<<<
@@ -66242,7 +66242,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   }
   __pyx_L23:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2115
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2115
  * 
  *         # Create rule (f_phrase, e_phrase, links, f_link_min, f_link_max)
  *         f = Phrase(f_sym)             # <<<<<<<<<<<<<<
@@ -66260,7 +66260,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __pyx_v_f = ((struct __pyx_obj_4cdec_2sa_3_sa_Phrase *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2116
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2116
  *         # Create rule (f_phrase, e_phrase, links, f_link_min, f_link_max)
  *         f = Phrase(f_sym)
  *         e = Phrase(e_sym)             # <<<<<<<<<<<<<<
@@ -66278,7 +66278,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __pyx_v_e = ((struct __pyx_obj_4cdec_2sa_3_sa_Phrase *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2117
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2117
  *         f = Phrase(f_sym)
  *         e = Phrase(e_sym)
  *         a = tuple(self.alignment.link(i, j) for i, j in links)             # <<<<<<<<<<<<<<
@@ -66298,7 +66298,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __pyx_v_a = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2118
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2118
  *         e = Phrase(e_sym)
  *         a = tuple(self.alignment.link(i, j) for i, j in links)
  *         return (f, e, a, lex_f_i, lex_f_j)             # <<<<<<<<<<<<<<
@@ -66327,7 +66327,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2056
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2056
  * 
  *     # Create a rule from source, target, non-terminals, and alignments
  *     def form_rule(self, f_i, e_i, f_span, e_span, nt, al):             # <<<<<<<<<<<<<<
@@ -66367,7 +66367,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_27form_rule(s
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2121
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2121
  * 
  *     # Rule string from rule
  *     def fmt_rule(self, f, e, a):             # <<<<<<<<<<<<<<
@@ -66446,7 +66446,7 @@ static PyObject *__pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_30fmt_rule(Py
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8fmt_rule_2generator16(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2122
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2122
  *     # Rule string from rule
  *     def fmt_rule(self, f, e, a):
  *         a_str = ' '.join('{0}-{1}'.format(*self.alignment.unlink(packed)) for packed in a)             # <<<<<<<<<<<<<<
@@ -66616,7 +66616,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_23HieroCachingRuleFactory_8fmt_rule_2ge
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2121
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2121
  * 
  *     # Rule string from rule
  *     def fmt_rule(self, f, e, a):             # <<<<<<<<<<<<<<
@@ -66649,7 +66649,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_29fmt_rule(st
   __Pyx_INCREF(__pyx_cur_scope->__pyx_v_a);
   __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_a);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2122
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2122
  *     # Rule string from rule
  *     def fmt_rule(self, f, e, a):
  *         a_str = ' '.join('{0}-{1}'.format(*self.alignment.unlink(packed)) for packed in a)             # <<<<<<<<<<<<<<
@@ -66664,7 +66664,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_29fmt_rule(st
   __pyx_v_a_str = ((PyObject*)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2123
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2123
  *     def fmt_rule(self, f, e, a):
  *         a_str = ' '.join('{0}-{1}'.format(*self.alignment.unlink(packed)) for packed in a)
  *         return '[X] ||| {0} ||| {1} ||| {2}'.format(f, e, a_str)             # <<<<<<<<<<<<<<
@@ -66693,7 +66693,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_29fmt_rule(st
   __pyx_t_3 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2121
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2121
  * 
  *     # Rule string from rule
  *     def fmt_rule(self, f, e, a):             # <<<<<<<<<<<<<<
@@ -66716,7 +66716,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_29fmt_rule(st
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2127
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2127
  *     # Lookup online stats for phrase pair (f, e).  Return None if no match.
  *     # IMPORTANT: use get() to avoid adding items to defaultdict
  *     def online_ctx_lookup(self, f, e, ctx_name=None):             # <<<<<<<<<<<<<<
@@ -66815,7 +66815,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_31online_ctx_
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("online_ctx_lookup", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2128
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2128
  *     # IMPORTANT: use get() to avoid adding items to defaultdict
  *     def online_ctx_lookup(self, f, e, ctx_name=None):
  *         if self.online:             # <<<<<<<<<<<<<<
@@ -66825,7 +66825,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_31online_ctx_
   __pyx_t_1 = (__pyx_v_self->online != 0);
   if (__pyx_t_1) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2129
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2129
  *     def online_ctx_lookup(self, f, e, ctx_name=None):
  *         if self.online:
  *             stats = self.online_stats[ctx_name]             # <<<<<<<<<<<<<<
@@ -66837,7 +66837,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_31online_ctx_
     __pyx_v_stats = __pyx_t_2;
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2130
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2130
  *         if self.online:
  *             stats = self.online_stats[ctx_name]
  *             fcount = stats.phrases_f.get(f, 0)             # <<<<<<<<<<<<<<
@@ -66864,7 +66864,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_31online_ctx_
     __pyx_v_fcount = __pyx_t_4;
     __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2131
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2131
  *             stats = self.online_stats[ctx_name]
  *             fcount = stats.phrases_f.get(f, 0)
  *             fsample_count = stats.samples_f.get(f, 0)             # <<<<<<<<<<<<<<
@@ -66891,7 +66891,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_31online_ctx_
     __pyx_v_fsample_count = __pyx_t_3;
     __pyx_t_3 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2132
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2132
  *             fcount = stats.phrases_f.get(f, 0)
  *             fsample_count = stats.samples_f.get(f, 0)
  *             d = stats.phrases_fe.get(f, None)             # <<<<<<<<<<<<<<
@@ -66918,7 +66918,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_31online_ctx_
     __pyx_v_d = __pyx_t_2;
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2133
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2133
  *             fsample_count = stats.samples_f.get(f, 0)
  *             d = stats.phrases_fe.get(f, None)
  *             paircount = d.get(e, 0) if d else 0             # <<<<<<<<<<<<<<
@@ -66950,7 +66950,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_31online_ctx_
     __pyx_v_paircount = __pyx_t_2;
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2134
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2134
  *             d = stats.phrases_fe.get(f, None)
  *             paircount = d.get(e, 0) if d else 0
  *             return OnlineFeatureContext(fcount, fsample_count, paircount)             # <<<<<<<<<<<<<<
@@ -66980,7 +66980,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_31online_ctx_
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2135
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2135
  *             paircount = d.get(e, 0) if d else 0
  *             return OnlineFeatureContext(fcount, fsample_count, paircount)
  *         return None             # <<<<<<<<<<<<<<
@@ -66992,7 +66992,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_31online_ctx_
   __pyx_r = Py_None;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2127
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2127
  *     # Lookup online stats for phrase pair (f, e).  Return None if no match.
  *     # IMPORTANT: use get() to avoid adding items to defaultdict
  *     def online_ctx_lookup(self, f, e, ctx_name=None):             # <<<<<<<<<<<<<<
@@ -67019,7 +67019,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_31online_ctx_
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2140
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2140
  *     # (Used for EGivenFCoherent)
  *     # Return set of (fphrase, lex_i, lex_j)
  *     def get_f_phrases(self, f_words):             # <<<<<<<<<<<<<<
@@ -67040,7 +67040,7 @@ static PyObject *__pyx_pw_4cdec_2sa_3_sa_23HieroCachingRuleFactory_34get_f_phras
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2145
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2145
  *         phrases = set() # (fphrase, lex_i, lex_j)
  * 
  *         def extract(f_i, f_j, lex_i, lex_j, wc, ntc, syms):             # <<<<<<<<<<<<<<
@@ -67180,7 +67180,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
   __pyx_outer_scope = (struct __pyx_obj_4cdec_2sa_3_sa___pyx_scope_struct_26_get_f_phrases *) __Pyx_CyFunction_GetClosure(__pyx_self);
   __pyx_cur_scope = __pyx_outer_scope;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2147
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2147
  *         def extract(f_i, f_j, lex_i, lex_j, wc, ntc, syms):
  *             # Phrase extraction limits
  *             if f_j > (f_len - 1) or (f_j - f_i) + 1 > self.max_initial_size:             # <<<<<<<<<<<<<<
@@ -67213,7 +67213,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
   }
   if (__pyx_t_6) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2148
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2148
  *             # Phrase extraction limits
  *             if f_j > (f_len - 1) or (f_j - f_i) + 1 > self.max_initial_size:
  *                 return             # <<<<<<<<<<<<<<
@@ -67225,7 +67225,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
     goto __pyx_L0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2150
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2150
  *                 return
  *             # Extend with word
  *             if wc + ntc < self.max_length:             # <<<<<<<<<<<<<<
@@ -67244,7 +67244,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (__pyx_t_6) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2151
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2151
  *             # Extend with word
  *             if wc + ntc < self.max_length:
  *                 syms.append(f_words[f_j])             # <<<<<<<<<<<<<<
@@ -67257,7 +67257,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
     __pyx_t_7 = __Pyx_PyObject_Append(__pyx_v_syms, __pyx_t_1); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2151; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2152
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2152
  *             if wc + ntc < self.max_length:
  *                 syms.append(f_words[f_j])
  *                 f = Phrase(syms)             # <<<<<<<<<<<<<<
@@ -67275,7 +67275,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
     __pyx_v_f = ((struct __pyx_obj_4cdec_2sa_3_sa_Phrase *)__pyx_t_2);
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2153
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2153
  *                 syms.append(f_words[f_j])
  *                 f = Phrase(syms)
  *                 new_lex_i = min(lex_i, f_j)             # <<<<<<<<<<<<<<
@@ -67304,7 +67304,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
     __pyx_v_new_lex_i = __pyx_t_2;
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2154
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2154
  *                 f = Phrase(syms)
  *                 new_lex_i = min(lex_i, f_j)
  *                 new_lex_j = max(lex_j, f_j)             # <<<<<<<<<<<<<<
@@ -67333,7 +67333,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
     __pyx_v_new_lex_j = __pyx_t_2;
     __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2155
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2155
  *                 new_lex_i = min(lex_i, f_j)
  *                 new_lex_j = max(lex_j, f_j)
  *                 phrases.add((f, new_lex_i, new_lex_j))             # <<<<<<<<<<<<<<
@@ -67359,7 +67359,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
     __pyx_t_7 = PySet_Add(__pyx_cur_scope->__pyx_v_phrases, __pyx_t_2); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2156
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2156
  *                 new_lex_j = max(lex_j, f_j)
  *                 phrases.add((f, new_lex_i, new_lex_j))
  *                 extract(f_i, f_j + 1, new_lex_i, new_lex_j, wc + 1, ntc, syms)             # <<<<<<<<<<<<<<
@@ -67377,7 +67377,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2157
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2157
  *                 phrases.add((f, new_lex_i, new_lex_j))
  *                 extract(f_i, f_j + 1, new_lex_i, new_lex_j, wc + 1, ntc, syms)
  *                 syms.pop()             # <<<<<<<<<<<<<<
@@ -67391,7 +67391,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
   }
   __pyx_L4:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2159
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2159
  *                 syms.pop()
  *             # Extend with existing non-terminal
  *             if syms and sym_isvar(syms[-1]):             # <<<<<<<<<<<<<<
@@ -67410,7 +67410,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
   }
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2161
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2161
  *             if syms and sym_isvar(syms[-1]):
  *                 # Don't re-extract the same phrase
  *                 extract(f_i, f_j + 1, lex_i, lex_j, wc, ntc, syms)             # <<<<<<<<<<<<<<
@@ -67428,7 +67428,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
   }
   __pyx_L5:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2163
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2163
  *                 extract(f_i, f_j + 1, lex_i, lex_j, wc, ntc, syms)
  *             # Extend with new non-terminal
  *             if wc + ntc < self.max_length:             # <<<<<<<<<<<<<<
@@ -67447,7 +67447,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   if (__pyx_t_3) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2164
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2164
  *             # Extend with new non-terminal
  *             if wc + ntc < self.max_length:
  *                 if not syms or (ntc < self.max_nonterminals and not sym_isvar(syms[-1])):             # <<<<<<<<<<<<<<
@@ -67480,7 +67480,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
     }
     if (__pyx_t_3) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2165
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2165
  *             if wc + ntc < self.max_length:
  *                 if not syms or (ntc < self.max_nonterminals and not sym_isvar(syms[-1])):
  *                     syms.append(sym_setindex(self.category, ntc + 1))             # <<<<<<<<<<<<<<
@@ -67497,7 +67497,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
       __pyx_t_7 = __Pyx_PyObject_Append(__pyx_v_syms, __pyx_t_4); if (unlikely(__pyx_t_7 == -1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2165; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2166
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2166
  *                 if not syms or (ntc < self.max_nonterminals and not sym_isvar(syms[-1])):
  *                     syms.append(sym_setindex(self.category, ntc + 1))
  *                     f = Phrase(syms)             # <<<<<<<<<<<<<<
@@ -67515,7 +67515,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
       __Pyx_XDECREF_SET(__pyx_v_f, ((struct __pyx_obj_4cdec_2sa_3_sa_Phrase *)__pyx_t_2));
       __pyx_t_2 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2167
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2167
  *                     syms.append(sym_setindex(self.category, ntc + 1))
  *                     f = Phrase(syms)
  *                     if wc > 0:             # <<<<<<<<<<<<<<
@@ -67527,7 +67527,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       if (__pyx_t_3) {
 
-        /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2168
+        /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2168
  *                     f = Phrase(syms)
  *                     if wc > 0:
  *                         phrases.add((f, lex_i, lex_j))             # <<<<<<<<<<<<<<
@@ -67556,7 +67556,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
       }
       __pyx_L8:;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2169
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2169
  *                     if wc > 0:
  *                         phrases.add((f, lex_i, lex_j))
  *                     extract(f_i, f_j + 1, lex_i, lex_j, wc, ntc + 1, syms)             # <<<<<<<<<<<<<<
@@ -67574,7 +67574,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2170
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2170
  *                         phrases.add((f, lex_i, lex_j))
  *                     extract(f_i, f_j + 1, lex_i, lex_j, wc, ntc + 1, syms)
  *                     syms.pop()             # <<<<<<<<<<<<<<
@@ -67591,7 +67591,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
   }
   __pyx_L6:;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2145
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2145
  *         phrases = set() # (fphrase, lex_i, lex_j)
  * 
  *         def extract(f_i, f_j, lex_i, lex_j, wc, ntc, syms):             # <<<<<<<<<<<<<<
@@ -67618,7 +67618,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_13get_f_phras
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2140
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2140
  *     # (Used for EGivenFCoherent)
  *     # Return set of (fphrase, lex_i, lex_j)
  *     def get_f_phrases(self, f_words):             # <<<<<<<<<<<<<<
@@ -67654,7 +67654,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_33get_f_phras
   __Pyx_INCREF(__pyx_cur_scope->__pyx_v_f_words);
   __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_f_words);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2142
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2142
  *     def get_f_phrases(self, f_words):
  * 
  *         f_len = len(f_words)             # <<<<<<<<<<<<<<
@@ -67667,7 +67667,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_33get_f_phras
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __pyx_cur_scope->__pyx_v_f_len = __pyx_t_2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2143
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2143
  * 
  *         f_len = len(f_words)
  *         phrases = set() # (fphrase, lex_i, lex_j)             # <<<<<<<<<<<<<<
@@ -67680,7 +67680,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_33get_f_phras
   __pyx_cur_scope->__pyx_v_phrases = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2145
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2145
  *         phrases = set() # (fphrase, lex_i, lex_j)
  * 
  *         def extract(f_i, f_j, lex_i, lex_j, wc, ntc, syms):             # <<<<<<<<<<<<<<
@@ -67693,7 +67693,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_33get_f_phras
   __pyx_cur_scope->__pyx_v_extract = __pyx_t_1;
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2173
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2173
  * 
  *         # Try to extract phrases from every f index
  *         for f_i from 0 <= f_i < f_len:             # <<<<<<<<<<<<<<
@@ -67703,7 +67703,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_33get_f_phras
   __pyx_t_2 = __pyx_cur_scope->__pyx_v_f_len;
   for (__pyx_v_f_i = 0; __pyx_v_f_i < __pyx_t_2; __pyx_v_f_i++) {
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2174
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2174
  *         # Try to extract phrases from every f index
  *         for f_i from 0 <= f_i < f_len:
  *             extract(f_i, f_i, f_len, -1, 0, 0, [])             # <<<<<<<<<<<<<<
@@ -67727,7 +67727,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_33get_f_phras
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2176
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2176
  *             extract(f_i, f_i, f_len, -1, 0, 0, [])
  * 
  *         return phrases             # <<<<<<<<<<<<<<
@@ -67739,7 +67739,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_33get_f_phras
   __pyx_r = __pyx_cur_scope->__pyx_v_phrases;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2140
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2140
  *     # (Used for EGivenFCoherent)
  *     # Return set of (fphrase, lex_i, lex_j)
  *     def get_f_phrases(self, f_words):             # <<<<<<<<<<<<<<
@@ -67763,7 +67763,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_33get_f_phras
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2179
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2179
  * 
  *     # Drop online stats for a context
  *     def drop_ctx(self, ctx_name=None):             # <<<<<<<<<<<<<<
@@ -67839,7 +67839,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_35drop_ctx(st
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("drop_ctx", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2180
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2180
  *     # Drop online stats for a context
  *     def drop_ctx(self, ctx_name=None):
  *         self.online_stats.pop(ctx_name, None)             # <<<<<<<<<<<<<<
@@ -67862,7 +67862,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_35drop_ctx(st
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2179
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2179
  * 
  *     # Drop online stats for a context
  *     def drop_ctx(self, ctx_name=None):             # <<<<<<<<<<<<<<
@@ -67885,7 +67885,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_23HieroCachingRuleFactory_35drop_ctx(st
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2183
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2183
  * 
  * # Spans are _inclusive_ on both ends [i, j]
  * def span_check(vec, i, j):             # <<<<<<<<<<<<<<
@@ -67975,7 +67975,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_16span_check(CYTHON_UNUSED PyObject *__
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("span_check", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2184
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2184
  * # Spans are _inclusive_ on both ends [i, j]
  * def span_check(vec, i, j):
  *     k = i             # <<<<<<<<<<<<<<
@@ -67985,7 +67985,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_16span_check(CYTHON_UNUSED PyObject *__
   __Pyx_INCREF(__pyx_v_i);
   __pyx_v_k = __pyx_v_i;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2185
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2185
  * def span_check(vec, i, j):
  *     k = i
  *     while k <= j:             # <<<<<<<<<<<<<<
@@ -67998,7 +67998,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_16span_check(CYTHON_UNUSED PyObject *__
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     if (!__pyx_t_2) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2186
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2186
  *     k = i
  *     while k <= j:
  *         if vec[k]:             # <<<<<<<<<<<<<<
@@ -68011,7 +68011,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_16span_check(CYTHON_UNUSED PyObject *__
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     if (__pyx_t_2) {
 
-      /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2187
+      /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2187
  *     while k <= j:
  *         if vec[k]:
  *             return False             # <<<<<<<<<<<<<<
@@ -68024,7 +68024,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_16span_check(CYTHON_UNUSED PyObject *__
       goto __pyx_L0;
     }
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2188
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2188
  *         if vec[k]:
  *             return False
  *         k += 1             # <<<<<<<<<<<<<<
@@ -68037,7 +68037,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_16span_check(CYTHON_UNUSED PyObject *__
     __pyx_t_1 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2189
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2189
  *             return False
  *         k += 1
  *     return True             # <<<<<<<<<<<<<<
@@ -68049,7 +68049,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_16span_check(CYTHON_UNUSED PyObject *__
   __pyx_r = Py_True;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2183
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2183
  * 
  * # Spans are _inclusive_ on both ends [i, j]
  * def span_check(vec, i, j):             # <<<<<<<<<<<<<<
@@ -68069,7 +68069,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_16span_check(CYTHON_UNUSED PyObject *__
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2191
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2191
  *     return True
  * 
  * def span_inc(vec, i, j):             # <<<<<<<<<<<<<<
@@ -68161,7 +68161,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_18span_inc(CYTHON_UNUSED PyObject *__py
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("span_inc", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2192
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2192
  * 
  * def span_inc(vec, i, j):
  *     k = i             # <<<<<<<<<<<<<<
@@ -68171,7 +68171,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_18span_inc(CYTHON_UNUSED PyObject *__py
   __Pyx_INCREF(__pyx_v_i);
   __pyx_v_k = __pyx_v_i;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2193
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2193
  * def span_inc(vec, i, j):
  *     k = i
  *     while k <= j:             # <<<<<<<<<<<<<<
@@ -68184,7 +68184,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_18span_inc(CYTHON_UNUSED PyObject *__py
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     if (!__pyx_t_2) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2194
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2194
  *     k = i
  *     while k <= j:
  *         vec[k] += 1             # <<<<<<<<<<<<<<
@@ -68202,7 +68202,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_18span_inc(CYTHON_UNUSED PyObject *__py
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2195
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2195
  *     while k <= j:
  *         vec[k] += 1
  *         k += 1             # <<<<<<<<<<<<<<
@@ -68215,7 +68215,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_18span_inc(CYTHON_UNUSED PyObject *__py
     __pyx_t_1 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2191
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2191
  *     return True
  * 
  * def span_inc(vec, i, j):             # <<<<<<<<<<<<<<
@@ -68239,7 +68239,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_18span_inc(CYTHON_UNUSED PyObject *__py
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2197
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2197
  *         k += 1
  * 
  * def span_dec(vec, i, j):             # <<<<<<<<<<<<<<
@@ -68331,7 +68331,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_20span_dec(CYTHON_UNUSED PyObject *__py
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("span_dec", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2198
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2198
  * 
  * def span_dec(vec, i, j):
  *     k = i             # <<<<<<<<<<<<<<
@@ -68341,7 +68341,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_20span_dec(CYTHON_UNUSED PyObject *__py
   __Pyx_INCREF(__pyx_v_i);
   __pyx_v_k = __pyx_v_i;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2199
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2199
  * def span_dec(vec, i, j):
  *     k = i
  *     while k <= j:             # <<<<<<<<<<<<<<
@@ -68354,7 +68354,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_20span_dec(CYTHON_UNUSED PyObject *__py
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
     if (!__pyx_t_2) break;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2200
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2200
  *     k = i
  *     while k <= j:
  *         vec[k] -= 1             # <<<<<<<<<<<<<<
@@ -68371,7 +68371,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_20span_dec(CYTHON_UNUSED PyObject *__py
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2201
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2201
  *     while k <= j:
  *         vec[k] -= 1
  *         k += 1             # <<<<<<<<<<<<<<
@@ -68382,7 +68382,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_20span_dec(CYTHON_UNUSED PyObject *__py
     __pyx_t_1 = 0;
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2197
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2197
  *         k += 1
  * 
  * def span_dec(vec, i, j):             # <<<<<<<<<<<<<<
@@ -68406,7 +68406,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_20span_dec(CYTHON_UNUSED PyObject *__py
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":7
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":7
  * 
  * cdef class FeatureVector:
  *     def __cinit__(self):             # <<<<<<<<<<<<<<
@@ -68441,7 +68441,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_13FeatureVector___cinit__(struct __pyx_obj_4c
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__cinit__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":8
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":8
  * cdef class FeatureVector:
  *     def __cinit__(self):
  *         self.names = IntList(INITIAL_CAPACITY, INCREMENT)             # <<<<<<<<<<<<<<
@@ -68469,7 +68469,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_13FeatureVector___cinit__(struct __pyx_obj_4c
   __pyx_v_self->names = ((struct __pyx_obj_4cdec_2sa_3_sa_IntList *)__pyx_t_2);
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":9
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":9
  *     def __cinit__(self):
  *         self.names = IntList(INITIAL_CAPACITY, INCREMENT)
  *         self.values = FloatList(INITIAL_CAPACITY, INCREMENT)             # <<<<<<<<<<<<<<
@@ -68497,7 +68497,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_13FeatureVector___cinit__(struct __pyx_obj_4c
   __pyx_v_self->values = ((struct __pyx_obj_4cdec_2sa_3_sa_FloatList *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":7
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":7
  * 
  * cdef class FeatureVector:
  *     def __cinit__(self):             # <<<<<<<<<<<<<<
@@ -68519,7 +68519,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_13FeatureVector___cinit__(struct __pyx_obj_4c
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":11
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":11
  *         self.values = FloatList(INITIAL_CAPACITY, INCREMENT)
  * 
  *     def set(self, unsigned name, float value):             # <<<<<<<<<<<<<<
@@ -68598,7 +68598,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_13FeatureVector_2set(struct __pyx_obj_4
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("set", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":12
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":12
  * 
  *     def set(self, unsigned name, float value):
  *         self.names.append(name)             # <<<<<<<<<<<<<<
@@ -68610,7 +68610,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_13FeatureVector_2set(struct __pyx_obj_4
   __pyx_t_2 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_self->names), __pyx_t_1); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 12; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":13
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":13
  *     def set(self, unsigned name, float value):
  *         self.names.append(name)
  *         self.values.append(value)             # <<<<<<<<<<<<<<
@@ -68622,7 +68622,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_13FeatureVector_2set(struct __pyx_obj_4
   __pyx_t_2 = __Pyx_PyObject_Append(((PyObject *)__pyx_v_self->values), __pyx_t_1); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":11
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":11
  *         self.values = FloatList(INITIAL_CAPACITY, INCREMENT)
  * 
  *     def set(self, unsigned name, float value):             # <<<<<<<<<<<<<<
@@ -68644,7 +68644,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_13FeatureVector_2set(struct __pyx_obj_4
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_13FeatureVector_6generator5(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":15
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":15
  *         self.values.append(value)
  * 
  *     def __iter__(self):             # <<<<<<<<<<<<<<
@@ -68727,7 +68727,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_13FeatureVector_6generator5(__pyx_Gener
   __pyx_L3_first_run:;
   if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":17
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":17
  *     def __iter__(self):
  *         cdef unsigned i
  *         for i in range(self.names.len):             # <<<<<<<<<<<<<<
@@ -68738,7 +68738,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_13FeatureVector_6generator5(__pyx_Gener
   for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_1; __pyx_t_2+=1) {
     __pyx_cur_scope->__pyx_v_i = __pyx_t_2;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":18
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":18
  *         cdef unsigned i
  *         for i in range(self.names.len):
  *             yield (FD.word(self.names[i]), self.values[i])             # <<<<<<<<<<<<<<
@@ -68776,7 +68776,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_13FeatureVector_6generator5(__pyx_Gener
     if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":15
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":15
  *         self.values.append(value)
  * 
  *     def __iter__(self):             # <<<<<<<<<<<<<<
@@ -68800,7 +68800,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_13FeatureVector_6generator5(__pyx_Gener
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":20
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":20
  *             yield (FD.word(self.names[i]), self.values[i])
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -68822,7 +68822,7 @@ static PyObject *__pyx_pw_4cdec_2sa_3_sa_13FeatureVector_8__str__(PyObject *__py
 }
 static PyObject *__pyx_gb_4cdec_2sa_3_sa_13FeatureVector_7__str___2generator17(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":21
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":21
  * 
  *     def __str__(self):
  *         return ' '.join('%s=%s' % feat for feat in self)             # <<<<<<<<<<<<<<
@@ -68967,7 +68967,7 @@ static PyObject *__pyx_gb_4cdec_2sa_3_sa_13FeatureVector_7__str___2generator17(_
   return NULL;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":20
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":20
  *             yield (FD.word(self.names[i]), self.values[i])
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -68995,7 +68995,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_13FeatureVector_7__str__(struct __pyx_o
   __Pyx_INCREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
   __Pyx_GIVEREF((PyObject *)__pyx_cur_scope->__pyx_v_self);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":21
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":21
  * 
  *     def __str__(self):
  *         return ' '.join('%s=%s' % feat for feat in self)             # <<<<<<<<<<<<<<
@@ -69012,7 +69012,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_13FeatureVector_7__str__(struct __pyx_o
   __pyx_t_2 = 0;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":20
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":20
  *             yield (FD.word(self.names[i]), self.values[i])
  * 
  *     def __str__(self):             # <<<<<<<<<<<<<<
@@ -69033,7 +69033,7 @@ static PyObject *__pyx_pf_4cdec_2sa_3_sa_13FeatureVector_7__str__(struct __pyx_o
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":25
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":25
  * cdef class Scorer:
  *     cdef models
  *     def __init__(self, *models):             # <<<<<<<<<<<<<<
@@ -69074,7 +69074,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Scorer___init__(struct __pyx_obj_4cdec_2sa_3
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":26
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":26
  *     cdef models
  *     def __init__(self, *models):
  *         names = [FD.index(<char *>model.__name__) for model in models]             # <<<<<<<<<<<<<<
@@ -69106,7 +69106,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Scorer___init__(struct __pyx_obj_4cdec_2sa_3
   __pyx_v_names = ((PyObject*)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":27
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":27
  *     def __init__(self, *models):
  *         names = [FD.index(<char *>model.__name__) for model in models]
  *         self.models = zip(names, models)             # <<<<<<<<<<<<<<
@@ -69130,7 +69130,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Scorer___init__(struct __pyx_obj_4cdec_2sa_3
   __pyx_v_self->models = __pyx_t_2;
   __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":25
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":25
  * cdef class Scorer:
  *     cdef models
  *     def __init__(self, *models):             # <<<<<<<<<<<<<<
@@ -69154,7 +69154,7 @@ static int __pyx_pf_4cdec_2sa_3_sa_6Scorer___init__(struct __pyx_obj_4cdec_2sa_3
   return __pyx_r;
 }
 
-/* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":29
+/* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":29
  *         self.models = zip(names, models)
  * 
  *     cdef FeatureVector score(self, ctx):             # <<<<<<<<<<<<<<
@@ -69181,7 +69181,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_FeatureVector *__pyx_f_4cdec_2sa_3_sa_6Sc
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("score", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":30
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":30
  * 
  *     cdef FeatureVector score(self, ctx):
  *         cdef FeatureVector scores = FeatureVector()             # <<<<<<<<<<<<<<
@@ -69193,7 +69193,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_FeatureVector *__pyx_f_4cdec_2sa_3_sa_6Sc
   __pyx_v_scores = ((struct __pyx_obj_4cdec_2sa_3_sa_FeatureVector *)__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":31
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":31
  *     cdef FeatureVector score(self, ctx):
  *         cdef FeatureVector scores = FeatureVector()
  *         for name, model in self.models:             # <<<<<<<<<<<<<<
@@ -69290,7 +69290,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_FeatureVector *__pyx_f_4cdec_2sa_3_sa_6Sc
     __Pyx_XDECREF_SET(__pyx_v_model, __pyx_t_6);
     __pyx_t_6 = 0;
 
-    /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":32
+    /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":32
  *         cdef FeatureVector scores = FeatureVector()
  *         for name, model in self.models:
  *             scores.set(name, model(ctx))             # <<<<<<<<<<<<<<
@@ -69322,7 +69322,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_FeatureVector *__pyx_f_4cdec_2sa_3_sa_6Sc
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":33
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":33
  *         for name, model in self.models:
  *             scores.set(name, model(ctx))
  *         return scores             # <<<<<<<<<<<<<<
@@ -69332,7 +69332,7 @@ static struct __pyx_obj_4cdec_2sa_3_sa_FeatureVector *__pyx_f_4cdec_2sa_3_sa_6Sc
   __pyx_r = __pyx_v_scores;
   goto __pyx_L0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":29
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":29
  *         self.models = zip(names, models)
  * 
  *     cdef FeatureVector score(self, ctx):             # <<<<<<<<<<<<<<
@@ -77344,9 +77344,9 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {&__pyx_n_s_use_collocations, __pyx_k_use_collocations, sizeof(__pyx_k_use_collocations), 0, 0, 1, 1},
   {&__pyx_n_s_use_index, __pyx_k_use_index, sizeof(__pyx_k_use_index), 0, 0, 1, 1},
   {&__pyx_n_s_use_sent_id, __pyx_k_use_sent_id, sizeof(__pyx_k_use_sent_id), 0, 0, 1, 1},
-  {&__pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt, __pyx_k_usr0_home_mdenkows_cdec_git_pyt, sizeof(__pyx_k_usr0_home_mdenkows_cdec_git_pyt), 0, 0, 1, 0},
-  {&__pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt_2, __pyx_k_usr0_home_mdenkows_cdec_git_pyt_2, sizeof(__pyx_k_usr0_home_mdenkows_cdec_git_pyt_2), 0, 0, 1, 0},
-  {&__pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt_3, __pyx_k_usr0_home_mdenkows_cdec_git_pyt_3, sizeof(__pyx_k_usr0_home_mdenkows_cdec_git_pyt_3), 0, 0, 1, 0},
+  {&__pyx_kp_s_usr0_home_cdyer_cdec_python_cde, __pyx_k_usr0_home_cdyer_cdec_python_cde, sizeof(__pyx_k_usr0_home_cdyer_cdec_python_cde), 0, 0, 1, 0},
+  {&__pyx_kp_s_usr0_home_cdyer_cdec_python_cde_2, __pyx_k_usr0_home_cdyer_cdec_python_cde_2, sizeof(__pyx_k_usr0_home_cdyer_cdec_python_cde_2), 0, 0, 1, 0},
+  {&__pyx_kp_s_usr0_home_cdyer_cdec_python_cde_3, __pyx_k_usr0_home_cdyer_cdec_python_cde_3, sizeof(__pyx_k_usr0_home_cdyer_cdec_python_cde_3), 0, 0, 1, 0},
   {&__pyx_n_s_value, __pyx_k_value, sizeof(__pyx_k_value), 0, 0, 1, 1},
   {&__pyx_n_s_vec, __pyx_k_vec, sizeof(__pyx_k_vec), 0, 0, 1, 1},
   {&__pyx_n_s_w, __pyx_k_w, sizeof(__pyx_k_w), 0, 0, 1, 1},
@@ -77388,7 +77388,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_RefNannyDeclarations
   __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":20
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":20
  *         self.word2id = {"END_OF_FILE":0, "END_OF_LINE":1}
  *         self.id2word = ["END_OF_FILE", "END_OF_LINE"]
  *         self.data = IntList(1000,1000)             # <<<<<<<<<<<<<<
@@ -77399,7 +77399,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__3);
   __Pyx_GIVEREF(__pyx_tuple__3);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":21
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":21
  *         self.id2word = ["END_OF_FILE", "END_OF_LINE"]
  *         self.data = IntList(1000,1000)
  *         self.sent_id = IntList(1000,1000)             # <<<<<<<<<<<<<<
@@ -77410,7 +77410,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__4);
   __Pyx_GIVEREF(__pyx_tuple__4);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":22
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":22
  *         self.data = IntList(1000,1000)
  *         self.sent_id = IntList(1000,1000)
  *         self.sent_index = IntList(1000,1000)             # <<<<<<<<<<<<<<
@@ -77421,7 +77421,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__5);
   __Pyx_GIVEREF(__pyx_tuple__5);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":66
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":66
  *                     f.write("%s " % self.get_word(w_id))
  *                 if w_id == 1:
  *                     f.write("\n")             # <<<<<<<<<<<<<<
@@ -77432,7 +77432,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__7);
   __Pyx_GIVEREF(__pyx_tuple__7);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":61
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":61
  * 
  *     def write_text(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -77443,7 +77443,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__8);
   __Pyx_GIVEREF(__pyx_tuple__8);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":69
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":69
  * 
  *     def read_text(self, char* filename):
  *         with gzip_or_text(filename) as fp:             # <<<<<<<<<<<<<<
@@ -77454,7 +77454,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__9);
   __Pyx_GIVEREF(__pyx_tuple__9);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":74
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":74
  *     def read_bitext(self, char* filename, int side):
  *         with gzip_or_text(filename) as fp:
  *             data = (line.split(' ||| ')[side] for line in fp)             # <<<<<<<<<<<<<<
@@ -77465,7 +77465,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__11);
   __Pyx_GIVEREF(__pyx_tuple__11);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":73
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":73
  * 
  *     def read_bitext(self, char* filename, int side):
  *         with gzip_or_text(filename) as fp:             # <<<<<<<<<<<<<<
@@ -77476,7 +77476,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__12);
   __Pyx_GIVEREF(__pyx_tuple__12);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":130
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":130
  *         num_words = len(self.id2word) - 2
  *         fwrite(&(num_words), sizeof(int), 1, f)
  *         for word in self.id2word[2:]:             # <<<<<<<<<<<<<<
@@ -77487,7 +77487,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_slice__13);
   __Pyx_GIVEREF(__pyx_slice__13);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":144
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":144
  *         for i in self.data:
  *             f.write("%d " %i)
  *         f.write("\n")             # <<<<<<<<<<<<<<
@@ -77498,7 +77498,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__14);
   __Pyx_GIVEREF(__pyx_tuple__14);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":147
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":147
  *         for i in self.sent_index:
  *             f.write("%d " %i)
  *         f.write("\n")             # <<<<<<<<<<<<<<
@@ -77509,7 +77509,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__15);
   __Pyx_GIVEREF(__pyx_tuple__15);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":150
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":150
  *         for i in self.sent_id:
  *             f.write("%d " %i)
  *         f.write("\n")             # <<<<<<<<<<<<<<
@@ -77520,7 +77520,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__16);
   __Pyx_GIVEREF(__pyx_tuple__16);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":153
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":153
  *         for word in self.id2word:
  *             f.write("%s %d " % (word, self.word2id[word]))
  *         f.write("\n")             # <<<<<<<<<<<<<<
@@ -77531,7 +77531,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__17);
   __Pyx_GIVEREF(__pyx_tuple__17);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/data_array.pxi":156
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/data_array.pxi":156
  * 
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -77541,7 +77541,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__18);
   __Pyx_GIVEREF(__pyx_tuple__18);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":48
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":48
  * 
  *     def __cinit__(self, from_binary=None, from_text=None):
  *         self.links = IntList(1000,1000)             # <<<<<<<<<<<<<<
@@ -77552,7 +77552,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__19);
   __Pyx_GIVEREF(__pyx_tuple__19);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":49
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":49
  *     def __cinit__(self, from_binary=None, from_text=None):
  *         self.links = IntList(1000,1000)
  *         self.sent_index = IntList(1000,1000)             # <<<<<<<<<<<<<<
@@ -77563,7 +77563,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__20);
   __Pyx_GIVEREF(__pyx_tuple__20);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":61
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":61
  *                 pairs = line.split()
  *                 for pair in pairs:
  *                     (i, j) = map(int, pair.split('-'))             # <<<<<<<<<<<<<<
@@ -77574,7 +77574,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__22);
   __Pyx_GIVEREF(__pyx_tuple__22);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":56
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":56
  * 
  *     def read_text(self, char* filename):
  *         with gzip_or_text(filename) as f:             # <<<<<<<<<<<<<<
@@ -77585,7 +77585,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__23);
   __Pyx_GIVEREF(__pyx_tuple__23);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":77
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":77
  *             for i, link in enumerate(self.links):
  *                 while i >= self.sent_index[sent_num]:
  *                     f.write("\n")             # <<<<<<<<<<<<<<
@@ -77596,7 +77596,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__24);
   __Pyx_GIVEREF(__pyx_tuple__24);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":80
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":80
  *                     sent_num = sent_num + 1
  *                 f.write("%d-%d " % self.unlink(link))
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -77607,7 +77607,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__25);
   __Pyx_GIVEREF(__pyx_tuple__25);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":73
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":73
  * 
  *     def write_text(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -77618,7 +77618,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__26);
   __Pyx_GIVEREF(__pyx_tuple__26);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":93
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":93
  *             for link in self.links:
  *                 f.write("%d " % link)
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -77629,7 +77629,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__27);
   __Pyx_GIVEREF(__pyx_tuple__27);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":96
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":96
  *             for i in self.sent_index:
  *                 f.write("%d " % i)
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -77640,7 +77640,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__28);
   __Pyx_GIVEREF(__pyx_tuple__28);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":90
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":90
  * 
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -77651,7 +77651,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__29);
   __Pyx_GIVEREF(__pyx_tuple__29);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":305
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":305
  * 
  *             # Re-read file, placing words into buckets
  *             f.seek(0)             # <<<<<<<<<<<<<<
@@ -77662,7 +77662,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__30);
   __Pyx_GIVEREF(__pyx_tuple__30);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":281
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":281
  * 
  *         fcount = IntList()
  *         with gzip_or_text(filename) as f:             # <<<<<<<<<<<<<<
@@ -77673,7 +77673,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__31);
   __Pyx_GIVEREF(__pyx_tuple__31);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":347
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":347
  * 
  *         if i > j:
  *             raise Exception("Sort error in CLex")             # <<<<<<<<<<<<<<
@@ -77684,7 +77684,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__33);
   __Pyx_GIVEREF(__pyx_tuple__33);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":370
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":370
  *             for i in self.f_index:
  *                 f.write("%d " % i)
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -77695,7 +77695,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__35);
   __Pyx_GIVEREF(__pyx_tuple__35);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":373
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":373
  *             for i, s1, s2 in zip(self.e_index, self.col1, self.col2):
  *                 f.write("%d %f %f " % (i, s1, s2))
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -77706,7 +77706,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__36);
   __Pyx_GIVEREF(__pyx_tuple__36);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":376
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":376
  *             for i, w in enumerate(self.id2fword):
  *                 f.write("%d %s " % (i, w))
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -77717,7 +77717,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__37);
   __Pyx_GIVEREF(__pyx_tuple__37);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":379
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":379
  *             for i, w in enumerate(self.id2eword):
  *                 f.write("%d %s " % (i, w))
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -77728,7 +77728,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__38);
   __Pyx_GIVEREF(__pyx_tuple__38);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":367
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":367
  * 
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -77739,7 +77739,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__39);
   __Pyx_GIVEREF(__pyx_tuple__39);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/bilex.pxi":412
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/bilex.pxi":412
  *         cdef i, N, e_id, f_id
  * 
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -77750,7 +77750,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__40);
   __Pyx_GIVEREF(__pyx_tuple__40);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":13
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":13
  *         cdef IntList rank
  * 
  *         logger.info("Constructing LCP array")             # <<<<<<<<<<<<<<
@@ -77761,7 +77761,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__43);
   __Pyx_GIVEREF(__pyx_tuple__43);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/lcp.pxi":34
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/lcp.pxi":34
  *             if h > 0:
  *                 h = h-1
  *         logger.info("LCP array completed")             # <<<<<<<<<<<<<<
@@ -77772,7 +77772,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__44);
   __Pyx_GIVEREF(__pyx_tuple__44);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":297
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":297
  *         pattern_rank = {}
  * 
  *         logger.info("Precomputing frequent intersections")             # <<<<<<<<<<<<<<
@@ -77783,7 +77783,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__47);
   __Pyx_GIVEREF(__pyx_tuple__47);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":314
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":314
  *         queue = IntList(increment=1000)
  * 
  *         logger.info("    Computing inverted indexes...")             # <<<<<<<<<<<<<<
@@ -77794,7 +77794,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__48);
   __Pyx_GIVEREF(__pyx_tuple__48);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":329
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":329
  *                     trie_node_data_append(node, i)
  * 
  *         logger.info("    Computing collocations...")             # <<<<<<<<<<<<<<
@@ -77805,7 +77805,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__49);
   __Pyx_GIVEREF(__pyx_tuple__49);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":386
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":386
  *                 ptr1 = ptr1 + 1
  * 
  *         self.precomputed_collocations = collocations.toMap(False)             # <<<<<<<<<<<<<<
@@ -77816,7 +77816,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__50);
   __Pyx_GIVEREF(__pyx_tuple__50);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":387
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":387
  * 
  *         self.precomputed_collocations = collocations.toMap(False)
  *         self.precomputed_index = frequent_patterns.toMap(True)             # <<<<<<<<<<<<<<
@@ -77827,7 +77827,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__51);
   __Pyx_GIVEREF(__pyx_tuple__51);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":393
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":393
  *             for pattern2 in J_set:
  *                 if len(pattern1) + len(pattern2) + 1 < self.max_length:
  *                     combined_pattern = pattern1 + (-1,) + pattern2             # <<<<<<<<<<<<<<
@@ -77838,7 +77838,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__52);
   __Pyx_GIVEREF(__pyx_tuple__52);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":400
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":400
  *                 x = x+1
  *                 if len(pattern1) + len(pattern2) + 1 <= self.max_length:
  *                     combined_pattern = pattern1 + (-1,) + pattern2             # <<<<<<<<<<<<<<
@@ -77849,7 +77849,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__53);
   __Pyx_GIVEREF(__pyx_tuple__53);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":407
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":407
  *                 x = x+2
  *                 if len(pattern1) + len(pattern2) + 1<= self.max_length:
  *                     combined_pattern = pattern1 + (-1,) + pattern2             # <<<<<<<<<<<<<<
@@ -77860,7 +77860,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__54);
   __Pyx_GIVEREF(__pyx_tuple__54);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/precomputation.pxi":409
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/precomputation.pxi":409
  *                     combined_pattern = pattern1 + (-1,) + pattern2
  *                     IJ_set.add(combined_pattern)
  *                     combined_pattern = pattern2 + (-1,) + pattern1             # <<<<<<<<<<<<<<
@@ -77871,7 +77871,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__55);
   __Pyx_GIVEREF(__pyx_tuple__55);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":94
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":94
  * 
  *         '''Step 3: read off suffix array from inverse suffix array'''
  *         logger.info("    Finalizing sort...")             # <<<<<<<<<<<<<<
@@ -77882,7 +77882,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__56);
   __Pyx_GIVEREF(__pyx_tuple__56);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":193
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":193
  *             for a_i in self.sa:
  *                 f.write("%d " % a_i)
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -77893,7 +77893,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__57);
   __Pyx_GIVEREF(__pyx_tuple__57);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":196
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":196
  *             for w_i in self.ha:
  *                 f.write("%d " % w_i)
  *             f.write("\n")             # <<<<<<<<<<<<<<
@@ -77904,7 +77904,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__58);
   __Pyx_GIVEREF(__pyx_tuple__58);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/suffix_array.pxi":189
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/suffix_array.pxi":189
  * 
  *     def write_enhanced(self, char* filename):
  *         with open(filename, "w") as f:             # <<<<<<<<<<<<<<
@@ -77915,7 +77915,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__59);
   __Pyx_GIVEREF(__pyx_tuple__59);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":133
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":133
  *             logger.info("Sampling strategy: uniform, max sample size = %d", sample_size)
  *         else:
  *             logger.info("Sampling strategy: no sampling")             # <<<<<<<<<<<<<<
@@ -77926,7 +77926,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__60);
   __Pyx_GIVEREF(__pyx_tuple__60);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":346
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":346
  *         respectively.    This is because Chiang's model does not require
  *         them to be the same, therefore we don't either.'''
  *         self.rules = TrieTable(True) # cache             # <<<<<<<<<<<<<<
@@ -77937,7 +77937,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__61);
   __Pyx_GIVEREF(__pyx_tuple__61);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":349
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":349
  *         self.rules.root = ExtendedTrieNode(phrase_location=PhraseLocation())
  *         if alignment is None:
  *             raise Exception("Must specify an alignment object")             # <<<<<<<<<<<<<<
@@ -77948,7 +77948,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__62);
   __Pyx_GIVEREF(__pyx_tuple__62);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1064
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1064
  *                         else:
  *                             #ERROR: We never get here
  *                             raise Exception("Keyword trie error")             # <<<<<<<<<<<<<<
@@ -77959,7 +77959,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__66);
   __Pyx_GIVEREF(__pyx_tuple__66);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1983
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1983
  *             if nt and nt[-1][2] == f_j - 1:
  *                 # Add to non-terminal, checking for collisions
  *                 old_last_nt = nt[-1][:]             # <<<<<<<<<<<<<<
@@ -77970,7 +77970,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_slice__67);
   __Pyx_GIVEREF(__pyx_slice__67);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":1920
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":1920
  *         # f_ i and j are current, e_ i and j are previous
  *         # We care _considering_ f_j, so it is not yet in counts
  *         def extract(f_i, f_j, e_i, e_j, min_bound, wc, links, nt, nt_open):             # <<<<<<<<<<<<<<
@@ -77980,9 +77980,9 @@ static int __Pyx_InitCachedConstants(void) {
   __pyx_tuple__68 = PyTuple_Pack(19, __pyx_n_s_f_i, __pyx_n_s_f_j, __pyx_n_s_e_i, __pyx_n_s_e_j, __pyx_n_s_min_bound, __pyx_n_s_wc, __pyx_n_s_links, __pyx_n_s_nt, __pyx_n_s_nt_open, __pyx_n_s_link_i, __pyx_n_s_link_j, __pyx_n_s_new_e_i, __pyx_n_s_new_e_j, __pyx_n_s_new_min_bound, __pyx_n_s_i, __pyx_n_s_nt_collision, __pyx_n_s_link, __pyx_n_s_plus_links, __pyx_n_s_old_last_nt); if (unlikely(!__pyx_tuple__68)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_tuple__68);
   __Pyx_GIVEREF(__pyx_tuple__68);
-  __pyx_codeobj__69 = (PyObject*)__Pyx_PyCode_New(9, 0, 19, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__68, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt, __pyx_n_s_extract, 1920, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__69)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_codeobj__69 = (PyObject*)__Pyx_PyCode_New(9, 0, 19, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__68, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde, __pyx_n_s_extract, 1920, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__69)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 1920; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2042
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2042
  *         # Update phrase counts
  *         for rule in rules:
  *             (f_ph, e_ph, al) = rule[:3]             # <<<<<<<<<<<<<<
@@ -77993,7 +77993,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_slice__70);
   __Pyx_GIVEREF(__pyx_slice__70);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2053
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2053
  *             self.bilex.update(f_words, e_words, alignment)
  *         else:
  *             logger.warning('No online bilexical dictionary specified, not updating lexical weights')             # <<<<<<<<<<<<<<
@@ -78004,7 +78004,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__71);
   __Pyx_GIVEREF(__pyx_tuple__71);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2060
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2060
  *         # Substitute in non-terminals
  *         nt_inv = sorted(nt, cmp=lambda x, y: cmp(x[3], y[3]))
  *         f_sym = list(f_span[:])             # <<<<<<<<<<<<<<
@@ -78015,7 +78015,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_slice__72);
   __Pyx_GIVEREF(__pyx_slice__72);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2070
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2070
  *             f_sym.insert(next_nt[1] - off, sym_setindex(self.category, next_nt[0]))
  *             off += (nt_len - 1)
  *         e_sym = list(e_span[:])             # <<<<<<<<<<<<<<
@@ -78026,7 +78026,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_slice__73);
   __Pyx_GIVEREF(__pyx_slice__73);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2145
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2145
  *         phrases = set() # (fphrase, lex_i, lex_j)
  * 
  *         def extract(f_i, f_j, lex_i, lex_j, wc, ntc, syms):             # <<<<<<<<<<<<<<
@@ -78036,7 +78036,7 @@ static int __Pyx_InitCachedConstants(void) {
   __pyx_tuple__74 = PyTuple_Pack(10, __pyx_n_s_f_i, __pyx_n_s_f_j, __pyx_n_s_lex_i, __pyx_n_s_lex_j, __pyx_n_s_wc, __pyx_n_s_ntc, __pyx_n_s_syms, __pyx_n_s_f, __pyx_n_s_new_lex_i, __pyx_n_s_new_lex_j); if (unlikely(!__pyx_tuple__74)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_tuple__74);
   __Pyx_GIVEREF(__pyx_tuple__74);
-  __pyx_codeobj__75 = (PyObject*)__Pyx_PyCode_New(7, 0, 10, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__74, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt, __pyx_n_s_extract, 2145, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__75)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_codeobj__75 = (PyObject*)__Pyx_PyCode_New(7, 0, 10, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__74, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde, __pyx_n_s_extract, 2145, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__75)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "cdec/sa/_sa.pyx":5
  * import gzip
@@ -78045,7 +78045,7 @@ static int __Pyx_InitCachedConstants(void) {
  *     return (resource.getrusage(resource.RUSAGE_SELF).ru_utime+
  *             resource.getrusage(resource.RUSAGE_SELF).ru_stime)
  */
-  __pyx_codeobj__76 = (PyObject*)__Pyx_PyCode_New(0, 0, 0, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt_2, __pyx_n_s_monitor_cpu, 5, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__76)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_codeobj__76 = (PyObject*)__Pyx_PyCode_New(0, 0, 0, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde_2, __pyx_n_s_monitor_cpu, 5, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__76)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "cdec/sa/_sa.pyx":9
  *             resource.getrusage(resource.RUSAGE_SELF).ru_stime)
@@ -78057,7 +78057,7 @@ static int __Pyx_InitCachedConstants(void) {
   __pyx_tuple__77 = PyTuple_Pack(2, __pyx_n_s_filename, __pyx_n_s_filename); if (unlikely(!__pyx_tuple__77)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_tuple__77);
   __Pyx_GIVEREF(__pyx_tuple__77);
-  __pyx_codeobj__78 = (PyObject*)__Pyx_PyCode_New(1, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__77, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt_2, __pyx_n_s_gzip_or_text, 9, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__78)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_codeobj__78 = (PyObject*)__Pyx_PyCode_New(1, 0, 2, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__77, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde_2, __pyx_n_s_gzip_or_text, 9, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__78)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 9; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "cdec/sa/_sa.pyx":15
  *         return open(filename)
@@ -78070,7 +78070,7 @@ static int __Pyx_InitCachedConstants(void) {
   __Pyx_GOTREF(__pyx_tuple__79);
   __Pyx_GIVEREF(__pyx_tuple__79);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":107
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":107
  *     return ALPHABET.fromstring(string, terminal)
  * 
  * def isvar(sym):             # <<<<<<<<<<<<<<
@@ -78080,9 +78080,9 @@ static int __Pyx_InitCachedConstants(void) {
   __pyx_tuple__80 = PyTuple_Pack(1, __pyx_n_s_sym); if (unlikely(!__pyx_tuple__80)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_tuple__80);
   __Pyx_GIVEREF(__pyx_tuple__80);
-  __pyx_codeobj__81 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__80, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt_3, __pyx_n_s_isvar, 107, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__81)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_codeobj__81 = (PyObject*)__Pyx_PyCode_New(1, 0, 1, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__80, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde_3, __pyx_n_s_isvar, 107, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__81)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":110
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":110
  *     return sym_isvar(sym)
  * 
  * def make_lattice(words):             # <<<<<<<<<<<<<<
@@ -78092,9 +78092,9 @@ static int __Pyx_InitCachedConstants(void) {
   __pyx_tuple__82 = PyTuple_Pack(5, __pyx_n_s_words, __pyx_n_s_word_ids, __pyx_n_s_genexpr, __pyx_n_s_genexpr, __pyx_n_s_genexpr); if (unlikely(!__pyx_tuple__82)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_tuple__82);
   __Pyx_GIVEREF(__pyx_tuple__82);
-  __pyx_codeobj__83 = (PyObject*)__Pyx_PyCode_New(1, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__82, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt_3, __pyx_n_s_make_lattice, 110, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__83)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_codeobj__83 = (PyObject*)__Pyx_PyCode_New(1, 0, 5, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__82, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde_3, __pyx_n_s_make_lattice, 110, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__83)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":114
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":114
  *     return tuple(((word, None, 1), ) for word in word_ids)
  * 
  * def decode_lattice(lattice):             # <<<<<<<<<<<<<<
@@ -78104,9 +78104,9 @@ static int __Pyx_InitCachedConstants(void) {
   __pyx_tuple__84 = PyTuple_Pack(3, __pyx_n_s_lattice, __pyx_n_s_genexpr, __pyx_n_s_genexpr); if (unlikely(!__pyx_tuple__84)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_tuple__84);
   __Pyx_GIVEREF(__pyx_tuple__84);
-  __pyx_codeobj__85 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__84, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt_3, __pyx_n_s_decode_lattice, 114, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__85)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_codeobj__85 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__84, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde_3, __pyx_n_s_decode_lattice, 114, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__85)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":118
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":118
  *             for arc in node for node in lattice)
  * 
  * def decode_sentence(lattice):             # <<<<<<<<<<<<<<
@@ -78116,9 +78116,9 @@ static int __Pyx_InitCachedConstants(void) {
   __pyx_tuple__86 = PyTuple_Pack(3, __pyx_n_s_lattice, __pyx_n_s_genexpr, __pyx_n_s_genexpr); if (unlikely(!__pyx_tuple__86)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_tuple__86);
   __Pyx_GIVEREF(__pyx_tuple__86);
-  __pyx_codeobj__87 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__86, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt_3, __pyx_n_s_decode_sentence, 118, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__87)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_codeobj__87 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__86, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde_3, __pyx_n_s_decode_sentence, 118, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__87)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":121
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":121
  *     return tuple(sym_tostring(sym) for ((sym, _, _),) in lattice)
  * 
  * def encode_words(words):             # <<<<<<<<<<<<<<
@@ -78128,9 +78128,9 @@ static int __Pyx_InitCachedConstants(void) {
   __pyx_tuple__88 = PyTuple_Pack(3, __pyx_n_s_words, __pyx_n_s_genexpr, __pyx_n_s_genexpr); if (unlikely(!__pyx_tuple__88)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_tuple__88);
   __Pyx_GIVEREF(__pyx_tuple__88);
-  __pyx_codeobj__89 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__88, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt_3, __pyx_n_s_encode_words, 121, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__89)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_codeobj__89 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__88, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde_3, __pyx_n_s_encode_words, 121, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__89)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":124
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":124
  *     return tuple(sym_fromstring(word, True) for word in words)
  * 
  * def decode_words(syms):             # <<<<<<<<<<<<<<
@@ -78139,9 +78139,9 @@ static int __Pyx_InitCachedConstants(void) {
   __pyx_tuple__90 = PyTuple_Pack(3, __pyx_n_s_syms, __pyx_n_s_genexpr, __pyx_n_s_genexpr); if (unlikely(!__pyx_tuple__90)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_tuple__90);
   __Pyx_GIVEREF(__pyx_tuple__90);
-  __pyx_codeobj__91 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__90, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt_3, __pyx_n_s_decode_words, 124, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__91)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_codeobj__91 = (PyObject*)__Pyx_PyCode_New(1, 0, 3, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__90, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde_3, __pyx_n_s_decode_words, 124, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__91)) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2183
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2183
  * 
  * # Spans are _inclusive_ on both ends [i, j]
  * def span_check(vec, i, j):             # <<<<<<<<<<<<<<
@@ -78151,9 +78151,9 @@ static int __Pyx_InitCachedConstants(void) {
   __pyx_tuple__92 = PyTuple_Pack(4, __pyx_n_s_vec, __pyx_n_s_i, __pyx_n_s_j, __pyx_n_s_k); if (unlikely(!__pyx_tuple__92)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2183; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_tuple__92);
   __Pyx_GIVEREF(__pyx_tuple__92);
-  __pyx_codeobj__93 = (PyObject*)__Pyx_PyCode_New(3, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__92, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt, __pyx_n_s_span_check, 2183, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__93)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2183; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_codeobj__93 = (PyObject*)__Pyx_PyCode_New(3, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__92, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde, __pyx_n_s_span_check, 2183, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__93)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2183; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2191
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2191
  *     return True
  * 
  * def span_inc(vec, i, j):             # <<<<<<<<<<<<<<
@@ -78163,9 +78163,9 @@ static int __Pyx_InitCachedConstants(void) {
   __pyx_tuple__94 = PyTuple_Pack(4, __pyx_n_s_vec, __pyx_n_s_i, __pyx_n_s_j, __pyx_n_s_k); if (unlikely(!__pyx_tuple__94)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_tuple__94);
   __Pyx_GIVEREF(__pyx_tuple__94);
-  __pyx_codeobj__95 = (PyObject*)__Pyx_PyCode_New(3, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__94, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt, __pyx_n_s_span_inc, 2191, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__95)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_codeobj__95 = (PyObject*)__Pyx_PyCode_New(3, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__94, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde, __pyx_n_s_span_inc, 2191, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__95)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2197
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2197
  *         k += 1
  * 
  * def span_dec(vec, i, j):             # <<<<<<<<<<<<<<
@@ -78175,7 +78175,7 @@ static int __Pyx_InitCachedConstants(void) {
   __pyx_tuple__96 = PyTuple_Pack(4, __pyx_n_s_vec, __pyx_n_s_i, __pyx_n_s_j, __pyx_n_s_k); if (unlikely(!__pyx_tuple__96)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_tuple__96);
   __Pyx_GIVEREF(__pyx_tuple__96);
-  __pyx_codeobj__97 = (PyObject*)__Pyx_PyCode_New(3, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__96, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_mdenkows_cdec_git_pyt, __pyx_n_s_span_dec, 2197, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__97)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_codeobj__97 = (PyObject*)__Pyx_PyCode_New(3, 0, 4, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__96, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_usr0_home_cdyer_cdec_python_cde, __pyx_n_s_span_dec, 2197, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__97)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_RefNannyFinishContext();
   return 0;
   __pyx_L1_error:;
@@ -78656,7 +78656,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_logger, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/alignment.pxi":8
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/alignment.pxi":8
  * # May need to revisit if things get really tight, though.
  * 
  * cdef int ALIGNMENT_CODE = 1 << 16             # <<<<<<<<<<<<<<
@@ -78665,7 +78665,7 @@ PyMODINIT_FUNC PyInit__sa(void)
  */
   __pyx_v_4cdec_2sa_3_sa_ALIGNMENT_CODE = 65536;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":17
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":17
  * from libc.string cimport memset
  * 
  * cdef int MIN_BOTTOM_SIZE = 32             # <<<<<<<<<<<<<<
@@ -78674,7 +78674,7 @@ PyMODINIT_FUNC PyInit__sa(void)
  */
   __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_SIZE = 32;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":18
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":18
  * 
  * cdef int MIN_BOTTOM_SIZE = 32
  * cdef int MIN_BOTTOM_BITS = 5             # <<<<<<<<<<<<<<
@@ -78683,7 +78683,7 @@ PyMODINIT_FUNC PyInit__sa(void)
  */
   __pyx_v_4cdec_2sa_3_sa_MIN_BOTTOM_BITS = 5;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/veb.pxi":28
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/veb.pxi":28
  *         LOWER_MASK[i] = mask
  * 
  * _init_lower_mask()             # <<<<<<<<<<<<<<
@@ -78692,7 +78692,7 @@ PyMODINIT_FUNC PyInit__sa(void)
  */
   __pyx_f_4cdec_2sa_3_sa__init_lower_mask();
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":4
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":4
  * from libc.stdlib cimport malloc, realloc, strtol
  * 
  * cdef int INDEX_SHIFT = 3             # <<<<<<<<<<<<<<
@@ -78701,7 +78701,7 @@ PyMODINIT_FUNC PyInit__sa(void)
  */
   __pyx_v_4cdec_2sa_3_sa_INDEX_SHIFT = 3;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":5
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":5
  * 
  * cdef int INDEX_SHIFT = 3
  * cdef int INDEX_MASK = (1<<INDEX_SHIFT)-1             # <<<<<<<<<<<<<<
@@ -78710,7 +78710,7 @@ PyMODINIT_FUNC PyInit__sa(void)
  */
   __pyx_v_4cdec_2sa_3_sa_INDEX_MASK = ((1 << __pyx_v_4cdec_2sa_3_sa_INDEX_SHIFT) - 1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":87
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":87
  *             return self.terminals.index(s)
  * 
  * cdef Alphabet ALPHABET = Alphabet()             # <<<<<<<<<<<<<<
@@ -78724,7 +78724,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":107
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":107
  *     return ALPHABET.fromstring(string, terminal)
  * 
  * def isvar(sym):             # <<<<<<<<<<<<<<
@@ -78736,7 +78736,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_isvar, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":110
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":110
  *     return sym_isvar(sym)
  * 
  * def make_lattice(words):             # <<<<<<<<<<<<<<
@@ -78748,7 +78748,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_make_lattice, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":114
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":114
  *     return tuple(((word, None, 1), ) for word in word_ids)
  * 
  * def decode_lattice(lattice):             # <<<<<<<<<<<<<<
@@ -78760,7 +78760,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_decode_lattice, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 114; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":118
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":118
  *             for arc in node for node in lattice)
  * 
  * def decode_sentence(lattice):             # <<<<<<<<<<<<<<
@@ -78772,7 +78772,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_decode_sentence, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":121
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":121
  *     return tuple(sym_tostring(sym) for ((sym, _, _),) in lattice)
  * 
  * def encode_words(words):             # <<<<<<<<<<<<<<
@@ -78784,7 +78784,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_encode_words, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/sym.pxi":124
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/sym.pxi":124
  *     return tuple(sym_fromstring(word, True) for word in words)
  * 
  * def decode_words(syms):             # <<<<<<<<<<<<<<
@@ -78795,7 +78795,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_decode_words, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[10]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":5
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":5
  * # Much faster than the Python numbers reported there.
  * # Note to reader: this code is closer to C than Python
  * import gc             # <<<<<<<<<<<<<<
@@ -78807,7 +78807,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_gc, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 5; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":6
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":6
  * # Note to reader: this code is closer to C than Python
  * import gc
  * import itertools             # <<<<<<<<<<<<<<
@@ -78819,7 +78819,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_itertools, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 6; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":12
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":12
  * from libc.math cimport fmod, ceil, floor, log
  * 
  * from collections import defaultdict, Counter, namedtuple             # <<<<<<<<<<<<<<
@@ -78854,7 +78854,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":14
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":14
  * from collections import defaultdict, Counter, namedtuple
  * 
  * FeatureContext = namedtuple('FeatureContext',             # <<<<<<<<<<<<<<
@@ -78864,7 +78864,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   __pyx_t_2 = __Pyx_GetModuleGlobalName(__pyx_n_s_namedtuple); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":15
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":15
  * 
  * FeatureContext = namedtuple('FeatureContext',
  *     ['fphrase',             # <<<<<<<<<<<<<<
@@ -78913,7 +78913,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   PyList_SET_ITEM(__pyx_t_1, 12, __pyx_n_s_online);
   __Pyx_GIVEREF(__pyx_n_s_online);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":14
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":14
  * from collections import defaultdict, Counter, namedtuple
  * 
  * FeatureContext = namedtuple('FeatureContext',             # <<<<<<<<<<<<<<
@@ -78935,7 +78935,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_FeatureContext, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 14; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":30
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":30
  *     ])
  * 
  * OnlineFeatureContext = namedtuple('OnlineFeatureContext',             # <<<<<<<<<<<<<<
@@ -78945,7 +78945,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   __pyx_t_1 = __Pyx_GetModuleGlobalName(__pyx_n_s_namedtuple); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":31
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":31
  * 
  * OnlineFeatureContext = namedtuple('OnlineFeatureContext',
  *     ['fcount',             # <<<<<<<<<<<<<<
@@ -78964,7 +78964,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   PyList_SET_ITEM(__pyx_t_3, 2, __pyx_n_s_paircount);
   __Pyx_GIVEREF(__pyx_n_s_paircount);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":30
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":30
  *     ])
  * 
  * OnlineFeatureContext = namedtuple('OnlineFeatureContext',             # <<<<<<<<<<<<<<
@@ -78986,7 +78986,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_OnlineFeatureContext, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":53
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":53
  *         self.phrases_al = defaultdict(lambda: defaultdict(tuple))
  * 
  * cdef int PRECOMPUTE = 0             # <<<<<<<<<<<<<<
@@ -78995,7 +78995,7 @@ PyMODINIT_FUNC PyInit__sa(void)
  */
   __pyx_v_4cdec_2sa_3_sa_PRECOMPUTE = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":54
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":54
  * 
  * cdef int PRECOMPUTE = 0
  * cdef int MERGE = 1             # <<<<<<<<<<<<<<
@@ -79004,7 +79004,7 @@ PyMODINIT_FUNC PyInit__sa(void)
  */
   __pyx_v_4cdec_2sa_3_sa_MERGE = 1;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":55
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":55
  * cdef int PRECOMPUTE = 0
  * cdef int MERGE = 1
  * cdef int BAEZA_YATES = 2             # <<<<<<<<<<<<<<
@@ -79013,7 +79013,7 @@ PyMODINIT_FUNC PyInit__sa(void)
  */
   __pyx_v_4cdec_2sa_3_sa_BAEZA_YATES = 2;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":58
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":58
  * 
  * # NOTE: was encoded as a non-terminal in the previous version
  * cdef int EPSILON = sym_fromstring('*EPS*', True)             # <<<<<<<<<<<<<<
@@ -79022,7 +79022,7 @@ PyMODINIT_FUNC PyInit__sa(void)
  */
   __pyx_v_4cdec_2sa_3_sa_EPSILON = __pyx_f_4cdec_2sa_3_sa_sym_fromstring(__pyx_k_EPS, 1);
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2183
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2183
  * 
  * # Spans are _inclusive_ on both ends [i, j]
  * def span_check(vec, i, j):             # <<<<<<<<<<<<<<
@@ -79034,7 +79034,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_span_check, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2183; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2191
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2191
  *     return True
  * 
  * def span_inc(vec, i, j):             # <<<<<<<<<<<<<<
@@ -79046,7 +79046,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_span_inc, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/rulefactory.pxi":2197
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/rulefactory.pxi":2197
  *         k += 1
  * 
  * def span_dec(vec, i, j):             # <<<<<<<<<<<<<<
@@ -79058,7 +79058,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_span_dec, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[8]; __pyx_lineno = 2197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":1
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":1
  * cdef StringMap FD = StringMap() # Feature name dictionary             # <<<<<<<<<<<<<<
  * 
  * INITIAL_CAPACITY = 7 # default number of features
@@ -79070,7 +79070,7 @@ PyMODINIT_FUNC PyInit__sa(void)
   __Pyx_GIVEREF(__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":3
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":3
  * cdef StringMap FD = StringMap() # Feature name dictionary
  * 
  * INITIAL_CAPACITY = 7 # default number of features             # <<<<<<<<<<<<<<
@@ -79079,7 +79079,7 @@ PyMODINIT_FUNC PyInit__sa(void)
  */
   if (PyDict_SetItem(__pyx_d, __pyx_n_s_INITIAL_CAPACITY, __pyx_int_7) < 0) {__pyx_filename = __pyx_f[13]; __pyx_lineno = 3; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/usr0/home/mdenkows/cdec-git/python/cdec/sa/features.pxi":4
+  /* "/usr0/home/cdyer/cdec/python/cdec/sa/features.pxi":4
  * 
  * INITIAL_CAPACITY = 7 # default number of features
  * INCREMENT = INITIAL_CAPACITY # double size             # <<<<<<<<<<<<<<