More tests with ml2 to find optimal results

11 files changed, 720 insertions, 575 deletions

diff --git a/experiments/build/temp.macosx-10.6-x86_64-2.7/ml.o b/experiments/build/temp.macosx-10.6-x86_64-2.7/ml.o
index e626f4c..640d0f3 100644
--- a/experiments/build/temp.macosx-10.6-x86_64-2.7/ml.o
+++ b/experiments/build/temp.macosx-10.6-x86_64-2.7/ml.o
diff --git a/experiments/build/temp.macosx-10.6-x86_64-2.7/ml2.o b/experiments/build/temp.macosx-10.6-x86_64-2.7/ml2.o
index 62313a2..1489d58 100644
--- a/experiments/build/temp.macosx-10.6-x86_64-2.7/ml2.o
+++ b/experiments/build/temp.macosx-10.6-x86_64-2.7/ml2.o
diff --git a/experiments/build_network.py b/experiments/build_network.py
index e34db1c..6cb994c 100644
--- a/experiments/build_network.py
+++ b/experiments/build_network.py
@@ -14,8 +14,8 @@ def build_network(filename):
             from_, to = int(float(row["from"])), int(float(row["to"]))
             dist = int(row["dist"])
             w1, w2, w3 = float(row["w1"]), float(row["w2"]), float(row["w3"])
-            # if int(float(row["dist"])) > 1:
-            #     continue
+            if int(float(row["dist"])) > 1:
+                continue
             # 'to' is a victim
             if row["t2"] != "NA":
                 dt = int(row["t2"]) - int(row["t1"])
@@ -39,13 +39,13 @@ def build_network(filename):
                     age += int(row["t1"]) - int(row["spawn1"])
                     victims[from_] = []
     root_victims = {}
-    print victims.keys()
+    # print victims.keys()
     for victim in victims.keys():
         if not victims[victim]:
             del victims[victim]
             root_victims[victim] = []
-    print root_victims.keys()
-    print len(root_victims), len(victims), len(non_victims)
+    # print root_victims.keys()
+    # print len(root_victims), len(victims), len(non_victims)
     return root_victims, victims, non_victims, age
 
 
diff --git a/experiments/ml.c b/experiments/ml.c
index b350aaf..64d4e3a 100644
--- a/experiments/ml.c
+++ b/experiments/ml.c
@@ -983,8 +983,6 @@ static double __Pyx__PyObject_AsDouble(PyObject* obj);
  PyFloat_AS_DOUBLE(obj) : __Pyx__PyObject_AsDouble(obj))
 #endif
 
-static CYTHON_INLINE void __Pyx_RaiseUnboundLocalError(const char *varname);
-
 static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb);
 static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb);
 
@@ -1475,32 +1473,32 @@ static __pyx_t_2ml_DTYPE_t __pyx_f_2ml_weight_success(int __pyx_v_dist, int __py
   /* "ml.pyx":16
  *     """weight for successful infection, exponential time model"""
  *     cdef DTYPE_t structural, temporal, result
- *     structural = delta ** dist             # <<<<<<<<<<<<<<
+ *     structural = dist * log(delta)             # <<<<<<<<<<<<<<
  *     # structural = plogis(w1,delta) * plogis(w2,delta) * plogis(w3,delta)
- *     temporal = exp(-alpha*dt) * (exp(alpha)-1.)
+ *     temporal = log(exp(alpha)-1.) - alpha*dt
  */
-  __pyx_v_structural = pow(__pyx_v_delta, ((__pyx_t_2ml_DTYPE_t)__pyx_v_dist));
+  __pyx_v_structural = (__pyx_v_dist * log(__pyx_v_delta));
 
   /* "ml.pyx":18
- *     structural = delta ** dist
+ *     structural = dist * log(delta)
  *     # structural = plogis(w1,delta) * plogis(w2,delta) * plogis(w3,delta)
- *     temporal = exp(-alpha*dt) * (exp(alpha)-1.)             # <<<<<<<<<<<<<<
+ *     temporal = log(exp(alpha)-1.) - alpha*dt             # <<<<<<<<<<<<<<
  *     # temporal = 1 - exp(-alpha*dt)
  *     # if exp(-alpha*dt)==0.: print 'UNDERFLOW ERROR'
  */
-  __pyx_v_temporal = (exp(((-__pyx_v_alpha) * __pyx_v_dt)) * (exp(__pyx_v_alpha) - 1.));
+  __pyx_v_temporal = (log((exp(__pyx_v_alpha) - 1.)) - (__pyx_v_alpha * __pyx_v_dt));
 
   /* "ml.pyx":22
  *     # if exp(-alpha*dt)==0.: print 'UNDERFLOW ERROR'
  *     # temporal = 1. / (1. + (dt - 1.)/alpha)**0.01 - 1. / (1. + dt/alpha)**0.01
- *     result = log(structural * temporal)             # <<<<<<<<<<<<<<
+ *     result = structural + temporal             # <<<<<<<<<<<<<<
  *     # print 'st', structural, temporal
  *     return result
  */
-  __pyx_v_result = log((__pyx_v_structural * __pyx_v_temporal));
+  __pyx_v_result = (__pyx_v_structural + __pyx_v_temporal);
 
   /* "ml.pyx":24
- *     result = log(structural * temporal)
+ *     result = structural + temporal
  *     # print 'st', structural, temporal
  *     return result             # <<<<<<<<<<<<<<
  * 
@@ -1851,14 +1849,14 @@ static PyObject *__pyx_pf_2ml_ml(CYTHON_UNUSED PyObject *__pyx_self, PyObject *_
   int __pyx_v_dt;
   __pyx_t_2ml_DTYPE_t __pyx_v_beta;
   __pyx_t_2ml_DTYPE_t __pyx_v_ll;
+  __pyx_t_2ml_DTYPE_t __pyx_v_beta_add;
+  __pyx_t_2ml_DTYPE_t __pyx_v_max_beta;
+  __pyx_t_2ml_DTYPE_t __pyx_v_max_beta_add;
   PyObject *__pyx_v_parents = 0;
   PyArrayObject *__pyx_v_probs = 0;
   PyArrayObject *__pyx_v_probs_fail = 0;
   PyArrayObject *__pyx_v_probs_nv = 0;
-  PyObject *__pyx_v_max_beta_add = NULL;
   double __pyx_v_thresh;
-  PyObject *__pyx_v_beta_add = NULL;
-  PyObject *__pyx_v_max_beta = NULL;
   int __pyx_v_max_roots;
   PyObject *__pyx_v_w1 = NULL;
   PyObject *__pyx_v_w2 = NULL;
@@ -1924,7 +1922,7 @@ static PyObject *__pyx_pf_2ml_ml(CYTHON_UNUSED PyObject *__pyx_self, PyObject *_
   __pyx_pybuffernd_probs_nv.rcbuffer = &__pyx_pybuffer_probs_nv;
 
   /* "ml.pyx":44
- *         DTYPE_t beta, ll
+ *         DTYPE_t beta, ll, beta_add, max_beta, max_beta_add
  *         list parents, failures, successes
  *     n_roots, n_victims = len(root_victims), len(victims)             # <<<<<<<<<<<<<<
  *     n_nodes = 148152
@@ -2703,16 +2701,13 @@ static PyObject *__pyx_pf_2ml_ml(CYTHON_UNUSED PyObject *__pyx_self, PyObject *_
  *     for beta in np.arange(0.001, .2, .002):
  */
   __pyx_t_27 = __Pyx_PyObject_AsDouble(__pyx_kp_s_inf); if (unlikely(__pyx_t_27 == ((double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_t_5 = PyFloat_FromDouble(__pyx_t_27); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_5);
-  __pyx_v_max_beta_add = __pyx_t_5;
-  __pyx_t_5 = 0;
+  __pyx_v_max_beta_add = __pyx_t_27;
 
   /* "ml.pyx":86
  *     max_beta_add = float('-inf')
  *     # iterate over all victim nodes to find the optimal threshold
  *     for beta in np.arange(0.001, .2, .002):             # <<<<<<<<<<<<<<
- *         thresh = log(beta/(3012*(1.-beta)))
+ *         thresh = log(beta/(3012.*(1.-beta)))
  *         # print 'beta:', beta, 'thresh:', thresh, 'infected:', len(probs[probs>=thresh])
  */
   __pyx_t_5 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -2768,18 +2763,18 @@ static PyObject *__pyx_pf_2ml_ml(CYTHON_UNUSED PyObject *__pyx_self, PyObject *_
     /* "ml.pyx":87
  *     # iterate over all victim nodes to find the optimal threshold
  *     for beta in np.arange(0.001, .2, .002):
- *         thresh = log(beta/(3012*(1.-beta)))             # <<<<<<<<<<<<<<
+ *         thresh = log(beta/(3012.*(1.-beta)))             # <<<<<<<<<<<<<<
  *         # print 'beta:', beta, 'thresh:', thresh, 'infected:', len(probs[probs>=thresh])
  *         roots = n_roots + len(probs[probs<thresh])
  */
-    __pyx_v_thresh = log((__pyx_v_beta / (3012.0 * (1. - __pyx_v_beta))));
+    __pyx_v_thresh = log((__pyx_v_beta / (3012. * (1. - __pyx_v_beta))));
 
     /* "ml.pyx":89
- *         thresh = log(beta/(3012*(1.-beta)))
+ *         thresh = log(beta/(3012.*(1.-beta)))
  *         # print 'beta:', beta, 'thresh:', thresh, 'infected:', len(probs[probs>=thresh])
  *         roots = n_roots + len(probs[probs<thresh])             # <<<<<<<<<<<<<<
  * 
- *         # add probability for realized edges and subtract probability these edges fail
+ *         beta_add = 0.
  */
     __pyx_t_5 = PyFloat_FromDouble(__pyx_v_thresh); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
@@ -2792,84 +2787,89 @@ static PyObject *__pyx_pf_2ml_ml(CYTHON_UNUSED PyObject *__pyx_self, PyObject *_
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __pyx_v_roots = (__pyx_v_n_roots + __pyx_t_1);
 
-    /* "ml.pyx":92
+    /* "ml.pyx":91
+ *         roots = n_roots + len(probs[probs<thresh])
  * 
+ *         beta_add = 0.             # <<<<<<<<<<<<<<
  *         # add probability for realized edges and subtract probability these edges fail
- *         beta_add = (probs[probs>=thresh]).sum()             # <<<<<<<<<<<<<<
+ *         beta_add += (probs[probs>=thresh]).sum()
+ */
+    __pyx_v_beta_add = 0.;
+
+    /* "ml.pyx":93
+ *         beta_add = 0.
+ *         # add probability for realized edges and subtract probability these edges fail
+ *         beta_add += (probs[probs>=thresh]).sum()             # <<<<<<<<<<<<<<
  *         # add probability for the seeds and non-seeds
  *         beta_add += roots * log(beta) + (n_nodes-roots) * log(1. - beta)
  */
-    __pyx_t_3 = PyFloat_FromDouble(__pyx_v_thresh); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(__pyx_t_3);
-    __pyx_t_6 = PyObject_RichCompare(((PyObject *)__pyx_v_probs), __pyx_t_3, Py_GE); __Pyx_XGOTREF(__pyx_t_6); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_t_3 = PyObject_GetItem(((PyObject *)__pyx_v_probs), __pyx_t_6); if (unlikely(__pyx_t_3 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
-    __Pyx_GOTREF(__pyx_t_3);
+    __pyx_t_5 = PyFloat_FromDouble(__pyx_v_beta_add); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_5);
+    __pyx_t_6 = PyFloat_FromDouble(__pyx_v_thresh); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_6);
+    __pyx_t_18 = PyObject_RichCompare(((PyObject *)__pyx_v_probs), __pyx_t_6, Py_GE); __Pyx_XGOTREF(__pyx_t_18); if (unlikely(!__pyx_t_18)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-    __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_sum); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_6 = PyObject_GetItem(((PyObject *)__pyx_v_probs), __pyx_t_18); if (unlikely(__pyx_t_6 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
     __Pyx_GOTREF(__pyx_t_6);
-    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-    __pyx_t_3 = NULL;
-    if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_6))) {
-      __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_6);
-      if (likely(__pyx_t_3)) {
-        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_6);
-        __Pyx_INCREF(__pyx_t_3);
+    __Pyx_DECREF(__pyx_t_18); __pyx_t_18 = 0;
+    __pyx_t_18 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_sum); if (unlikely(!__pyx_t_18)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_18);
+    __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+    __pyx_t_6 = NULL;
+    if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_18))) {
+      __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_18);
+      if (likely(__pyx_t_6)) {
+        PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_18);
+        __Pyx_INCREF(__pyx_t_6);
         __Pyx_INCREF(function);
-        __Pyx_DECREF_SET(__pyx_t_6, function);
+        __Pyx_DECREF_SET(__pyx_t_18, function);
       }
     }
-    if (__pyx_t_3) {
-      __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_t_3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    if (__pyx_t_6) {
+      __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_18, __pyx_t_6); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
     } else {
-      __pyx_t_5 = __Pyx_PyObject_CallNoArg(__pyx_t_6); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_3 = __Pyx_PyObject_CallNoArg(__pyx_t_18); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
-    __Pyx_GOTREF(__pyx_t_5);
-    __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-    __Pyx_XDECREF_SET(__pyx_v_beta_add, __pyx_t_5);
-    __pyx_t_5 = 0;
+    __Pyx_GOTREF(__pyx_t_3);
+    __Pyx_DECREF(__pyx_t_18); __pyx_t_18 = 0;
+    __pyx_t_18 = PyNumber_InPlaceAdd(__pyx_t_5, __pyx_t_3); if (unlikely(!__pyx_t_18)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_18);
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_t_18); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_t_18); __pyx_t_18 = 0;
+    __pyx_v_beta_add = __pyx_t_24;
 
-    /* "ml.pyx":94
- *         beta_add = (probs[probs>=thresh]).sum()
+    /* "ml.pyx":95
+ *         beta_add += (probs[probs>=thresh]).sum()
  *         # add probability for the seeds and non-seeds
  *         beta_add += roots * log(beta) + (n_nodes-roots) * log(1. - beta)             # <<<<<<<<<<<<<<
  * 
  *         if beta_add > max_beta_add:
  */
-    __pyx_t_5 = PyFloat_FromDouble(((__pyx_v_roots * log(__pyx_v_beta)) + ((__pyx_v_n_nodes - __pyx_v_roots) * log((1. - __pyx_v_beta))))); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(__pyx_t_5);
-    __pyx_t_6 = PyNumber_InPlaceAdd(__pyx_v_beta_add, __pyx_t_5); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_GOTREF(__pyx_t_6);
-    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-    __Pyx_DECREF_SET(__pyx_v_beta_add, __pyx_t_6);
-    __pyx_t_6 = 0;
+    __pyx_v_beta_add = (__pyx_v_beta_add + ((__pyx_v_roots * log(__pyx_v_beta)) + ((__pyx_v_n_nodes - __pyx_v_roots) * log((1. - __pyx_v_beta)))));
 
-    /* "ml.pyx":96
+    /* "ml.pyx":97
  *         beta_add += roots * log(beta) + (n_nodes-roots) * log(1. - beta)
  * 
  *         if beta_add > max_beta_add:             # <<<<<<<<<<<<<<
  *             max_beta = beta
  *             max_roots = roots
  */
-    __pyx_t_6 = PyObject_RichCompare(__pyx_v_beta_add, __pyx_v_max_beta_add, Py_GT); __Pyx_XGOTREF(__pyx_t_6); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __pyx_t_29 = __Pyx_PyObject_IsTrue(__pyx_t_6); if (unlikely(__pyx_t_29 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+    __pyx_t_29 = ((__pyx_v_beta_add > __pyx_v_max_beta_add) != 0);
     if (__pyx_t_29) {
 
-      /* "ml.pyx":97
+      /* "ml.pyx":98
  * 
  *         if beta_add > max_beta_add:
  *             max_beta = beta             # <<<<<<<<<<<<<<
  *             max_roots = roots
  *             max_beta_add = beta_add
  */
-      __pyx_t_6 = PyFloat_FromDouble(__pyx_v_beta); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __Pyx_GOTREF(__pyx_t_6);
-      __Pyx_XDECREF_SET(__pyx_v_max_beta, __pyx_t_6);
-      __pyx_t_6 = 0;
+      __pyx_v_max_beta = __pyx_v_beta;
 
-      /* "ml.pyx":98
+      /* "ml.pyx":99
  *         if beta_add > max_beta_add:
  *             max_beta = beta
  *             max_roots = roots             # <<<<<<<<<<<<<<
@@ -2878,15 +2878,14 @@ static PyObject *__pyx_pf_2ml_ml(CYTHON_UNUSED PyObject *__pyx_self, PyObject *_
  */
       __pyx_v_max_roots = __pyx_v_roots;
 
-      /* "ml.pyx":99
+      /* "ml.pyx":100
  *             max_beta = beta
  *             max_roots = roots
  *             max_beta_add = beta_add             # <<<<<<<<<<<<<<
  *             # print 'beta:', max_beta, 'add:', max_beta_add, 'roots:', max_roots
  * 
  */
-      __Pyx_INCREF(__pyx_v_beta_add);
-      __Pyx_DECREF_SET(__pyx_v_max_beta_add, __pyx_v_beta_add);
+      __pyx_v_max_beta_add = __pyx_v_beta_add;
       goto __pyx_L21;
     }
     __pyx_L21:;
@@ -2895,29 +2894,22 @@ static PyObject *__pyx_pf_2ml_ml(CYTHON_UNUSED PyObject *__pyx_self, PyObject *_
  *     max_beta_add = float('-inf')
  *     # iterate over all victim nodes to find the optimal threshold
  *     for beta in np.arange(0.001, .2, .002):             # <<<<<<<<<<<<<<
- *         thresh = log(beta/(3012*(1.-beta)))
+ *         thresh = log(beta/(3012.*(1.-beta)))
  *         # print 'beta:', beta, 'thresh:', thresh, 'infected:', len(probs[probs>=thresh])
  */
   }
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
 
-  /* "ml.pyx":102
+  /* "ml.pyx":103
  *             # print 'beta:', max_beta, 'add:', max_beta_add, 'roots:', max_roots
  * 
  *     ll += max_beta_add             # <<<<<<<<<<<<<<
  *     roots = max_roots
  *     beta = max_beta
  */
-  __pyx_t_4 = PyFloat_FromDouble(__pyx_v_ll); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_6 = PyNumber_InPlaceAdd(__pyx_t_4, __pyx_v_max_beta_add); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_6);
-  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_t_6); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-  __pyx_v_ll = __pyx_t_24;
+  __pyx_v_ll = (__pyx_v_ll + __pyx_v_max_beta_add);
 
-  /* "ml.pyx":103
+  /* "ml.pyx":104
  * 
  *     ll += max_beta_add
  *     roots = max_roots             # <<<<<<<<<<<<<<
@@ -2926,42 +2918,40 @@ static PyObject *__pyx_pf_2ml_ml(CYTHON_UNUSED PyObject *__pyx_self, PyObject *_
  */
   __pyx_v_roots = __pyx_v_max_roots;
 
-  /* "ml.pyx":104
+  /* "ml.pyx":105
  *     ll += max_beta_add
  *     roots = max_roots
  *     beta = max_beta             # <<<<<<<<<<<<<<
  *     # print n_nodes, n_roots, n_victims, max_i, roots
  *     return (beta, roots, ll)
  */
-  if (unlikely(!__pyx_v_max_beta)) { __Pyx_RaiseUnboundLocalError("max_beta"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L1_error;} }
-  __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_v_max_beta); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_v_beta = __pyx_t_24;
+  __pyx_v_beta = __pyx_v_max_beta;
 
-  /* "ml.pyx":106
+  /* "ml.pyx":107
  *     beta = max_beta
  *     # print n_nodes, n_roots, n_victims, max_i, roots
  *     return (beta, roots, ll)             # <<<<<<<<<<<<<<
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_6 = PyFloat_FromDouble(__pyx_v_beta); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_6);
-  __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v_roots); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = PyFloat_FromDouble(__pyx_v_beta); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_5 = PyFloat_FromDouble(__pyx_v_ll); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_5);
-  __pyx_t_3 = PyTuple_New(3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_18 = __Pyx_PyInt_From_int(__pyx_v_roots); if (unlikely(!__pyx_t_18)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_18);
+  __pyx_t_3 = PyFloat_FromDouble(__pyx_v_ll); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; __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);
-  PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_t_4);
+  __pyx_t_5 = PyTuple_New(3); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 107; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_5);
+  PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4);
   __Pyx_GIVEREF(__pyx_t_4);
-  PyTuple_SET_ITEM(__pyx_t_3, 2, __pyx_t_5);
-  __Pyx_GIVEREF(__pyx_t_5);
-  __pyx_t_6 = 0;
+  PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_18);
+  __Pyx_GIVEREF(__pyx_t_18);
+  PyTuple_SET_ITEM(__pyx_t_5, 2, __pyx_t_3);
+  __Pyx_GIVEREF(__pyx_t_3);
   __pyx_t_4 = 0;
-  __pyx_t_5 = 0;
-  __pyx_r = __pyx_t_3;
+  __pyx_t_18 = 0;
   __pyx_t_3 = 0;
+  __pyx_r = __pyx_t_5;
+  __pyx_t_5 = 0;
   goto __pyx_L0;
 
   /* "ml.pyx":38
@@ -3002,9 +2992,6 @@ static PyObject *__pyx_pf_2ml_ml(CYTHON_UNUSED PyObject *__pyx_self, PyObject *_
   __Pyx_XDECREF((PyObject *)__pyx_v_probs);
   __Pyx_XDECREF((PyObject *)__pyx_v_probs_fail);
   __Pyx_XDECREF((PyObject *)__pyx_v_probs_nv);
-  __Pyx_XDECREF(__pyx_v_max_beta_add);
-  __Pyx_XDECREF(__pyx_v_beta_add);
-  __Pyx_XDECREF(__pyx_v_max_beta);
   __Pyx_XDECREF(__pyx_v_w1);
   __Pyx_XDECREF(__pyx_v_w2);
   __Pyx_XDECREF(__pyx_v_w3);
@@ -5351,7 +5338,7 @@ static int __Pyx_InitCachedConstants(void) {
  *     max_beta_add = float('-inf')
  *     # iterate over all victim nodes to find the optimal threshold
  *     for beta in np.arange(0.001, .2, .002):             # <<<<<<<<<<<<<<
- *         thresh = log(beta/(3012*(1.-beta)))
+ *         thresh = log(beta/(3012.*(1.-beta)))
  *         # print 'beta:', beta, 'thresh:', thresh, 'infected:', len(probs[probs>=thresh])
  */
   __pyx_tuple_ = PyTuple_Pack(3, __pyx_float_0_001, __pyx_float__2, __pyx_float__002); if (unlikely(!__pyx_tuple_)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -5431,7 +5418,7 @@ static int __Pyx_InitCachedConstants(void) {
  *        DTYPE_t alpha, DTYPE_t delta):
  *     cdef:
  */
-  __pyx_tuple__8 = PyTuple_Pack(33, __pyx_n_s_root_victims, __pyx_n_s_victims, __pyx_n_s_non_victims, __pyx_n_s_age, __pyx_n_s_alpha, __pyx_n_s_delta, __pyx_n_s_n_roots, __pyx_n_s_n_victims, __pyx_n_s_n_nodes, __pyx_n_s_roots, __pyx_n_s_i, __pyx_n_s_dist, __pyx_n_s_dt, __pyx_n_s_t, __pyx_n_s_l, __pyx_n_s_beta, __pyx_n_s_ll, __pyx_n_s_parents, __pyx_n_s_failures, __pyx_n_s_successes, __pyx_n_s_probs, __pyx_n_s_probs_fail, __pyx_n_s_probs_nv, __pyx_n_s_max_beta_add, __pyx_n_s_thresh, __pyx_n_s_beta_add, __pyx_n_s_max_beta, __pyx_n_s_max_roots, __pyx_n_s_w1, __pyx_n_s_w2, __pyx_n_s_w3, __pyx_n_s_genexpr, __pyx_n_s_genexpr); if (unlikely(!__pyx_tuple__8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_tuple__8 = PyTuple_Pack(33, __pyx_n_s_root_victims, __pyx_n_s_victims, __pyx_n_s_non_victims, __pyx_n_s_age, __pyx_n_s_alpha, __pyx_n_s_delta, __pyx_n_s_n_roots, __pyx_n_s_n_victims, __pyx_n_s_n_nodes, __pyx_n_s_roots, __pyx_n_s_i, __pyx_n_s_dist, __pyx_n_s_dt, __pyx_n_s_t, __pyx_n_s_l, __pyx_n_s_beta, __pyx_n_s_ll, __pyx_n_s_beta_add, __pyx_n_s_max_beta, __pyx_n_s_max_beta_add, __pyx_n_s_parents, __pyx_n_s_failures, __pyx_n_s_successes, __pyx_n_s_probs, __pyx_n_s_probs_fail, __pyx_n_s_probs_nv, __pyx_n_s_thresh, __pyx_n_s_max_roots, __pyx_n_s_w1, __pyx_n_s_w2, __pyx_n_s_w3, __pyx_n_s_genexpr, __pyx_n_s_genexpr); if (unlikely(!__pyx_tuple__8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_tuple__8);
   __Pyx_GIVEREF(__pyx_tuple__8);
   __pyx_codeobj__9 = (PyObject*)__Pyx_PyCode_New(6, 0, 33, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__8, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_Users_ben_Documents_Cascade_Pro, __pyx_n_s_ml, 38, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__9)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -6843,10 +6830,6 @@ bad:
     return (double)-1;
 }
 
-static CYTHON_INLINE void __Pyx_RaiseUnboundLocalError(const char *varname) {
-    PyErr_Format(PyExc_UnboundLocalError, "local variable '%s' referenced before assignment", varname);
-}
-
 static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb) {
 #if CYTHON_COMPILING_IN_CPYTHON
     PyObject *tmp_type, *tmp_value, *tmp_tb;
diff --git a/experiments/ml.pyx b/experiments/ml.pyx
index 53e614b..5016347 100644
--- a/experiments/ml.pyx
+++ b/experiments/ml.pyx
@@ -39,7 +39,7 @@ def ml(dict root_victims, dict victims, dict non_victims, DTYPE_t age,
        DTYPE_t alpha, DTYPE_t delta):
     cdef:
         int n_roots, n_victims, n_nodes, roots, i, dist, dt, t, l
-        DTYPE_t beta, ll
+        DTYPE_t beta, ll, beta_add, max_beta, max_beta_add
         list parents, failures, successes
     n_roots, n_victims = len(root_victims), len(victims)
     n_nodes = 148152
@@ -84,12 +84,13 @@ def ml(dict root_victims, dict victims, dict non_victims, DTYPE_t age,
     max_beta_add = float('-inf')
     # iterate over all victim nodes to find the optimal threshold
     for beta in np.arange(0.001, .2, .002):
-        thresh = log(beta/(3012*(1.-beta)))
+        thresh = log(beta/(3012.*(1.-beta)))
         # print 'beta:', beta, 'thresh:', thresh, 'infected:', len(probs[probs>=thresh])
         roots = n_roots + len(probs[probs<thresh])
 
+        beta_add = 0.
         # add probability for realized edges and subtract probability these edges fail
-        beta_add = (probs[probs>=thresh]).sum()
+        beta_add += (probs[probs>=thresh]).sum()
         # add probability for the seeds and non-seeds
         beta_add += roots * log(beta) + (n_nodes-roots) * log(1. - beta)
 
diff --git a/experiments/ml.so b/experiments/ml.so
index 167b2df..ba113c4 100755
--- a/experiments/ml.so
+++ b/experiments/ml.so
diff --git a/experiments/ml2.c b/experiments/ml2.c
index fe1b1f6..af1134b 100644
--- a/experiments/ml2.c
+++ b/experiments/ml2.c
@@ -773,7 +773,7 @@ struct __pyx_obj_3ml2___pyx_scope_struct__ml2 {
 };
 
 
-/* "ml2.pyx":62
+/* "ml2.pyx":61
  *                      for (dist, dt, w1, w2, w3) in parents]
  *         # find parent that maximizes log(p) - log(\tilde{p})
  *         probs[i] = max(s - failures[l] for l, s in enumerate(successes))             # <<<<<<<<<<<<<<
@@ -871,13 +871,6 @@ static CYTHON_INLINE PyObject* __Pyx_PyObject_GetAttrStr(PyObject* obj, PyObject
 
 static PyObject *__Pyx_GetBuiltinName(PyObject *name);
 
-static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb);
-static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb);
-
-static void __Pyx_WriteUnraisable(const char *name, int clineno,
-                                  int lineno, const char *filename,
-                                  int full_traceback);
-
 static void __Pyx_RaiseArgtupleInvalid(const char* func_name, int exact,
     Py_ssize_t num_min, Py_ssize_t num_max, Py_ssize_t num_found);
 
@@ -978,6 +971,9 @@ static CYTHON_INLINE int __Pyx_ListComp_Append(PyObject* list, PyObject* x) {
 #endif
 
 #define __Pyx_BufPtrStrided1d(type, buf, i0, s0) (type)((char*)buf + i0 * s0)
+static CYTHON_INLINE void __Pyx_ErrRestore(PyObject *type, PyObject *value, PyObject *tb);
+static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb);
+
 static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb, PyObject *cause);
 
 #if PY_MAJOR_VERSION >= 3
@@ -1046,14 +1042,6 @@ static Py_ssize_t __Pyx_minusones[] = {-1, -1, -1, -1, -1, -1, -1, -1};
 
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level);
 
-static int __Pyx_Print(PyObject*, PyObject *, int);
-#if CYTHON_COMPILING_IN_PYPY || PY_MAJOR_VERSION >= 3
-static PyObject* __pyx_print = 0;
-static PyObject* __pyx_print_kwargs = 0;
-#endif
-
-static int __Pyx_PrintOne(PyObject* stream, PyObject *o);
-
 static CYTHON_INLINE PyObject* __Pyx_PyInt_From_int(int value);
 
 static CYTHON_INLINE int __Pyx_PyInt_As_int(PyObject *);
@@ -1288,14 +1276,12 @@ static char __pyx_k_w1[] = "w1";
 static char __pyx_k_w2[] = "w2";
 static char __pyx_k_w3[] = "w3";
 static char __pyx_k_age[] = "age";
-static char __pyx_k_end[] = "end";
 static char __pyx_k_max[] = "max";
 static char __pyx_k_ml2[] = "ml2";
 static char __pyx_k_sum[] = "sum";
 static char __pyx_k_args[] = "args";
 static char __pyx_k_beta[] = "beta";
 static char __pyx_k_dist[] = "dist";
-static char __pyx_k_file[] = "file";
 static char __pyx_k_main[] = "__main__";
 static char __pyx_k_send[] = "send";
 static char __pyx_k_test[] = "__test__";
@@ -1305,7 +1291,6 @@ static char __pyx_k_close[] = "close";
 static char __pyx_k_delta[] = "delta";
 static char __pyx_k_dtype[] = "dtype";
 static char __pyx_k_numpy[] = "numpy";
-static char __pyx_k_print[] = "print";
 static char __pyx_k_probs[] = "probs";
 static char __pyx_k_range[] = "range";
 static char __pyx_k_roots[] = "roots";
@@ -1314,7 +1299,6 @@ static char __pyx_k_zeros[] = "zeros";
 static char __pyx_k_import[] = "__import__";
 static char __pyx_k_float64[] = "float64";
 static char __pyx_k_genexpr[] = "genexpr";
-static char __pyx_k_n_nodes[] = "n_nodes";
 static char __pyx_k_n_roots[] = "n_roots";
 static char __pyx_k_parents[] = "parents";
 static char __pyx_k_victims[] = "victims";
@@ -1329,7 +1313,6 @@ static char __pyx_k_probs_fail[] = "probs_fail";
 static char __pyx_k_non_victims[] = "non_victims";
 static char __pyx_k_RuntimeError[] = "RuntimeError";
 static char __pyx_k_root_victims[] = "root_victims";
-static char __pyx_k_UNDERFLOW_ERROR[] = "UNDERFLOW ERROR";
 static char __pyx_k_ml2_locals_genexpr[] = "ml2.<locals>.genexpr";
 static char __pyx_k_ndarray_is_not_C_contiguous[] = "ndarray is not C contiguous";
 static char __pyx_k_Users_ben_Documents_Cascade_Pro[] = "/Users/ben/Documents/Cascade Project/criminal_cascades/experiments/ml2.pyx";
@@ -1343,7 +1326,6 @@ static PyObject *__pyx_kp_u_Format_string_allocated_too_shor;
 static PyObject *__pyx_kp_u_Format_string_allocated_too_shor_2;
 static PyObject *__pyx_kp_u_Non_native_byte_order_not_suppor;
 static PyObject *__pyx_n_s_RuntimeError;
-static PyObject *__pyx_kp_s_UNDERFLOW_ERROR;
 static PyObject *__pyx_kp_s_Users_ben_Documents_Cascade_Pro;
 static PyObject *__pyx_n_s_ValueError;
 static PyObject *__pyx_n_s_age;
@@ -1355,10 +1337,8 @@ static PyObject *__pyx_n_s_delta;
 static PyObject *__pyx_n_s_dist;
 static PyObject *__pyx_n_s_dt;
 static PyObject *__pyx_n_s_dtype;
-static PyObject *__pyx_n_s_end;
 static PyObject *__pyx_n_s_enumerate;
 static PyObject *__pyx_n_s_failures;
-static PyObject *__pyx_n_s_file;
 static PyObject *__pyx_n_s_float64;
 static PyObject *__pyx_n_s_genexpr;
 static PyObject *__pyx_n_s_i;
@@ -1370,7 +1350,6 @@ static PyObject *__pyx_n_s_main;
 static PyObject *__pyx_n_s_max;
 static PyObject *__pyx_n_s_ml2;
 static PyObject *__pyx_n_s_ml2_locals_genexpr;
-static PyObject *__pyx_n_s_n_nodes;
 static PyObject *__pyx_n_s_n_roots;
 static PyObject *__pyx_n_s_n_victims;
 static PyObject *__pyx_kp_u_ndarray_is_not_C_contiguous;
@@ -1379,7 +1358,6 @@ static PyObject *__pyx_n_s_non_victims;
 static PyObject *__pyx_n_s_np;
 static PyObject *__pyx_n_s_numpy;
 static PyObject *__pyx_n_s_parents;
-static PyObject *__pyx_n_s_print;
 static PyObject *__pyx_n_s_probs;
 static PyObject *__pyx_n_s_probs_fail;
 static PyObject *__pyx_n_s_probs_nv;
@@ -1458,55 +1436,37 @@ static __pyx_t_3ml2_DTYPE_t __pyx_f_3ml2_weight_success(int __pyx_v_dist, int __
   __pyx_t_3ml2_DTYPE_t __pyx_v_result;
   __pyx_t_3ml2_DTYPE_t __pyx_r;
   __Pyx_RefNannyDeclarations
-  int __pyx_t_1;
-  int __pyx_lineno = 0;
-  const char *__pyx_filename = NULL;
-  int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("weight_success", 0);
 
   /* "ml2.pyx":16
  *     """weight for successful infection, exponential time model"""
  *     cdef DTYPE_t structural, temporal, result
- *     structural = delta ** dist             # <<<<<<<<<<<<<<
+ *     structural = dist * log(delta)             # <<<<<<<<<<<<<<
  *     # structural = plogis(w1,delta) * plogis(w2,delta) * plogis(w3,delta)
- *     temporal = exp(-alpha*dt) * (exp(alpha)-1.)
+ *     temporal = log(exp(alpha)-1.) - alpha*dt
  */
-  __pyx_v_structural = pow(__pyx_v_delta, ((__pyx_t_3ml2_DTYPE_t)__pyx_v_dist));
+  __pyx_v_structural = (__pyx_v_dist * log(__pyx_v_delta));
 
   /* "ml2.pyx":18
- *     structural = delta ** dist
+ *     structural = dist * log(delta)
  *     # structural = plogis(w1,delta) * plogis(w2,delta) * plogis(w3,delta)
- *     temporal = exp(-alpha*dt) * (exp(alpha)-1.)             # <<<<<<<<<<<<<<
+ *     temporal = log(exp(alpha)-1.) - alpha*dt             # <<<<<<<<<<<<<<
  *     # temporal = 1 - exp(-alpha*dt)
- *     if exp(-alpha*dt)==0.: print 'UNDERFLOW ERROR'
+ *     # if exp(-alpha*dt)==0.: print 'UNDERFLOW ERROR'
  */
-  __pyx_v_temporal = (exp(((-__pyx_v_alpha) * __pyx_v_dt)) * (exp(__pyx_v_alpha) - 1.));
-
-  /* "ml2.pyx":20
- *     temporal = exp(-alpha*dt) * (exp(alpha)-1.)
- *     # temporal = 1 - exp(-alpha*dt)
- *     if exp(-alpha*dt)==0.: print 'UNDERFLOW ERROR'             # <<<<<<<<<<<<<<
- *     # temporal = 1. / (1. + (dt - 1.)/alpha)**0.01 - 1. / (1. + dt/alpha)**0.01
- *     result = log(structural * temporal)
- */
-  __pyx_t_1 = ((exp(((-__pyx_v_alpha) * __pyx_v_dt)) == 0.) != 0);
-  if (__pyx_t_1) {
-    if (__Pyx_PrintOne(0, __pyx_kp_s_UNDERFLOW_ERROR) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-    goto __pyx_L3;
-  }
-  __pyx_L3:;
+  __pyx_v_temporal = (log((exp(__pyx_v_alpha) - 1.)) - (__pyx_v_alpha * __pyx_v_dt));
 
   /* "ml2.pyx":22
- *     if exp(-alpha*dt)==0.: print 'UNDERFLOW ERROR'
+ *     # if exp(-alpha*dt)==0.: print 'UNDERFLOW ERROR'
  *     # temporal = 1. / (1. + (dt - 1.)/alpha)**0.01 - 1. / (1. + dt/alpha)**0.01
- *     result = log(structural * temporal)             # <<<<<<<<<<<<<<
+ *     result = structural + temporal             # <<<<<<<<<<<<<<
  *     # print 'st', structural, temporal
  *     return result
  */
-  __pyx_v_result = log((__pyx_v_structural * __pyx_v_temporal));
+  __pyx_v_result = (__pyx_v_structural + __pyx_v_temporal);
 
   /* "ml2.pyx":24
- *     result = log(structural * temporal)
+ *     result = structural + temporal
  *     # print 'st', structural, temporal
  *     return result             # <<<<<<<<<<<<<<
  * 
@@ -1524,9 +1484,6 @@ static __pyx_t_3ml2_DTYPE_t __pyx_f_3ml2_weight_success(int __pyx_v_dist, int __
  */
 
   /* function exit code */
-  __pyx_L1_error:;
-  __Pyx_WriteUnraisable("ml2.weight_success", __pyx_clineno, __pyx_lineno, __pyx_filename, 0);
-  __pyx_r = 0;
   __pyx_L0:;
   __Pyx_RefNannyFinishContext();
   return __pyx_r;
@@ -1713,7 +1670,7 @@ static PyObject *__pyx_pw_3ml2_1ml2(PyObject *__pyx_self, PyObject *__pyx_args,
 }
 static PyObject *__pyx_gb_3ml2_3ml2_2generator(__pyx_GeneratorObject *__pyx_generator, PyObject *__pyx_sent_value); /* proto */
 
-/* "ml2.pyx":62
+/* "ml2.pyx":61
  *                      for (dist, dt, w1, w2, w3) in parents]
  *         # find parent that maximizes log(p) - log(\tilde{p})
  *         probs[i] = max(s - failures[l] for l, s in enumerate(successes))             # <<<<<<<<<<<<<<
@@ -1739,7 +1696,7 @@ static PyObject *__pyx_pf_3ml2_3ml2_genexpr(PyObject *__pyx_self) {
   __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_3ml2_3ml2_2generator, (PyObject *) __pyx_cur_scope, __pyx_n_s_genexpr, __pyx_n_s_ml2_locals_genexpr); if (unlikely(!gen)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_GeneratorObject *gen = __Pyx_Generator_New((__pyx_generator_body_t) __pyx_gb_3ml2_3ml2_2generator, (PyObject *) __pyx_cur_scope, __pyx_n_s_genexpr, __pyx_n_s_ml2_locals_genexpr); if (unlikely(!gen)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_cur_scope);
     __Pyx_RefNannyFinishContext();
     return (PyObject *) gen;
@@ -1777,16 +1734,16 @@ static PyObject *__pyx_gb_3ml2_3ml2_2generator(__pyx_GeneratorObject *__pyx_gene
     return NULL;
   }
   __pyx_L3_first_run:;
-  if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_t_1 = 0;
-  if (unlikely(!__pyx_cur_scope->__pyx_outer_scope->__pyx_v_successes)) { __Pyx_RaiseClosureNameError("successes"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} }
+  if (unlikely(!__pyx_cur_scope->__pyx_outer_scope->__pyx_v_successes)) { __Pyx_RaiseClosureNameError("successes"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;} }
   __pyx_t_2 = __pyx_cur_scope->__pyx_outer_scope->__pyx_v_successes; __Pyx_INCREF(__pyx_t_2); __pyx_t_3 = 0;
   for (;;) {
     if (__pyx_t_3 >= PyList_GET_SIZE(__pyx_t_2)) break;
     #if CYTHON_COMPILING_IN_CPYTHON
-    __pyx_t_4 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_4); __pyx_t_3++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = PyList_GET_ITEM(__pyx_t_2, __pyx_t_3); __Pyx_INCREF(__pyx_t_4); __pyx_t_3++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     #else
-    __pyx_t_4 = PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = PySequence_ITEM(__pyx_t_2, __pyx_t_3); __pyx_t_3++; if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     #endif
     __Pyx_XGOTREF(__pyx_cur_scope->__pyx_v_s);
     __Pyx_XDECREF_SET(__pyx_cur_scope->__pyx_v_s, __pyx_t_4);
@@ -1794,14 +1751,14 @@ static PyObject *__pyx_gb_3ml2_3ml2_2generator(__pyx_GeneratorObject *__pyx_gene
     __pyx_t_4 = 0;
     __pyx_cur_scope->__pyx_v_l = __pyx_t_1;
     __pyx_t_1 = (__pyx_t_1 + 1);
-    if (unlikely(!__pyx_cur_scope->__pyx_outer_scope->__pyx_v_failures)) { __Pyx_RaiseClosureNameError("failures"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;} }
+    if (unlikely(!__pyx_cur_scope->__pyx_outer_scope->__pyx_v_failures)) { __Pyx_RaiseClosureNameError("failures"); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;} }
     if (unlikely(__pyx_cur_scope->__pyx_outer_scope->__pyx_v_failures == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not subscriptable");
-      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
-    __pyx_t_4 = __Pyx_GetItemInt_List(__pyx_cur_scope->__pyx_outer_scope->__pyx_v_failures, __pyx_cur_scope->__pyx_v_l, Py_ssize_t, 1, PyInt_FromSsize_t, 1, 1, 0); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+    __pyx_t_4 = __Pyx_GetItemInt_List(__pyx_cur_scope->__pyx_outer_scope->__pyx_v_failures, __pyx_cur_scope->__pyx_v_l, Py_ssize_t, 1, PyInt_FromSsize_t, 1, 1, 0); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
     __Pyx_GOTREF(__pyx_t_4);
-    __pyx_t_5 = PyNumber_Subtract(__pyx_cur_scope->__pyx_v_s, __pyx_t_4); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_5 = PyNumber_Subtract(__pyx_cur_scope->__pyx_v_s, __pyx_t_4); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_r = __pyx_t_5;
@@ -1821,7 +1778,7 @@ static PyObject *__pyx_gb_3ml2_3ml2_2generator(__pyx_GeneratorObject *__pyx_gene
     __pyx_cur_scope->__pyx_t_1 = 0;
     __Pyx_XGOTREF(__pyx_t_2);
     __pyx_t_3 = __pyx_cur_scope->__pyx_t_2;
-    if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (unlikely(!__pyx_sent_value)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
@@ -1853,7 +1810,6 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
   struct __pyx_obj_3ml2___pyx_scope_struct__ml2 *__pyx_cur_scope;
   int __pyx_v_n_roots;
   int __pyx_v_n_victims;
-  CYTHON_UNUSED int __pyx_v_n_nodes;
   int __pyx_v_roots;
   int __pyx_v_i;
   int __pyx_v_dist;
@@ -1928,8 +1884,8 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
  *         DTYPE_t beta, ll
  *         list parents, failures, successes
  *     n_roots, n_victims = len(root_victims), len(victims)             # <<<<<<<<<<<<<<
- *     n_nodes = 100
  *     cdef:
+ *         np.ndarray[DTYPE_t] probs = np.zeros(n_victims, dtype=DTYPE)
  */
   if (unlikely(__pyx_v_root_victims == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()");
@@ -1944,52 +1900,43 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
   __pyx_v_n_roots = __pyx_t_1;
   __pyx_v_n_victims = __pyx_t_2;
 
-  /* "ml2.pyx":45
- *         list parents, failures, successes
+  /* "ml2.pyx":46
  *     n_roots, n_victims = len(root_victims), len(victims)
- *     n_nodes = 100             # <<<<<<<<<<<<<<
- *     cdef:
- *         np.ndarray[DTYPE_t] probs = np.zeros(n_victims, dtype=DTYPE)
- */
-  __pyx_v_n_nodes = 100;
-
-  /* "ml2.pyx":47
- *     n_nodes = 100
  *     cdef:
  *         np.ndarray[DTYPE_t] probs = np.zeros(n_victims, dtype=DTYPE)             # <<<<<<<<<<<<<<
  *         np.ndarray[DTYPE_t] probs_fail = np.zeros(n_victims, dtype=DTYPE)
  *         np.ndarray[DTYPE_t] probs_nv = np.zeros(len(non_victims), dtype=DTYPE)
  */
-  __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_zeros); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_zeros); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_t_3 = __Pyx_PyInt_From_int(__pyx_v_n_victims); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyInt_From_int(__pyx_v_n_victims); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __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[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __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);
   __pyx_t_3 = 0;
-  __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = PyDict_New(); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_DTYPE); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_DTYPE); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_6);
-  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_6) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-  __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_5, __pyx_t_3); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_5, __pyx_t_3); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_6);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_t_7 = ((PyArrayObject *)__pyx_t_6);
   {
     __Pyx_BufFmt_StackElem __pyx_stack[1];
     if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_probs.rcbuffer->pybuffer, (PyObject*)__pyx_t_7, &__Pyx_TypeInfo_nn___pyx_t_3ml2_DTYPE_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) {
       __pyx_v_probs = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_probs.rcbuffer->pybuffer.buf = NULL;
-      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     } else {__pyx_pybuffernd_probs.diminfo[0].strides = __pyx_pybuffernd_probs.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_probs.diminfo[0].shape = __pyx_pybuffernd_probs.rcbuffer->pybuffer.shape[0];
     }
   }
@@ -1997,43 +1944,43 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
   __pyx_v_probs = ((PyArrayObject *)__pyx_t_6);
   __pyx_t_6 = 0;
 
-  /* "ml2.pyx":48
+  /* "ml2.pyx":47
  *     cdef:
  *         np.ndarray[DTYPE_t] probs = np.zeros(n_victims, dtype=DTYPE)
  *         np.ndarray[DTYPE_t] probs_fail = np.zeros(n_victims, dtype=DTYPE)             # <<<<<<<<<<<<<<
  *         np.ndarray[DTYPE_t] probs_nv = np.zeros(len(non_victims), dtype=DTYPE)
  * 
  */
-  __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_6 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_6);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_zeros); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_zeros); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-  __pyx_t_6 = __Pyx_PyInt_From_int(__pyx_v_n_victims); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_6 = __Pyx_PyInt_From_int(__pyx_v_n_victims); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_6);
-  __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_5);
   PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_6);
   __Pyx_GIVEREF(__pyx_t_6);
   __pyx_t_6 = 0;
-  __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_6 = PyDict_New(); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_6);
-  __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_DTYPE); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_DTYPE); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
-  if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_dtype, __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (PyDict_SetItem(__pyx_t_6, __pyx_n_s_dtype, __pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_5, __pyx_t_6); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_5, __pyx_t_6); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
-  if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_t_8 = ((PyArrayObject *)__pyx_t_4);
   {
     __Pyx_BufFmt_StackElem __pyx_stack[1];
     if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_probs_fail.rcbuffer->pybuffer, (PyObject*)__pyx_t_8, &__Pyx_TypeInfo_nn___pyx_t_3ml2_DTYPE_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) {
       __pyx_v_probs_fail = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_probs_fail.rcbuffer->pybuffer.buf = NULL;
-      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     } else {__pyx_pybuffernd_probs_fail.diminfo[0].strides = __pyx_pybuffernd_probs_fail.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_probs_fail.diminfo[0].shape = __pyx_pybuffernd_probs_fail.rcbuffer->pybuffer.shape[0];
     }
   }
@@ -2041,48 +1988,48 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
   __pyx_v_probs_fail = ((PyArrayObject *)__pyx_t_4);
   __pyx_t_4 = 0;
 
-  /* "ml2.pyx":49
+  /* "ml2.pyx":48
  *         np.ndarray[DTYPE_t] probs = np.zeros(n_victims, dtype=DTYPE)
  *         np.ndarray[DTYPE_t] probs_fail = np.zeros(n_victims, dtype=DTYPE)
  *         np.ndarray[DTYPE_t] probs_nv = np.zeros(len(non_victims), dtype=DTYPE)             # <<<<<<<<<<<<<<
  * 
  *     # loop through victims
  */
-  __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = __Pyx_GetModuleGlobalName(__pyx_n_s_np); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_zeros); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_zeros); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_6);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   if (unlikely(__pyx_v_non_victims == Py_None)) {
     PyErr_SetString(PyExc_TypeError, "object of type 'NoneType' has no len()");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
-  __pyx_t_2 = PyDict_Size(__pyx_v_non_victims); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_t_4 = PyInt_FromSsize_t(__pyx_t_2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = PyDict_Size(__pyx_v_non_victims); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = PyInt_FromSsize_t(__pyx_t_2); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __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[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_5);
   PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_4);
   __Pyx_GIVEREF(__pyx_t_4);
   __pyx_t_4 = 0;
-  __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = PyDict_New(); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_DTYPE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_GetModuleGlobalName(__pyx_n_s_DTYPE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_3) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_5, __pyx_t_4); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_Call(__pyx_t_6, __pyx_t_5, __pyx_t_4); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_t_9 = ((PyArrayObject *)__pyx_t_3);
   {
     __Pyx_BufFmt_StackElem __pyx_stack[1];
     if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_probs_nv.rcbuffer->pybuffer, (PyObject*)__pyx_t_9, &__Pyx_TypeInfo_nn___pyx_t_3ml2_DTYPE_t, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) {
       __pyx_v_probs_nv = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_probs_nv.rcbuffer->pybuffer.buf = NULL;
-      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     } else {__pyx_pybuffernd_probs_nv.diminfo[0].strides = __pyx_pybuffernd_probs_nv.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_probs_nv.diminfo[0].shape = __pyx_pybuffernd_probs_nv.rcbuffer->pybuffer.shape[0];
     }
   }
@@ -2090,7 +2037,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
   __pyx_v_probs_nv = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
-  /* "ml2.pyx":52
+  /* "ml2.pyx":51
  * 
  *     # loop through victims
  *     for i, parents in enumerate(victims.itervalues()):             # <<<<<<<<<<<<<<
@@ -2101,9 +2048,9 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
   __pyx_t_2 = 0;
   if (unlikely(__pyx_v_victims == Py_None)) {
     PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%s'", "itervalues");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
-  __pyx_t_4 = __Pyx_dict_iterator(__pyx_v_victims, 1, __pyx_n_s_itervalues, (&__pyx_t_1), (&__pyx_t_11)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = __Pyx_dict_iterator(__pyx_v_victims, 1, __pyx_n_s_itervalues, (&__pyx_t_1), (&__pyx_t_11)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_XDECREF(__pyx_t_3);
   __pyx_t_3 = __pyx_t_4;
@@ -2111,25 +2058,25 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
   while (1) {
     __pyx_t_12 = __Pyx_dict_iter_next(__pyx_t_3, __pyx_t_1, &__pyx_t_2, NULL, &__pyx_t_4, NULL, __pyx_t_11);
     if (unlikely(__pyx_t_12 == 0)) break;
-    if (unlikely(__pyx_t_12 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (unlikely(__pyx_t_12 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
-    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[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    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[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_XDECREF_SET(__pyx_v_parents, ((PyObject*)__pyx_t_4));
     __pyx_t_4 = 0;
     __pyx_v_i = __pyx_t_10;
     __pyx_t_10 = (__pyx_t_10 + 1);
 
-    /* "ml2.pyx":56
+    /* "ml2.pyx":55
  *         # fail to infect it, also computes the probability that its most
  *         # likely parent infects it
  *         failures = [weight_failure(dist, dt, alpha, delta, w1, w2, w3)             # <<<<<<<<<<<<<<
  *                     for (dist, dt, w1, w2, w3) in parents]
  *         probs_fail[i] = sum(failures)
  */
-    __pyx_t_4 = PyList_New(0); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = PyList_New(0); 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);
 
-    /* "ml2.pyx":57
+    /* "ml2.pyx":56
  *         # likely parent infects it
  *         failures = [weight_failure(dist, dt, alpha, delta, w1, w2, w3)
  *                     for (dist, dt, w1, w2, w3) in parents]             # <<<<<<<<<<<<<<
@@ -2138,15 +2085,15 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
  */
     if (unlikely(__pyx_v_parents == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable");
-      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
     __pyx_t_5 = __pyx_v_parents; __Pyx_INCREF(__pyx_t_5); __pyx_t_13 = 0;
     for (;;) {
       if (__pyx_t_13 >= PyList_GET_SIZE(__pyx_t_5)) break;
       #if CYTHON_COMPILING_IN_CPYTHON
-      __pyx_t_6 = PyList_GET_ITEM(__pyx_t_5, __pyx_t_13); __Pyx_INCREF(__pyx_t_6); __pyx_t_13++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = PyList_GET_ITEM(__pyx_t_5, __pyx_t_13); __Pyx_INCREF(__pyx_t_6); __pyx_t_13++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #else
-      __pyx_t_6 = PySequence_ITEM(__pyx_t_5, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = PySequence_ITEM(__pyx_t_5, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #endif
       if ((likely(PyTuple_CheckExact(__pyx_t_6))) || (PyList_CheckExact(__pyx_t_6))) {
         PyObject* sequence = __pyx_t_6;
@@ -2158,7 +2105,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
         if (unlikely(size != 5)) {
           if (size > 5) __Pyx_RaiseTooManyValuesError(5);
           else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);
-          {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+          {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         }
         #if CYTHON_COMPILING_IN_CPYTHON
         if (likely(PyTuple_CheckExact(sequence))) {
@@ -2184,7 +2131,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
           Py_ssize_t i;
           PyObject** temps[5] = {&__pyx_t_14,&__pyx_t_15,&__pyx_t_16,&__pyx_t_17,&__pyx_t_18};
           for (i=0; i < 5; i++) {
-            PyObject* item = PySequence_ITEM(sequence, i); if (unlikely(!item)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+            PyObject* item = PySequence_ITEM(sequence, i); if (unlikely(!item)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
             __Pyx_GOTREF(item);
             *(temps[i]) = item;
           }
@@ -2194,7 +2141,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
       } else {
         Py_ssize_t index = -1;
         PyObject** temps[5] = {&__pyx_t_14,&__pyx_t_15,&__pyx_t_16,&__pyx_t_17,&__pyx_t_18};
-        __pyx_t_19 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        __pyx_t_19 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __Pyx_GOTREF(__pyx_t_19);
         __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
         __pyx_t_20 = Py_TYPE(__pyx_t_19)->tp_iternext;
@@ -2203,7 +2150,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
           __Pyx_GOTREF(item);
           *(temps[index]) = item;
         }
-        if (__Pyx_IternextUnpackEndCheck(__pyx_t_20(__pyx_t_19), 5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        if (__Pyx_IternextUnpackEndCheck(__pyx_t_20(__pyx_t_19), 5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __pyx_t_20 = NULL;
         __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0;
         goto __pyx_L8_unpacking_done;
@@ -2211,12 +2158,12 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
         __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0;
         __pyx_t_20 = NULL;
         if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);
-        {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __pyx_L8_unpacking_done:;
       }
-      __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_t_14); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_t_14); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
-      __pyx_t_21 = __Pyx_PyInt_As_int(__pyx_t_15); if (unlikely((__pyx_t_21 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_21 = __Pyx_PyInt_As_int(__pyx_t_15); if (unlikely((__pyx_t_21 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;
       __pyx_v_dist = __pyx_t_12;
       __pyx_v_dt = __pyx_t_21;
@@ -2227,22 +2174,22 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
       __Pyx_XDECREF_SET(__pyx_v_w3, __pyx_t_18);
       __pyx_t_18 = 0;
 
-      /* "ml2.pyx":56
+      /* "ml2.pyx":55
  *         # fail to infect it, also computes the probability that its most
  *         # likely parent infects it
  *         failures = [weight_failure(dist, dt, alpha, delta, w1, w2, w3)             # <<<<<<<<<<<<<<
  *                     for (dist, dt, w1, w2, w3) in parents]
  *         probs_fail[i] = sum(failures)
  */
-      __pyx_t_22 = __pyx_PyFloat_AsDouble(__pyx_v_w1); if (unlikely((__pyx_t_22 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_23 = __pyx_PyFloat_AsDouble(__pyx_v_w2); if (unlikely((__pyx_t_23 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_v_w3); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_6 = PyFloat_FromDouble(__pyx_f_3ml2_weight_failure(__pyx_v_dist, __pyx_v_dt, __pyx_v_alpha, __pyx_v_delta, __pyx_t_22, __pyx_t_23, __pyx_t_24)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_22 = __pyx_PyFloat_AsDouble(__pyx_v_w1); if (unlikely((__pyx_t_22 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_23 = __pyx_PyFloat_AsDouble(__pyx_v_w2); if (unlikely((__pyx_t_23 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_v_w3); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = PyFloat_FromDouble(__pyx_f_3ml2_weight_failure(__pyx_v_dist, __pyx_v_dt, __pyx_v_alpha, __pyx_v_delta, __pyx_t_22, __pyx_t_23, __pyx_t_24)); 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);
-      if (unlikely(__Pyx_ListComp_Append(__pyx_t_4, (PyObject*)__pyx_t_6))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      if (unlikely(__Pyx_ListComp_Append(__pyx_t_4, (PyObject*)__pyx_t_6))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
 
-      /* "ml2.pyx":57
+      /* "ml2.pyx":56
  *         # likely parent infects it
  *         failures = [weight_failure(dist, dt, alpha, delta, w1, w2, w3)
  *                     for (dist, dt, w1, w2, w3) in parents]             # <<<<<<<<<<<<<<
@@ -2256,38 +2203,38 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
     __Pyx_GIVEREF(__pyx_t_4);
     __pyx_t_4 = 0;
 
-    /* "ml2.pyx":58
+    /* "ml2.pyx":57
  *         failures = [weight_failure(dist, dt, alpha, delta, w1, w2, w3)
  *                     for (dist, dt, w1, w2, w3) in parents]
  *         probs_fail[i] = sum(failures)             # <<<<<<<<<<<<<<
  *         successes = [weight_success(dist, dt, alpha, delta, w1, w2, w3)
  *                      for (dist, dt, w1, w2, w3) in parents]
  */
-    __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_INCREF(__pyx_cur_scope->__pyx_v_failures);
     PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_cur_scope->__pyx_v_failures);
     __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_failures);
-    __pyx_t_5 = __Pyx_PyObject_Call(__pyx_builtin_sum, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_5 = __Pyx_PyObject_Call(__pyx_builtin_sum, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_t_5); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_t_5); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __pyx_t_21 = __pyx_v_i;
     if (__pyx_t_21 < 0) __pyx_t_21 += __pyx_pybuffernd_probs_fail.diminfo[0].shape;
     *__Pyx_BufPtrStrided1d(__pyx_t_3ml2_DTYPE_t *, __pyx_pybuffernd_probs_fail.rcbuffer->pybuffer.buf, __pyx_t_21, __pyx_pybuffernd_probs_fail.diminfo[0].strides) = __pyx_t_24;
 
-    /* "ml2.pyx":59
+    /* "ml2.pyx":58
  *                     for (dist, dt, w1, w2, w3) in parents]
  *         probs_fail[i] = sum(failures)
  *         successes = [weight_success(dist, dt, alpha, delta, w1, w2, w3)             # <<<<<<<<<<<<<<
  *                      for (dist, dt, w1, w2, w3) in parents]
  *         # find parent that maximizes log(p) - log(\tilde{p})
  */
-    __pyx_t_5 = PyList_New(0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_5 = PyList_New(0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
 
-    /* "ml2.pyx":60
+    /* "ml2.pyx":59
  *         probs_fail[i] = sum(failures)
  *         successes = [weight_success(dist, dt, alpha, delta, w1, w2, w3)
  *                      for (dist, dt, w1, w2, w3) in parents]             # <<<<<<<<<<<<<<
@@ -2296,15 +2243,15 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
  */
     if (unlikely(__pyx_v_parents == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable");
-      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
     __pyx_t_4 = __pyx_v_parents; __Pyx_INCREF(__pyx_t_4); __pyx_t_13 = 0;
     for (;;) {
       if (__pyx_t_13 >= PyList_GET_SIZE(__pyx_t_4)) break;
       #if CYTHON_COMPILING_IN_CPYTHON
-      __pyx_t_6 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_13); __Pyx_INCREF(__pyx_t_6); __pyx_t_13++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_13); __Pyx_INCREF(__pyx_t_6); __pyx_t_13++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #else
-      __pyx_t_6 = PySequence_ITEM(__pyx_t_4, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = PySequence_ITEM(__pyx_t_4, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #endif
       if ((likely(PyTuple_CheckExact(__pyx_t_6))) || (PyList_CheckExact(__pyx_t_6))) {
         PyObject* sequence = __pyx_t_6;
@@ -2316,7 +2263,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
         if (unlikely(size != 5)) {
           if (size > 5) __Pyx_RaiseTooManyValuesError(5);
           else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);
-          {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+          {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         }
         #if CYTHON_COMPILING_IN_CPYTHON
         if (likely(PyTuple_CheckExact(sequence))) {
@@ -2342,7 +2289,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
           Py_ssize_t i;
           PyObject** temps[5] = {&__pyx_t_18,&__pyx_t_17,&__pyx_t_16,&__pyx_t_15,&__pyx_t_14};
           for (i=0; i < 5; i++) {
-            PyObject* item = PySequence_ITEM(sequence, i); if (unlikely(!item)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+            PyObject* item = PySequence_ITEM(sequence, i); if (unlikely(!item)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
             __Pyx_GOTREF(item);
             *(temps[i]) = item;
           }
@@ -2352,7 +2299,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
       } else {
         Py_ssize_t index = -1;
         PyObject** temps[5] = {&__pyx_t_18,&__pyx_t_17,&__pyx_t_16,&__pyx_t_15,&__pyx_t_14};
-        __pyx_t_19 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        __pyx_t_19 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __Pyx_GOTREF(__pyx_t_19);
         __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
         __pyx_t_20 = Py_TYPE(__pyx_t_19)->tp_iternext;
@@ -2361,7 +2308,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
           __Pyx_GOTREF(item);
           *(temps[index]) = item;
         }
-        if (__Pyx_IternextUnpackEndCheck(__pyx_t_20(__pyx_t_19), 5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        if (__Pyx_IternextUnpackEndCheck(__pyx_t_20(__pyx_t_19), 5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __pyx_t_20 = NULL;
         __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0;
         goto __pyx_L12_unpacking_done;
@@ -2369,12 +2316,12 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
         __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0;
         __pyx_t_20 = NULL;
         if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);
-        {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __pyx_L12_unpacking_done:;
       }
-      __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_t_18); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_t_18); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_18); __pyx_t_18 = 0;
-      __pyx_t_25 = __Pyx_PyInt_As_int(__pyx_t_17); if (unlikely((__pyx_t_25 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_25 = __Pyx_PyInt_As_int(__pyx_t_17); if (unlikely((__pyx_t_25 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_17); __pyx_t_17 = 0;
       __pyx_v_dist = __pyx_t_12;
       __pyx_v_dt = __pyx_t_25;
@@ -2385,22 +2332,22 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
       __Pyx_XDECREF_SET(__pyx_v_w3, __pyx_t_14);
       __pyx_t_14 = 0;
 
-      /* "ml2.pyx":59
+      /* "ml2.pyx":58
  *                     for (dist, dt, w1, w2, w3) in parents]
  *         probs_fail[i] = sum(failures)
  *         successes = [weight_success(dist, dt, alpha, delta, w1, w2, w3)             # <<<<<<<<<<<<<<
  *                      for (dist, dt, w1, w2, w3) in parents]
  *         # find parent that maximizes log(p) - log(\tilde{p})
  */
-      __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_v_w1); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_23 = __pyx_PyFloat_AsDouble(__pyx_v_w2); if (unlikely((__pyx_t_23 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_22 = __pyx_PyFloat_AsDouble(__pyx_v_w3); if (unlikely((__pyx_t_22 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_6 = PyFloat_FromDouble(__pyx_f_3ml2_weight_success(__pyx_v_dist, __pyx_v_dt, __pyx_v_alpha, __pyx_v_delta, __pyx_t_24, __pyx_t_23, __pyx_t_22)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_v_w1); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_23 = __pyx_PyFloat_AsDouble(__pyx_v_w2); if (unlikely((__pyx_t_23 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_22 = __pyx_PyFloat_AsDouble(__pyx_v_w3); if (unlikely((__pyx_t_22 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = PyFloat_FromDouble(__pyx_f_3ml2_weight_success(__pyx_v_dist, __pyx_v_dt, __pyx_v_alpha, __pyx_v_delta, __pyx_t_24, __pyx_t_23, __pyx_t_22)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_6);
-      if (unlikely(__Pyx_ListComp_Append(__pyx_t_5, (PyObject*)__pyx_t_6))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      if (unlikely(__Pyx_ListComp_Append(__pyx_t_5, (PyObject*)__pyx_t_6))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
 
-      /* "ml2.pyx":60
+      /* "ml2.pyx":59
  *         probs_fail[i] = sum(failures)
  *         successes = [weight_success(dist, dt, alpha, delta, w1, w2, w3)
  *                      for (dist, dt, w1, w2, w3) in parents]             # <<<<<<<<<<<<<<
@@ -2414,24 +2361,24 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
     __Pyx_GIVEREF(__pyx_t_5);
     __pyx_t_5 = 0;
 
-    /* "ml2.pyx":62
+    /* "ml2.pyx":61
  *                      for (dist, dt, w1, w2, w3) in parents]
  *         # find parent that maximizes log(p) - log(\tilde{p})
  *         probs[i] = max(s - failures[l] for l, s in enumerate(successes))             # <<<<<<<<<<<<<<
  * 
  *     # loop through non-victims
  */
-    __pyx_t_5 = __pyx_pf_3ml2_3ml2_genexpr(((PyObject*)__pyx_cur_scope)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_5 = __pyx_pf_3ml2_3ml2_genexpr(((PyObject*)__pyx_cur_scope)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
-    __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __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 = __Pyx_PyObject_Call(__pyx_builtin_max, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_5 = __Pyx_PyObject_Call(__pyx_builtin_max, __pyx_t_4, NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-    __pyx_t_22 = __pyx_PyFloat_AsDouble(__pyx_t_5); if (unlikely((__pyx_t_22 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_22 = __pyx_PyFloat_AsDouble(__pyx_t_5); if (unlikely((__pyx_t_22 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     __pyx_t_25 = __pyx_v_i;
     if (__pyx_t_25 < 0) __pyx_t_25 += __pyx_pybuffernd_probs.diminfo[0].shape;
@@ -2439,7 +2386,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
   }
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "ml2.pyx":65
+  /* "ml2.pyx":64
  * 
  *     # loop through non-victims
  *     for i, parents in enumerate(non_victims.itervalues()):             # <<<<<<<<<<<<<<
@@ -2450,9 +2397,9 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
   __pyx_t_1 = 0;
   if (unlikely(__pyx_v_non_victims == Py_None)) {
     PyErr_Format(PyExc_AttributeError, "'NoneType' object has no attribute '%s'", "itervalues");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
-  __pyx_t_5 = __Pyx_dict_iterator(__pyx_v_non_victims, 1, __pyx_n_s_itervalues, (&__pyx_t_2), (&__pyx_t_11)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_5 = __Pyx_dict_iterator(__pyx_v_non_victims, 1, __pyx_n_s_itervalues, (&__pyx_t_2), (&__pyx_t_11)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_XDECREF(__pyx_t_3);
   __pyx_t_3 = __pyx_t_5;
@@ -2460,25 +2407,25 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
   while (1) {
     __pyx_t_12 = __Pyx_dict_iter_next(__pyx_t_3, __pyx_t_2, &__pyx_t_1, NULL, &__pyx_t_5, NULL, __pyx_t_11);
     if (unlikely(__pyx_t_12 == 0)) break;
-    if (unlikely(__pyx_t_12 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (unlikely(__pyx_t_12 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
-    if (!(likely(PyList_CheckExact(__pyx_t_5))||((__pyx_t_5) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "list", Py_TYPE(__pyx_t_5)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (!(likely(PyList_CheckExact(__pyx_t_5))||((__pyx_t_5) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "list", Py_TYPE(__pyx_t_5)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_XDECREF_SET(__pyx_v_parents, ((PyObject*)__pyx_t_5));
     __pyx_t_5 = 0;
     __pyx_v_i = __pyx_t_10;
     __pyx_t_10 = (__pyx_t_10 + 1);
 
-    /* "ml2.pyx":68
+    /* "ml2.pyx":67
  *         # for each non victim node, compute the probability that all its
  *         # parents fail to infect it
  *         failures = [weight_failure(dist, dt, alpha, delta, w1, w2, w3)             # <<<<<<<<<<<<<<
  *                     for (dist, dt, w1, w2, w3) in parents]
  *         probs_nv[i] = sum(failures)
  */
-    __pyx_t_5 = PyList_New(0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_5 = PyList_New(0); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
 
-    /* "ml2.pyx":69
+    /* "ml2.pyx":68
  *         # parents fail to infect it
  *         failures = [weight_failure(dist, dt, alpha, delta, w1, w2, w3)
  *                     for (dist, dt, w1, w2, w3) in parents]             # <<<<<<<<<<<<<<
@@ -2487,15 +2434,15 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
  */
     if (unlikely(__pyx_v_parents == Py_None)) {
       PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable");
-      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
     __pyx_t_4 = __pyx_v_parents; __Pyx_INCREF(__pyx_t_4); __pyx_t_13 = 0;
     for (;;) {
       if (__pyx_t_13 >= PyList_GET_SIZE(__pyx_t_4)) break;
       #if CYTHON_COMPILING_IN_CPYTHON
-      __pyx_t_6 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_13); __Pyx_INCREF(__pyx_t_6); __pyx_t_13++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = PyList_GET_ITEM(__pyx_t_4, __pyx_t_13); __Pyx_INCREF(__pyx_t_6); __pyx_t_13++; if (unlikely(0 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #else
-      __pyx_t_6 = PySequence_ITEM(__pyx_t_4, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = PySequence_ITEM(__pyx_t_4, __pyx_t_13); __pyx_t_13++; if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       #endif
       if ((likely(PyTuple_CheckExact(__pyx_t_6))) || (PyList_CheckExact(__pyx_t_6))) {
         PyObject* sequence = __pyx_t_6;
@@ -2507,7 +2454,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
         if (unlikely(size != 5)) {
           if (size > 5) __Pyx_RaiseTooManyValuesError(5);
           else if (size >= 0) __Pyx_RaiseNeedMoreValuesError(size);
-          {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+          {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         }
         #if CYTHON_COMPILING_IN_CPYTHON
         if (likely(PyTuple_CheckExact(sequence))) {
@@ -2533,7 +2480,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
           Py_ssize_t i;
           PyObject** temps[5] = {&__pyx_t_14,&__pyx_t_15,&__pyx_t_16,&__pyx_t_17,&__pyx_t_18};
           for (i=0; i < 5; i++) {
-            PyObject* item = PySequence_ITEM(sequence, i); if (unlikely(!item)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+            PyObject* item = PySequence_ITEM(sequence, i); if (unlikely(!item)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
             __Pyx_GOTREF(item);
             *(temps[i]) = item;
           }
@@ -2543,7 +2490,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
       } else {
         Py_ssize_t index = -1;
         PyObject** temps[5] = {&__pyx_t_14,&__pyx_t_15,&__pyx_t_16,&__pyx_t_17,&__pyx_t_18};
-        __pyx_t_19 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        __pyx_t_19 = PyObject_GetIter(__pyx_t_6); if (unlikely(!__pyx_t_19)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __Pyx_GOTREF(__pyx_t_19);
         __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
         __pyx_t_20 = Py_TYPE(__pyx_t_19)->tp_iternext;
@@ -2552,7 +2499,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
           __Pyx_GOTREF(item);
           *(temps[index]) = item;
         }
-        if (__Pyx_IternextUnpackEndCheck(__pyx_t_20(__pyx_t_19), 5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        if (__Pyx_IternextUnpackEndCheck(__pyx_t_20(__pyx_t_19), 5) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __pyx_t_20 = NULL;
         __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0;
         goto __pyx_L18_unpacking_done;
@@ -2560,12 +2507,12 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
         __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0;
         __pyx_t_20 = NULL;
         if (__Pyx_IterFinish() == 0) __Pyx_RaiseNeedMoreValuesError(index);
-        {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
         __pyx_L18_unpacking_done:;
       }
-      __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_t_14); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_12 = __Pyx_PyInt_As_int(__pyx_t_14); if (unlikely((__pyx_t_12 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0;
-      __pyx_t_26 = __Pyx_PyInt_As_int(__pyx_t_15); if (unlikely((__pyx_t_26 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_26 = __Pyx_PyInt_As_int(__pyx_t_15); if (unlikely((__pyx_t_26 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0;
       __pyx_v_dist = __pyx_t_12;
       __pyx_v_dt = __pyx_t_26;
@@ -2576,22 +2523,22 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
       __Pyx_XDECREF_SET(__pyx_v_w3, __pyx_t_18);
       __pyx_t_18 = 0;
 
-      /* "ml2.pyx":68
+      /* "ml2.pyx":67
  *         # for each non victim node, compute the probability that all its
  *         # parents fail to infect it
  *         failures = [weight_failure(dist, dt, alpha, delta, w1, w2, w3)             # <<<<<<<<<<<<<<
  *                     for (dist, dt, w1, w2, w3) in parents]
  *         probs_nv[i] = sum(failures)
  */
-      __pyx_t_22 = __pyx_PyFloat_AsDouble(__pyx_v_w1); if (unlikely((__pyx_t_22 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_23 = __pyx_PyFloat_AsDouble(__pyx_v_w2); if (unlikely((__pyx_t_23 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_v_w3); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-      __pyx_t_6 = PyFloat_FromDouble(__pyx_f_3ml2_weight_failure(__pyx_v_dist, __pyx_v_dt, __pyx_v_alpha, __pyx_v_delta, __pyx_t_22, __pyx_t_23, __pyx_t_24)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_22 = __pyx_PyFloat_AsDouble(__pyx_v_w1); if (unlikely((__pyx_t_22 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_23 = __pyx_PyFloat_AsDouble(__pyx_v_w2); if (unlikely((__pyx_t_23 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_v_w3); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __pyx_t_6 = PyFloat_FromDouble(__pyx_f_3ml2_weight_failure(__pyx_v_dist, __pyx_v_dt, __pyx_v_alpha, __pyx_v_delta, __pyx_t_22, __pyx_t_23, __pyx_t_24)); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_6);
-      if (unlikely(__Pyx_ListComp_Append(__pyx_t_5, (PyObject*)__pyx_t_6))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      if (unlikely(__Pyx_ListComp_Append(__pyx_t_5, (PyObject*)__pyx_t_6))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
 
-      /* "ml2.pyx":69
+      /* "ml2.pyx":68
  *         # parents fail to infect it
  *         failures = [weight_failure(dist, dt, alpha, delta, w1, w2, w3)
  *                     for (dist, dt, w1, w2, w3) in parents]             # <<<<<<<<<<<<<<
@@ -2605,22 +2552,22 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
     __Pyx_GIVEREF(__pyx_t_5);
     __pyx_t_5 = 0;
 
-    /* "ml2.pyx":70
+    /* "ml2.pyx":69
  *         failures = [weight_failure(dist, dt, alpha, delta, w1, w2, w3)
  *                     for (dist, dt, w1, w2, w3) in parents]
  *         probs_nv[i] = sum(failures)             # <<<<<<<<<<<<<<
  * 
  *     # print successes
  */
-    __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_INCREF(__pyx_cur_scope->__pyx_v_failures);
     PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_cur_scope->__pyx_v_failures);
     __Pyx_GIVEREF(__pyx_cur_scope->__pyx_v_failures);
-    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_sum, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_Call(__pyx_builtin_sum, __pyx_t_5, NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-    __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_t_4); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_t_4); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
     __pyx_t_26 = __pyx_v_i;
     if (__pyx_t_26 < 0) __pyx_t_26 += __pyx_pybuffernd_probs_nv.diminfo[0].shape;
@@ -2628,14 +2575,14 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
   }
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
-  /* "ml2.pyx":80
+  /* "ml2.pyx":79
  *     # cdef:
  *     #     np.ndarray[DTYPE_t] cums = probs.cumsum()
  *     ll =  probs_fail.sum() # add probability that all edges to victims fail             # <<<<<<<<<<<<<<
  *     ll += probs_nv.sum() # add probability that all edges to non_victims fail
  *     ll += probs.sum() # add probability for realized edges and subtract probability these edges fail
  */
-  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_probs_fail), __pyx_n_s_sum); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_probs_fail), __pyx_n_s_sum); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
   __pyx_t_5 = NULL;
   if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_4))) {
@@ -2648,27 +2595,27 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
     }
   }
   if (__pyx_t_5) {
-    __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   } else {
-    __pyx_t_3 = __Pyx_PyObject_CallNoArg(__pyx_t_4); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_3 = __Pyx_PyObject_CallNoArg(__pyx_t_4); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_t_3); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_t_3); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_v_ll = __pyx_t_24;
 
-  /* "ml2.pyx":81
+  /* "ml2.pyx":80
  *     #     np.ndarray[DTYPE_t] cums = probs.cumsum()
  *     ll =  probs_fail.sum() # add probability that all edges to victims fail
  *     ll += probs_nv.sum() # add probability that all edges to non_victims fail             # <<<<<<<<<<<<<<
  *     ll += probs.sum() # add probability for realized edges and subtract probability these edges fail
  * 
  */
-  __pyx_t_3 = PyFloat_FromDouble(__pyx_v_ll); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = PyFloat_FromDouble(__pyx_v_ll); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_probs_nv), __pyx_n_s_sum); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_5 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_probs_nv), __pyx_n_s_sum); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_5);
   __pyx_t_6 = NULL;
   if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_5))) {
@@ -2681,31 +2628,31 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
     }
   }
   if (__pyx_t_6) {
-    __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_6); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_6); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   } else {
-    __pyx_t_4 = __Pyx_PyObject_CallNoArg(__pyx_t_5); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_CallNoArg(__pyx_t_5); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
-  __pyx_t_5 = PyNumber_InPlaceAdd(__pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_5 = PyNumber_InPlaceAdd(__pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_t_5); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_t_5); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __pyx_v_ll = __pyx_t_24;
 
-  /* "ml2.pyx":82
+  /* "ml2.pyx":81
  *     ll =  probs_fail.sum() # add probability that all edges to victims fail
  *     ll += probs_nv.sum() # add probability that all edges to non_victims fail
  *     ll += probs.sum() # add probability for realized edges and subtract probability these edges fail             # <<<<<<<<<<<<<<
  * 
  *     roots = n_roots
  */
-  __pyx_t_5 = PyFloat_FromDouble(__pyx_v_ll); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_5 = PyFloat_FromDouble(__pyx_v_ll); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_5);
-  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_probs), __pyx_n_s_sum); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_probs), __pyx_n_s_sum); 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_6 = NULL;
   if (CYTHON_COMPILING_IN_CPYTHON && likely(PyMethod_Check(__pyx_t_3))) {
@@ -2718,22 +2665,22 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
     }
   }
   if (__pyx_t_6) {
-    __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_6); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_6); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
   } else {
-    __pyx_t_4 = __Pyx_PyObject_CallNoArg(__pyx_t_3); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = __Pyx_PyObject_CallNoArg(__pyx_t_3); 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);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
-  __pyx_t_3 = PyNumber_InPlaceAdd(__pyx_t_5, __pyx_t_4); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = PyNumber_InPlaceAdd(__pyx_t_5, __pyx_t_4); 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(__pyx_t_5); __pyx_t_5 = 0;
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
-  __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_t_3); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_24 = __pyx_PyFloat_AsDouble(__pyx_t_3); if (unlikely((__pyx_t_24 == (npy_double)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   __pyx_v_ll = __pyx_t_24;
 
-  /* "ml2.pyx":84
+  /* "ml2.pyx":83
  *     ll += probs.sum() # add probability for realized edges and subtract probability these edges fail
  * 
  *     roots = n_roots             # <<<<<<<<<<<<<<
@@ -2742,7 +2689,7 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
  */
   __pyx_v_roots = __pyx_v_n_roots;
 
-  /* "ml2.pyx":85
+  /* "ml2.pyx":84
  * 
  *     roots = n_roots
  *     beta = 0             # <<<<<<<<<<<<<<
@@ -2751,19 +2698,19 @@ static PyObject *__pyx_pf_3ml2_ml2(CYTHON_UNUSED PyObject *__pyx_self, PyObject
  */
   __pyx_v_beta = 0.0;
 
-  /* "ml2.pyx":87
+  /* "ml2.pyx":86
  *     beta = 0
  *     # print n_nodes, n_roots, n_victims, max_i, roots
  *     return (beta, roots, ll)             # <<<<<<<<<<<<<<
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_3 = PyFloat_FromDouble(__pyx_v_beta); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = PyFloat_FromDouble(__pyx_v_beta); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
-  __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v_roots); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = __Pyx_PyInt_From_int(__pyx_v_roots); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
-  __pyx_t_5 = PyFloat_FromDouble(__pyx_v_ll); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_5 = PyFloat_FromDouble(__pyx_v_ll); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_5);
-  __pyx_t_6 = PyTuple_New(3); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_6 = PyTuple_New(3); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_6);
   PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_3);
@@ -5082,7 +5029,6 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {&__pyx_kp_u_Format_string_allocated_too_shor_2, __pyx_k_Format_string_allocated_too_shor_2, sizeof(__pyx_k_Format_string_allocated_too_shor_2), 0, 1, 0, 0},
   {&__pyx_kp_u_Non_native_byte_order_not_suppor, __pyx_k_Non_native_byte_order_not_suppor, sizeof(__pyx_k_Non_native_byte_order_not_suppor), 0, 1, 0, 0},
   {&__pyx_n_s_RuntimeError, __pyx_k_RuntimeError, sizeof(__pyx_k_RuntimeError), 0, 0, 1, 1},
-  {&__pyx_kp_s_UNDERFLOW_ERROR, __pyx_k_UNDERFLOW_ERROR, sizeof(__pyx_k_UNDERFLOW_ERROR), 0, 0, 1, 0},
   {&__pyx_kp_s_Users_ben_Documents_Cascade_Pro, __pyx_k_Users_ben_Documents_Cascade_Pro, sizeof(__pyx_k_Users_ben_Documents_Cascade_Pro), 0, 0, 1, 0},
   {&__pyx_n_s_ValueError, __pyx_k_ValueError, sizeof(__pyx_k_ValueError), 0, 0, 1, 1},
   {&__pyx_n_s_age, __pyx_k_age, sizeof(__pyx_k_age), 0, 0, 1, 1},
@@ -5094,10 +5040,8 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {&__pyx_n_s_dist, __pyx_k_dist, sizeof(__pyx_k_dist), 0, 0, 1, 1},
   {&__pyx_n_s_dt, __pyx_k_dt, sizeof(__pyx_k_dt), 0, 0, 1, 1},
   {&__pyx_n_s_dtype, __pyx_k_dtype, sizeof(__pyx_k_dtype), 0, 0, 1, 1},
-  {&__pyx_n_s_end, __pyx_k_end, sizeof(__pyx_k_end), 0, 0, 1, 1},
   {&__pyx_n_s_enumerate, __pyx_k_enumerate, sizeof(__pyx_k_enumerate), 0, 0, 1, 1},
   {&__pyx_n_s_failures, __pyx_k_failures, sizeof(__pyx_k_failures), 0, 0, 1, 1},
-  {&__pyx_n_s_file, __pyx_k_file, sizeof(__pyx_k_file), 0, 0, 1, 1},
   {&__pyx_n_s_float64, __pyx_k_float64, sizeof(__pyx_k_float64), 0, 0, 1, 1},
   {&__pyx_n_s_genexpr, __pyx_k_genexpr, sizeof(__pyx_k_genexpr), 0, 0, 1, 1},
   {&__pyx_n_s_i, __pyx_k_i, sizeof(__pyx_k_i), 0, 0, 1, 1},
@@ -5109,7 +5053,6 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {&__pyx_n_s_max, __pyx_k_max, sizeof(__pyx_k_max), 0, 0, 1, 1},
   {&__pyx_n_s_ml2, __pyx_k_ml2, sizeof(__pyx_k_ml2), 0, 0, 1, 1},
   {&__pyx_n_s_ml2_locals_genexpr, __pyx_k_ml2_locals_genexpr, sizeof(__pyx_k_ml2_locals_genexpr), 0, 0, 1, 1},
-  {&__pyx_n_s_n_nodes, __pyx_k_n_nodes, sizeof(__pyx_k_n_nodes), 0, 0, 1, 1},
   {&__pyx_n_s_n_roots, __pyx_k_n_roots, sizeof(__pyx_k_n_roots), 0, 0, 1, 1},
   {&__pyx_n_s_n_victims, __pyx_k_n_victims, sizeof(__pyx_k_n_victims), 0, 0, 1, 1},
   {&__pyx_kp_u_ndarray_is_not_C_contiguous, __pyx_k_ndarray_is_not_C_contiguous, sizeof(__pyx_k_ndarray_is_not_C_contiguous), 0, 1, 0, 0},
@@ -5118,7 +5061,6 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {&__pyx_n_s_np, __pyx_k_np, sizeof(__pyx_k_np), 0, 0, 1, 1},
   {&__pyx_n_s_numpy, __pyx_k_numpy, sizeof(__pyx_k_numpy), 0, 0, 1, 1},
   {&__pyx_n_s_parents, __pyx_k_parents, sizeof(__pyx_k_parents), 0, 0, 1, 1},
-  {&__pyx_n_s_print, __pyx_k_print, sizeof(__pyx_k_print), 0, 0, 1, 1},
   {&__pyx_n_s_probs, __pyx_k_probs, sizeof(__pyx_k_probs), 0, 0, 1, 1},
   {&__pyx_n_s_probs_fail, __pyx_k_probs_fail, sizeof(__pyx_k_probs_fail), 0, 0, 1, 1},
   {&__pyx_n_s_probs_nv, __pyx_k_probs_nv, sizeof(__pyx_k_probs_nv), 0, 0, 1, 1},
@@ -5140,9 +5082,9 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {0, 0, 0, 0, 0, 0, 0}
 };
 static int __Pyx_InitCachedBuiltins(void) {
-  __pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_builtin_sum = __Pyx_GetBuiltinName(__pyx_n_s_sum); if (!__pyx_builtin_sum) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_builtin_max = __Pyx_GetBuiltinName(__pyx_n_s_max); if (!__pyx_builtin_max) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_enumerate = __Pyx_GetBuiltinName(__pyx_n_s_enumerate); if (!__pyx_builtin_enumerate) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_sum = __Pyx_GetBuiltinName(__pyx_n_s_sum); if (!__pyx_builtin_sum) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_max = __Pyx_GetBuiltinName(__pyx_n_s_max); if (!__pyx_builtin_max) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_builtin_ValueError = __Pyx_GetBuiltinName(__pyx_n_s_ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 218; __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 = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_builtin_RuntimeError = __Pyx_GetBuiltinName(__pyx_n_s_RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 802; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -5228,10 +5170,10 @@ static int __Pyx_InitCachedConstants(void) {
  *        DTYPE_t alpha, DTYPE_t delta):
  *     cdef:
  */
-  __pyx_tuple__7 = PyTuple_Pack(28, __pyx_n_s_root_victims, __pyx_n_s_victims, __pyx_n_s_non_victims, __pyx_n_s_age, __pyx_n_s_alpha, __pyx_n_s_delta, __pyx_n_s_n_roots, __pyx_n_s_n_victims, __pyx_n_s_n_nodes, __pyx_n_s_roots, __pyx_n_s_i, __pyx_n_s_dist, __pyx_n_s_dt, __pyx_n_s_t, __pyx_n_s_l, __pyx_n_s_beta, __pyx_n_s_ll, __pyx_n_s_parents, __pyx_n_s_failures, __pyx_n_s_successes, __pyx_n_s_probs, __pyx_n_s_probs_fail, __pyx_n_s_probs_nv, __pyx_n_s_w1, __pyx_n_s_w2, __pyx_n_s_w3, __pyx_n_s_genexpr, __pyx_n_s_genexpr); if (unlikely(!__pyx_tuple__7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_tuple__7 = PyTuple_Pack(27, __pyx_n_s_root_victims, __pyx_n_s_victims, __pyx_n_s_non_victims, __pyx_n_s_age, __pyx_n_s_alpha, __pyx_n_s_delta, __pyx_n_s_n_roots, __pyx_n_s_n_victims, __pyx_n_s_roots, __pyx_n_s_i, __pyx_n_s_dist, __pyx_n_s_dt, __pyx_n_s_t, __pyx_n_s_l, __pyx_n_s_beta, __pyx_n_s_ll, __pyx_n_s_parents, __pyx_n_s_failures, __pyx_n_s_successes, __pyx_n_s_probs, __pyx_n_s_probs_fail, __pyx_n_s_probs_nv, __pyx_n_s_w1, __pyx_n_s_w2, __pyx_n_s_w3, __pyx_n_s_genexpr, __pyx_n_s_genexpr); if (unlikely(!__pyx_tuple__7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_tuple__7);
   __Pyx_GIVEREF(__pyx_tuple__7);
-  __pyx_codeobj__8 = (PyObject*)__Pyx_PyCode_New(6, 0, 28, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__7, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_Users_ben_Documents_Cascade_Pro, __pyx_n_s_ml2, 38, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_codeobj__8 = (PyObject*)__Pyx_PyCode_New(6, 0, 27, 0, 0, __pyx_empty_bytes, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_tuple__7, __pyx_empty_tuple, __pyx_empty_tuple, __pyx_kp_s_Users_ben_Documents_Cascade_Pro, __pyx_n_s_ml2, 38, __pyx_empty_bytes); if (unlikely(!__pyx_codeobj__8)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_RefNannyFinishContext();
   return 0;
   __pyx_L1_error:;
@@ -5330,7 +5272,7 @@ PyMODINIT_FUNC PyInit_ml2(void)
   if (PyType_Ready(&__pyx_type_3ml2___pyx_scope_struct__ml2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_type_3ml2___pyx_scope_struct__ml2.tp_print = 0;
   __pyx_ptype_3ml2___pyx_scope_struct__ml2 = &__pyx_type_3ml2___pyx_scope_struct__ml2;
-  if (PyType_Ready(&__pyx_type_3ml2___pyx_scope_struct_1_genexpr) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (PyType_Ready(&__pyx_type_3ml2___pyx_scope_struct_1_genexpr) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_type_3ml2___pyx_scope_struct_1_genexpr.tp_print = 0;
   __pyx_ptype_3ml2___pyx_scope_struct_1_genexpr = &__pyx_type_3ml2___pyx_scope_struct_1_genexpr;
   /*--- Type import code ---*/
@@ -5459,64 +5401,6 @@ static PyObject *__Pyx_GetBuiltinName(PyObject *name) {
     return result;
 }
 
-static CYTHON_INLINE void __Pyx_ErrRestore(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->curexc_type;
-    tmp_value = tstate->curexc_value;
-    tmp_tb = tstate->curexc_traceback;
-    tstate->curexc_type = type;
-    tstate->curexc_value = value;
-    tstate->curexc_traceback = tb;
-    Py_XDECREF(tmp_type);
-    Py_XDECREF(tmp_value);
-    Py_XDECREF(tmp_tb);
-#else
-    PyErr_Restore(type, value, tb);
-#endif
-}
-static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb) {
-#if CYTHON_COMPILING_IN_CPYTHON
-    PyThreadState *tstate = PyThreadState_GET();
-    *type = tstate->curexc_type;
-    *value = tstate->curexc_value;
-    *tb = tstate->curexc_traceback;
-    tstate->curexc_type = 0;
-    tstate->curexc_value = 0;
-    tstate->curexc_traceback = 0;
-#else
-    PyErr_Fetch(type, value, tb);
-#endif
-}
-
-static void __Pyx_WriteUnraisable(const char *name, CYTHON_UNUSED int clineno,
-                                  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
-    ctx = PyUnicode_FromString(name);
-    #endif
-    __Pyx_ErrRestore(old_exc, old_val, old_tb);
-    if (!ctx) {
-        PyErr_WriteUnraisable(Py_None);
-    } else {
-        PyErr_WriteUnraisable(ctx);
-        Py_DECREF(ctx);
-    }
-}
-
 static void __Pyx_RaiseArgtupleInvalid(
     const char* func_name,
     int exact,
@@ -6656,6 +6540,37 @@ static CYTHON_INLINE int __Pyx_dict_iter_next(PyObject* iter_obj, Py_ssize_t ori
     return 1;
 }
 
+static CYTHON_INLINE void __Pyx_ErrRestore(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->curexc_type;
+    tmp_value = tstate->curexc_value;
+    tmp_tb = tstate->curexc_traceback;
+    tstate->curexc_type = type;
+    tstate->curexc_value = value;
+    tstate->curexc_traceback = tb;
+    Py_XDECREF(tmp_type);
+    Py_XDECREF(tmp_value);
+    Py_XDECREF(tmp_tb);
+#else
+    PyErr_Restore(type, value, tb);
+#endif
+}
+static CYTHON_INLINE void __Pyx_ErrFetch(PyObject **type, PyObject **value, PyObject **tb) {
+#if CYTHON_COMPILING_IN_CPYTHON
+    PyThreadState *tstate = PyThreadState_GET();
+    *type = tstate->curexc_type;
+    *value = tstate->curexc_value;
+    *tb = tstate->curexc_traceback;
+    tstate->curexc_type = 0;
+    tstate->curexc_value = 0;
+    tstate->curexc_traceback = 0;
+#else
+    PyErr_Fetch(type, value, tb);
+#endif
+}
+
 #if PY_MAJOR_VERSION < 3
 static void __Pyx_Raise(PyObject *type, PyObject *value, PyObject *tb,
                         CYTHON_UNUSED PyObject *cause) {
@@ -7066,147 +6981,6 @@ bad:
     return module;
 }
 
-#if !CYTHON_COMPILING_IN_PYPY && PY_MAJOR_VERSION < 3
-static PyObject *__Pyx_GetStdout(void) {
-    PyObject *f = PySys_GetObject((char *)"stdout");
-    if (!f) {
-        PyErr_SetString(PyExc_RuntimeError, "lost sys.stdout");
-    }
-    return f;
-}
-static int __Pyx_Print(PyObject* f, PyObject *arg_tuple, int newline) {
-    int i;
-    if (!f) {
-        if (!(f = __Pyx_GetStdout()))
-            return -1;
-    }
-    Py_INCREF(f);
-    for (i=0; i < PyTuple_GET_SIZE(arg_tuple); i++) {
-        PyObject* v;
-        if (PyFile_SoftSpace(f, 1)) {
-            if (PyFile_WriteString(" ", f) < 0)
-                goto error;
-        }
-        v = PyTuple_GET_ITEM(arg_tuple, i);
-        if (PyFile_WriteObject(v, f, Py_PRINT_RAW) < 0)
-            goto error;
-        if (PyString_Check(v)) {
-            char *s = PyString_AsString(v);
-            Py_ssize_t len = PyString_Size(v);
-            if (len > 0) {
-                switch (s[len-1]) {
-                    case ' ': break;
-                    case '\f': case '\r': case '\n': case '\t': case '\v':
-                        PyFile_SoftSpace(f, 0);
-                        break;
-                    default:  break;
-                }
-            }
-        }
-    }
-    if (newline) {
-        if (PyFile_WriteString("\n", f) < 0)
-            goto error;
-        PyFile_SoftSpace(f, 0);
-    }
-    Py_DECREF(f);
-    return 0;
-error:
-    Py_DECREF(f);
-    return -1;
-}
-#else
-static int __Pyx_Print(PyObject* stream, PyObject *arg_tuple, int newline) {
-    PyObject* kwargs = 0;
-    PyObject* result = 0;
-    PyObject* end_string;
-    if (unlikely(!__pyx_print)) {
-        __pyx_print = PyObject_GetAttr(__pyx_b, __pyx_n_s_print);
-        if (!__pyx_print)
-            return -1;
-    }
-    if (stream) {
-        kwargs = PyDict_New();
-        if (unlikely(!kwargs))
-            return -1;
-        if (unlikely(PyDict_SetItem(kwargs, __pyx_n_s_file, stream) < 0))
-            goto bad;
-        if (!newline) {
-            end_string = PyUnicode_FromStringAndSize(" ", 1);
-            if (unlikely(!end_string))
-                goto bad;
-            if (PyDict_SetItem(kwargs, __pyx_n_s_end, end_string) < 0) {
-                Py_DECREF(end_string);
-                goto bad;
-            }
-            Py_DECREF(end_string);
-        }
-    } else if (!newline) {
-        if (unlikely(!__pyx_print_kwargs)) {
-            __pyx_print_kwargs = PyDict_New();
-            if (unlikely(!__pyx_print_kwargs))
-                return -1;
-            end_string = PyUnicode_FromStringAndSize(" ", 1);
-            if (unlikely(!end_string))
-                return -1;
-            if (PyDict_SetItem(__pyx_print_kwargs, __pyx_n_s_end, end_string) < 0) {
-                Py_DECREF(end_string);
-                return -1;
-            }
-            Py_DECREF(end_string);
-        }
-        kwargs = __pyx_print_kwargs;
-    }
-    result = PyObject_Call(__pyx_print, arg_tuple, kwargs);
-    if (unlikely(kwargs) && (kwargs != __pyx_print_kwargs))
-        Py_DECREF(kwargs);
-    if (!result)
-        return -1;
-    Py_DECREF(result);
-    return 0;
-bad:
-    if (kwargs != __pyx_print_kwargs)
-        Py_XDECREF(kwargs);
-    return -1;
-}
-#endif
-
-#if !CYTHON_COMPILING_IN_PYPY && PY_MAJOR_VERSION < 3
-static int __Pyx_PrintOne(PyObject* f, PyObject *o) {
-    if (!f) {
-        if (!(f = __Pyx_GetStdout()))
-            return -1;
-    }
-    Py_INCREF(f);
-    if (PyFile_SoftSpace(f, 0)) {
-        if (PyFile_WriteString(" ", f) < 0)
-            goto error;
-    }
-    if (PyFile_WriteObject(o, f, Py_PRINT_RAW) < 0)
-        goto error;
-    if (PyFile_WriteString("\n", f) < 0)
-        goto error;
-    Py_DECREF(f);
-    return 0;
-error:
-    Py_DECREF(f);
-    return -1;
-    /* the line below is just to avoid C compiler
-     * warnings about unused functions */
-    return __Pyx_Print(f, NULL, 0);
-}
-#else
-static int __Pyx_PrintOne(PyObject* stream, PyObject *o) {
-    int res;
-    PyObject* arg_tuple = PyTuple_Pack(1, o);
-    if (unlikely(!arg_tuple))
-        return -1;
-    res = __Pyx_Print(stream, arg_tuple, 1);
-    Py_DECREF(arg_tuple);
-    return res;
-}
-#endif
-
 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;
diff --git a/experiments/ml2.pyx b/experiments/ml2.pyx
index 9edc7e6..8974106 100644
--- a/experiments/ml2.pyx
+++ b/experiments/ml2.pyx
@@ -13,13 +13,13 @@ cdef DTYPE_t weight_success(int dist, int dt, DTYPE_t alpha, DTYPE_t delta,
                             DTYPE_t w1, DTYPE_t w2, DTYPE_t w3):
     """weight for successful infection, exponential time model"""
     cdef DTYPE_t structural, temporal, result
-    structural = delta ** dist
+    structural = dist * log(delta)
     # structural = plogis(w1,delta) * plogis(w2,delta) * plogis(w3,delta)
-    temporal = exp(-alpha*dt) * (exp(alpha)-1.)
+    temporal = log(exp(alpha)-1.) - alpha*dt
     # temporal = 1 - exp(-alpha*dt)
-    if exp(-alpha*dt)==0.: print 'UNDERFLOW ERROR'
+    # if exp(-alpha*dt)==0.: print 'UNDERFLOW ERROR'
     # temporal = 1. / (1. + (dt - 1.)/alpha)**0.01 - 1. / (1. + dt/alpha)**0.01
-    result = log(structural * temporal)
+    result = structural + temporal
     # print 'st', structural, temporal
     return result
 
@@ -59,6 +59,7 @@ def ml2(dict root_victims, dict victims, dict non_victims, DTYPE_t age,
                      for (dist, dt, w1, w2, w3) in parents]
         # find parent that maximizes log(p) - log(\tilde{p})
         probs[i] = max(s - failures[l] for l, s in enumerate(successes)) 
+        probs_data[i] = 
 
     # loop through non-victims
     for i, parents in enumerate(non_victims.itervalues()):
diff --git a/experiments/ml2.so b/experiments/ml2.so
index b8dc4b6..af3b3f9 100755
--- a/experiments/ml2.so
+++ b/experiments/ml2.so
diff --git a/experiments/out.log b/experiments/out.log
index faa96dd..3af5280 100644
--- a/experiments/out.log
+++ b/experiments/out.log
@@ -1,14 +1,400 @@
-10.0	0.0001	0.075	11252	-39996.1691938
-10.0	0.000316227766017	0.075	11252	-40000.9511756
-13.0	0.0001	0.075	11252	-39996.1684173
-13.0	0.000316227766017	0.075	11252	-40000.9503994
-16.0	0.0001	0.075	11252	-39996.1683787
-16.0	0.000316227766017	0.075	11252	-40000.9503608
-19.0	0.0001	0.075	11252	-39996.1683768
-19.0	0.000316227766017	0.075	11252	-40000.9503588
-22.0	0.0001	0.075	11252	-39996.1683767
-22.0	0.000316227766017	0.075	11252	-40000.9503587
-25.0	0.0001	0.075	11252	-39996.1683767
-25.0	0.000316227766017	0.075	11252	-40000.9503587
-28.0	0.0001	0.075	11252	-39996.1683767
-28.0	0.000316227766017	0.075	11252	-40000.9503587
+1e-05	1e-05	0.0	6465	-110362.184182
+1e-05	1.62377673919e-05	0.0	6465	-108039.248381
+1e-05	2.63665089873e-05	0.0	6465	-105716.31819
+1e-05	4.28133239872e-05	0.0	6465	-103393.397106
+1e-05	6.95192796178e-05	0.0	6465	-101070.490812
+1e-05	0.000112883789168	0.0	6465	-98747.6085326
+1e-05	0.000183298071083	0.0	6465	-96424.7652472
+1e-05	0.000297635144163	0.0	6465	-94101.9852801
+1e-05	0.000483293023857	0.0	6465	-91779.3081281
+1e-05	0.000784759970351	0.0	6465	-89456.797926
+1e-05	0.0012742749857	0.0	6465	-87134.5588164
+1e-05	0.00206913808111	0.0	6465	-84812.7599082
+1e-05	0.00335981828628	0.0	6465	-82491.6758099
+1e-05	0.00545559478117	0.0	6465	-80171.7524586
+1e-05	0.0088586679041	0.0	6465	-77853.714047
+1e-05	0.0143844988829	0.0	6465	-75538.7367408
+1e-05	0.0233572146909	0.0	6465	-73228.7309999
+1e-05	0.0379269019073	0.0	6465	-70926.8006447
+1e-05	0.0615848211066	0.0	6465	-68637.9899678
+1e-05	0.1	0.0	6465	-66370.5013438
+1.62377673919e-05	1e-05	0.0	6465	-108053.153554
+1.62377673919e-05	1.62377673919e-05	0.0	6465	-105730.223283
+1.62377673919e-05	2.63665089873e-05	0.0	6465	-103407.30207
+1.62377673919e-05	4.28133239872e-05	0.0	6465	-101084.395567
+1.62377673919e-05	6.95192796178e-05	0.0	6465	-98761.5129468
+1.62377673919e-05	0.000112883789168	0.0	6465	-96438.6691092
+1.62377673919e-05	0.000183298071083	0.0	6465	-94115.8882454
+1.62377673919e-05	0.000297635144163	0.0	6465	-91793.2096373
+1.62377673919e-05	0.000483293023857	0.0	6465	-89470.6970708
+1.62377673919e-05	0.000784759970351	0.0	6465	-87148.4541217
+1.62377673919e-05	0.0012742749857	0.0	6465	-84826.6489791
+1.62377673919e-05	0.00206913808111	0.0	6465	-82505.5547572
+1.62377673919e-05	0.00335981828628	0.0	6465	-80185.6149661
+1.62377673919e-05	0.00545559478117	0.0	6465	-77867.5498569
+1.62377673919e-05	0.0088586679041	0.0	6465	-75552.5291922
+1.62377673919e-05	0.0143844988829	0.0	6465	-73242.4530262
+1.62377673919e-05	0.0233572146909	0.0	6465	-70940.4082622
+1.62377673919e-05	0.0379269019073	0.0	6465	-68651.4116681
+1.62377673919e-05	0.0615848211066	0.0	6465	-66383.620779
+1.62377673919e-05	0.1	0.0	6465	-64150.3118087
+2.63665089873e-05	1e-05	0.0	6465	-105752.802053
+2.63665089873e-05	1.62377673919e-05	0.0	6465	-103429.880633
+2.63665089873e-05	2.63665089873e-05	0.0	6465	-101106.973793
+2.63665089873e-05	4.28133239872e-05	0.0	6465	-98784.0906272
+2.63665089873e-05	6.95192796178e-05	0.0	6465	-96461.2459027
+2.63665089873e-05	0.000112883789168	0.0	6465	-94138.4635988
+2.63665089873e-05	0.000183298071083	0.0	6465	-91815.7826523
+2.63665089873e-05	0.000297635144163	0.0	6465	-89493.2662888
+2.63665089873e-05	0.000483293023857	0.0	6465	-87171.0171741
+2.63665089873e-05	0.000784759970351	0.0	6465	-84849.2020197
+2.63665089873e-05	0.0012742749857	0.0	6465	-82528.09154
+2.63665089873e-05	0.00206913808111	0.0	6465	-80208.1253483
+2.63665089873e-05	0.00335981828628	0.0	6465	-77890.0173657
+2.63665089873e-05	0.00545559478117	0.0	6465	-75574.9270717
+2.63665089873e-05	0.0088586679041	0.0	6465	-73264.7378108
+2.63665089873e-05	0.0143844988829	0.0	6465	-70962.5093198
+2.63665089873e-05	0.0233572146909	0.0	6465	-68673.214167
+2.63665089873e-05	0.0379269019073	0.0	6465	-66404.9378854
+2.63665089873e-05	0.0615848211066	0.0	6465	-64170.8391605
+2.63665089873e-05	0.1	0.0	6465	-61992.3630827
+4.28133239872e-05	1e-05	0.0	6465	-103466.543194
+4.28133239872e-05	1.62377673919e-05	0.0	6465	-101143.635817
+4.28133239872e-05	2.63665089873e-05	0.0	6465	-98820.7517802
+4.28133239872e-05	4.28133239872e-05	0.0	6465	-96497.9056413
+4.28133239872e-05	6.95192796178e-05	0.0	6465	-94175.1210405
+4.28133239872e-05	0.000112883789168	0.0	6465	-91852.4363644
+4.28133239872e-05	0.000183298071083	0.0	6465	-89529.9139448
+4.28133239872e-05	0.000297635144163	0.0	6465	-87207.6549962
+4.28133239872e-05	0.000483293023857	0.0	6465	-84885.8238734
+4.28133239872e-05	0.000784759970351	0.0	6465	-82564.6874634
+4.28133239872e-05	0.0012742749857	0.0	6465	-80244.679164
+4.28133239872e-05	0.00206913808111	0.0	6465	-77926.5028006
+4.28133239872e-05	0.00335981828628	0.0	6465	-75611.3014519
+4.28133239872e-05	0.00545559478117	0.0	6465	-73300.9318117
+4.28133239872e-05	0.0088586679041	0.0	6465	-70998.4102902
+4.28133239872e-05	0.0143844988829	0.0	6465	-68708.6389647
+4.28133239872e-05	0.0233572146909	0.0	6465	-66439.5885437
+4.28133239872e-05	0.0379269019073	0.0	6465	-64204.2303009
+4.28133239872e-05	0.0615848211066	0.0	6465	-62023.7024579
+4.28133239872e-05	0.1	0.0	6465	-59932.5298418
+6.95192796178e-05	1e-05	0.0	6465	-101203.166824
+6.95192796178e-05	1.62377673919e-05	0.0	6465	-98880.2814125
+6.95192796178e-05	2.63665089873e-05	0.0	6465	-96557.4330421
+6.95192796178e-05	4.28133239872e-05	0.0	6465	-94234.6448181
+6.95192796178e-05	6.95192796178e-05	0.0	6465	-91911.9542585
+6.95192796178e-05	0.000112883789168	0.0	6465	-89589.4222854
+6.95192796178e-05	0.000183298071083	0.0	6465	-87267.1478238
+6.95192796178e-05	0.000297635144163	0.0	6465	-84945.2915107
+6.95192796178e-05	0.000483293023857	0.0	6465	-82624.1141958
+6.95192796178e-05	0.000784759970351	0.0	6465	-80304.0394715
+6.95192796178e-05	0.0012742749857	0.0	6465	-77985.7552376
+6.95192796178e-05	0.00206913808111	0.0	6465	-75670.3787016
+6.95192796178e-05	0.00335981828628	0.0	6465	-73359.7245176
+6.95192796178e-05	0.00545559478117	0.0	6465	-71056.7407528
+6.95192796178e-05	0.0088586679041	0.0	6465	-68766.2182996
+6.95192796178e-05	0.0143844988829	0.0	6465	-66495.946768
+6.95192796178e-05	0.0233572146909	0.0	6465	-64258.6018894
+6.95192796178e-05	0.0379269019073	0.0	6465	-62074.8380664
+6.95192796178e-05	0.0615848211066	0.0	6465	-59978.3840573
+6.95192796178e-05	0.1	0.0	6465	-58024.5155891
+0.000112883789168	1e-05	0.0	6465	-98976.9445079
+0.000112883789168	1.62377673919e-05	0.0	6465	-96654.0926789
+0.000112883789168	2.63665089873e-05	0.0	6465	-94331.2988387
+0.000112883789168	4.28133239872e-05	0.0	6465	-92008.5991597
+0.000112883789168	6.95192796178e-05	0.0	6465	-89686.0523786
+0.000112883789168	0.000112883789168	0.0	6465	-87363.7538719
+0.000112883789168	0.000183298071083	0.0	6465	-85041.8585138
+0.000112883789168	0.000297635144163	0.0	6465	-82720.6177962
+0.000112883789168	0.000483293023857	0.0	6465	-80400.4401136
+0.000112883789168	0.000784759970351	0.0	6465	-78081.9886817
+0.000112883789168	0.0012742749857	0.0	6465	-75766.340609
+0.000112883789168	0.00206913808111	0.0	6465	-73455.2453931
+0.000112883789168	0.00335981828628	0.0	6465	-71151.5451821
+0.000112883789168	0.00545559478117	0.0	6465	-68859.8585653
+0.000112883789168	0.0088586679041	0.0	6465	-66587.69454
+0.000112883789168	0.0143844988829	0.0	6465	-64347.2709863
+0.000112883789168	0.0233572146909	0.0	6465	-62158.4930249
+0.000112883789168	0.0379269019073	0.0	6465	-60053.8572135
+0.000112883789168	0.0615848211066	0.0	6465	-58086.5968349
+0.000112883789168	0.1	0.0	6465	-56344.3994271
+0.000183298071083	1e-05	0.0	6465	-96811.0473943
+0.000183298071083	1.62377673919e-05	0.0	6465	-94488.245088
+0.000183298071083	2.63665089873e-05	0.0	6465	-92165.531662
+0.000183298071083	4.28133239872e-05	0.0	6465	-89842.9625585
+0.000183298071083	6.95192796178e-05	0.0	6465	-87520.6278047
+0.000183298071083	0.000112883789168	0.0	6465	-85198.6735882
+0.000183298071083	0.000183298071083	0.0	6465	-82877.3372942
+0.000183298071083	0.000297635144163	0.0	6465	-80557.004408
+0.000183298071083	0.000483293023857	0.0	6465	-78238.3009361
+0.000183298071083	0.000784759970351	0.0	6465	-75922.2435442
+0.000183298071083	0.0012742749857	0.0	6465	-73610.4835199
+0.000183298071083	0.00206913808111	0.0	6465	-71305.7033722
+0.000183298071083	0.00335981828628	0.0	6465	-69012.2620282
+0.000183298071083	0.00545559478117	0.0	6465	-66737.2456784
+0.000183298071083	0.0088586679041	0.0	6465	-64492.1825539
+0.000183298071083	0.0143844988829	0.0	6465	-62295.8497073
+0.000183298071083	0.0233572146909	0.0	6465	-60178.8900566
+0.000183298071083	0.0379269019073	0.0	6465	-58191.4683438
+0.000183298071083	0.0615848211066	0.0	6465	-56416.1310112
+0.000183298071083	0.1	0.0	6465	-54989.8583043
+0.000297635144163	1e-05	0.0	6465	-94743.0947251
+0.000297635144163	1.62377673919e-05	0.0	6465	-92420.3614548
+0.000297635144163	2.63665089873e-05	0.0	6465	-90097.7601282
+0.000297635144163	4.28133239872e-05	0.0	6465	-87775.3730508
+0.000297635144163	6.95192796178e-05	0.0	6465	-85453.3338707
+0.000297635144163	0.000112883789168	0.0	6465	-83131.8596104
+0.000297635144163	0.000183298071083	0.0	6465	-80811.3026859
+0.000297635144163	0.000297635144163	0.0	6465	-78492.2353949
+0.000297635144163	0.000483293023857	0.0	6465	-76175.58716
+0.000297635144163	0.000784759970351	0.0	6465	-73862.8675227
+0.000297635144163	0.0012742749857	0.0	6465	-71556.5286084
+0.000297635144163	0.00206913808111	0.0	6465	-69260.5546729
+0.000297635144163	0.00335981828628	0.0	6465	-66981.4219931
+0.000297635144163	0.00545559478117	0.0	6465	-64729.6643873
+0.000297635144163	0.0088586679041	0.0	6465	-62522.4334712
+0.000297635144163	0.0143844988829	0.0	6465	-60387.7042821
+0.000297635144163	0.0233572146909	0.0	6465	-58371.2332591
+0.000297635144163	0.0379269019073	0.0	6465	-56548.2031841
+0.000297635144163	0.0615848211066	0.0	6465	-55043.0754756
+0.000297635144163	0.1	0.0	6465	-54064.4449765
+0.000483293023857	1e-05	0.0	6465	-92834.1621806
+0.000483293023857	1.62377673919e-05	0.0	6465	-90511.5172935
+0.000483293023857	2.63665089873e-05	0.0	6465	-88189.0594827
+0.000483293023857	4.28133239872e-05	0.0	6465	-85866.9054454
+0.000483293023857	6.95192796178e-05	0.0	6465	-83545.2446774
+0.000483293023857	0.000112883789168	0.0	6465	-81224.3848925
+0.000483293023857	0.000183298071083	0.0	6465	-78904.8257877
+0.000483293023857	0.000297635144163	0.0	6465	-76587.3788619
+0.000483293023857	0.000483293023857	0.0	6465	-74273.362078
+0.000483293023857	0.000784759970351	0.0	6465	-71964.9162257
+0.000483293023857	0.0012742749857	0.0	6465	-69665.5193476
+0.000483293023857	0.00206913808111	0.0	6465	-67380.8239657
+0.000483293023857	0.00335981828628	0.0	6465	-65120.0216035
+0.000483293023857	0.00545559478117	0.0	6465	-62898.0718415
+0.000483293023857	0.0088586679041	0.0	6465	-60739.3572869
+0.000483293023857	0.0143844988829	0.0	6465	-58683.7129074
+0.000483293023857	0.0233572146909	0.0	6465	-56796.4694588
+0.000483293023857	0.0379269019073	0.0	6465	-55185.4468436
+0.000483293023857	0.0615848211066	0.0	6465	-54030.4323197
+0.000483293023857	0.1	0.0	6465	-53636.3737883
+0.000784759970351	1e-05	0.0	6465	-91183.4112288
+0.000784759970351	1.62377673919e-05	0.0	6465	-88860.8664488
+0.000784759970351	2.63665089873e-05	0.0	6465	-86538.5711911
+0.000784759970351	4.28133239872e-05	0.0	6465	-84216.6811075
+0.000784759970351	6.95192796178e-05	0.0	6465	-81895.4489517
+0.000784759970351	0.000112883789168	0.0	6465	-79575.285164
+0.000784759970351	0.000183298071083	0.0	6465	-77256.8562743
+0.000784759970351	0.000297635144163	0.0	6465	-74941.2447522
+0.000784759970351	0.000483293023857	0.0	6465	-72630.2087468
+0.000784759970351	0.000784759970351	0.0	6465	-70326.604313
+0.000784759970351	0.0012742749857	0.0	6465	-68035.072246
+0.000784759970351	0.00206913808111	0.0	6465	-65763.1566099
+0.000784759970351	0.00335981828628	0.0	6465	-63523.1295978
+0.000784759970351	0.00545559478117	0.0	6465	-61334.9775343
+0.000784759970351	0.0088586679041	0.0	6465	-59231.3101504
+0.000784759970351	0.0143844988829	0.0	6465	-57265.494104
+0.000784759970351	0.0233572146909	0.0	6465	-55525.2956671
+0.000784759970351	0.0379269019073	0.0	6465	-54156.220202
+0.000784759970351	0.0615848211066	0.0	6465	-53402.7104363
+0.000784759970351	0.1	0.0	6465	-53684.5359352
+0.0012742749857	1e-05	0.0	6465	-89951.8532613
+0.0012742749857	1.62377673919e-05	0.0	6465	-87629.405024
+0.0012742749857	2.63665089873e-05	0.0	6465	-85307.2665317
+0.0012742749857	4.28133239872e-05	0.0	6465	-82985.6310047
+0.0012742749857	6.95192796178e-05	0.0	6465	-80664.8122034
+0.0012742749857	0.000112883789168	0.0	6465	-78345.3196419
+0.0012742749857	0.000183298071083	0.0	6465	-76027.9807542
+0.0012742749857	0.000297635144163	0.0	6465	-73714.1393651
+0.0012742749857	0.000483293023857	0.0	6465	-71405.9782223
+0.0012742749857	0.000784759970351	0.0	6465	-69107.0434045
+0.0012742749857	0.0012742749857	0.0	6465	-66823.09766
+0.0012742749857	0.00206913808111	0.0	6465	-64563.5108353
+0.0012742749857	0.00335981828628	0.0	6465	-62343.5303133
+0.0012742749857	0.00545559478117	0.0	6465	-60188.0013474
+0.0012742749857	0.0088586679041	0.0	6465	-58137.4975534
+0.0012742749857	0.0143844988829	0.0	6465	-56258.5148325
+0.0012742749857	0.0233572146909	0.0	6465	-54660.6699847
+0.0012742749857	0.0379269019073	0.0	6465	-53526.3961334
+0.0012742749857	0.0615848211066	0.0	6465	-53164.1211795
+0.0012742749857	0.1	0.0	6465	-54109.0809494
+0.00206913808111	1e-05	0.0	6465	-89400.9502119
+0.00206913808111	1.62377673919e-05	0.0	6465	-87078.5797719
+0.00206913808111	2.63665089873e-05	0.0	6465	-84756.5676065
+0.00206913808111	4.28133239872e-05	0.0	6465	-82435.13721
+0.00206913808111	6.95192796178e-05	0.0	6465	-80114.6515052
+0.00206913808111	0.000112883789168	0.0	6465	-77795.6998451
+0.00206913808111	0.000183298071083	0.0	6465	-75479.2393323
+0.00206913808111	0.000297635144163	0.0	6465	-73166.8244169
+0.00206913808111	0.000483293023857	0.0	6465	-70860.9800471
+0.00206913808111	0.000784759970351	0.0	6465	-68565.8084661
+0.00206913808111	0.0012742749857	0.0	6465	-66287.9768466
+0.00206913808111	0.00206913808111	0.0	6465	-64038.3271527
+0.00206913808111	0.00335981828628	0.0	6465	-61834.5065046
+0.00206913808111	0.00545559478117	0.0	6465	-59705.2815602
+0.00206913808111	0.0088586679041	0.0	6465	-57697.6592514
+0.00206913808111	0.0143844988829	0.0	6465	-55888.7576161
+0.00206913808111	0.0233572146909	0.0	6465	-54405.9151581
+0.00206913808111	0.0379269019073	0.0	6465	-53461.6345252
+0.00206913808111	0.0615848211066	0.0	6465	-53416.780944
+0.00206913808111	0.1	0.0	6465	-54902.1997013
+0.00335981828628	1e-05	0.0	6465	-89955.2884469
+0.00335981828628	1.62377673919e-05	0.0	6465	-87632.9716
+0.00335981828628	2.63665089873e-05	0.0	6465	-85311.0464587
+0.00335981828628	4.28133239872e-05	0.0	6465	-82989.7573729
+0.00335981828628	6.95192796178e-05	0.0	6465	-80669.5011327
+0.00335981828628	0.000112883789168	0.0	6465	-78350.9220915
+0.00335981828628	0.000183298071083	0.0	6465	-76035.0666805
+0.00335981828628	0.000297635144163	0.0	6465	-73723.6344523
+0.00335981828628	0.000483293023857	0.0	6465	-71419.3861082
+0.00335981828628	0.000784759970351	0.0	6465	-69126.8070694
+0.00335981828628	0.0012742749857	0.0	6465	-66853.1876739
+0.00335981828628	0.00206913808111	0.0	6465	-64610.3843285
+0.00335981828628	0.00335981828628	0.0	6465	-62417.6981588
+0.00335981828628	0.00545559478117	0.0	6465	-60306.5995175
+0.00335981828628	0.0088586679041	0.0	6465	-58328.5332854
+0.00335981828628	0.0143844988829	0.0	6465	-56567.951378
+0.00335981828628	0.0233572146909	0.0	6465	-55164.4449978
+0.00335981828628	0.0379269019073	0.0	6465	-54351.3533567
+0.00335981828628	0.0615848211066	0.0	6465	-54526.0087563
+0.00335981828628	0.1	0.0	6465	-56386.130008
+0.00545559478117	1e-05	0.0	6465	-92304.3211169
+0.00545559478117	1.62377673919e-05	0.0	6465	-89982.0374151
+0.00545559478117	2.63665089873e-05	0.0	6465	-87660.1660949
+0.00545559478117	4.28133239872e-05	0.0	6465	-85338.9644043
+0.00545559478117	6.95192796178e-05	0.0	6465	-83018.8500791
+0.00545559478117	0.000112883789168	0.0	6465	-80700.5014889
+0.00545559478117	0.000183298071083	0.0	6465	-78385.0203117
+0.00545559478117	0.000297635144163	0.0	6465	-76074.1958428
+0.00545559478117	0.000483293023857	0.0	6465	-73770.934594
+0.00545559478117	0.000784759970351	0.0	6465	-71479.9589838
+0.00545559478117	0.0012742749857	0.0	6465	-69208.9447978
+0.00545559478117	0.00206913808111	0.0	6465	-66970.3759543
+0.00545559478117	0.00335981828628	0.0	6465	-64784.5768291
+0.00545559478117	0.00545559478117	0.0	6465	-62684.6907341
+0.00545559478117	0.0088586679041	0.0	6465	-60724.9094579
+0.00545559478117	0.0143844988829	0.0	6465	-58994.2265463
+0.00545559478117	0.0233572146909	0.0	6465	-57639.8269897
+0.00545559478117	0.0379269019073	0.0	6465	-56907.9803906
+0.00545559478117	0.0615848211066	0.0	6465	-57218.6955881
+0.00545559478117	0.1	0.0	6465	-59311.4106986
+0.0088586679041	1e-05	0.0	6465	-97567.5652935
+0.0088586679041	1.62377673919e-05	0.0	6465	-95245.3007146
+0.0088586679041	2.63665089873e-05	0.0	6465	-92923.4604461
+0.0088586679041	4.28133239872e-05	0.0	6465	-90602.3091776
+0.0088586679041	6.95192796178e-05	0.0	6465	-88282.2767294
+0.0088586679041	0.000112883789168	0.0	6465	-85964.0610964
+0.0088586679041	0.000183298071083	0.0	6465	-83648.7958317
+0.0088586679041	0.000297635144163	0.0	6465	-81338.3220078
+0.0088586679041	0.000483293023857	0.0	6465	-79035.6302637
+0.0088586679041	0.000784759970351	0.0	6465	-76745.5797594
+0.0088586679041	0.0012742749857	0.0	6465	-74476.0686823
+0.0088586679041	0.00206913808111	0.0	6465	-72239.9430423
+0.0088586679041	0.00335981828628	0.0	6465	-70058.1177148
+0.0088586679041	0.00545559478117	0.0	6465	-67964.7015918
+0.0088586679041	0.0088586679041	0.0	6465	-66015.4722769
+0.0088586679041	0.0143844988829	0.0	6465	-64302.0462702
+0.0088586679041	0.0233572146909	0.0	6465	-62975.9970118
+0.0088586679041	0.0379269019073	0.0	6465	-62291.0741005
+0.0088586679041	0.0615848211066	0.0	6465	-62680.4252415
+0.0088586679041	0.1	0.0	6465	-64907.720988
+0.0143844988829	1e-05	0.0	6465	-107562.854833
+0.0143844988829	1.62377673919e-05	0.0	6465	-105240.600718
+0.0143844988829	2.63665089873e-05	0.0	6465	-102918.77744
+0.0143844988829	4.28133239872e-05	0.0	6465	-100597.653762
+0.0143844988829	6.95192796178e-05	0.0	6465	-98277.6661156
+0.0143844988829	0.000112883789168	0.0	6465	-95959.5232352
+0.0143844988829	0.000183298071083	0.0	6465	-93644.3761153
+0.0143844988829	0.000297635144163	0.0	6465	-91334.0941609
+0.0143844988829	0.000483293023857	0.0	6465	-89031.7140457
+0.0143844988829	0.000784759970351	0.0	6465	-86742.1697573
+0.0143844988829	0.0012742749857	0.0	6465	-84473.481189
+0.0143844988829	0.00206913808111	0.0	6465	-82238.6925127
+0.0143844988829	0.00335981828628	0.0	6465	-80059.0417958
+0.0143844988829	0.00545559478117	0.0	6465	-77969.1664931
+0.0143844988829	0.0088586679041	0.0	6465	-76025.7125065
+0.0143844988829	0.0143844988829	0.0	6465	-74321.7330895
+0.0143844988829	0.0233572146909	0.0	6465	-73011.207075
+0.0143844988829	0.0379269019073	0.0	6465	-72351.9883173
+0.0143844988829	0.0615848211066	0.0	6465	-72784.4460612
+0.0143844988829	0.1	0.0	6465	-75085.6063418
+0.0233572146909	1e-05	0.0	6465	-125241.927804
+0.0233572146909	1.62377673919e-05	0.0	6465	-122919.679054
+0.0233572146909	2.63665089873e-05	0.0	6465	-120597.864488
+0.0233572146909	4.28133239872e-05	0.0	6465	-118276.754956
+0.0233572146909	6.95192796178e-05	0.0	6465	-115956.79028
+0.0233572146909	0.000112883789168	0.0	6465	-113638.684701
+0.0233572146909	0.000183298071083	0.0	6465	-111323.598157
+0.0233572146909	0.000297635144163	0.0	6465	-109013.414577
+0.0233572146909	0.000483293023857	0.0	6465	-106711.19424
+0.0233572146909	0.000784759970351	0.0	6465	-104421.909498
+0.0233572146909	0.0012742749857	0.0	6465	-102153.642646
+0.0233572146909	0.00206913808111	0.0	6465	-99919.5394562
+0.0233572146909	0.00335981828628	0.0	6465	-97741.0037045
+0.0233572146909	0.00545559478117	0.0	6465	-95652.9438521
+0.0233572146909	0.0088586679041	0.0	6465	-93712.4510005
+0.0233572146909	0.0143844988829	0.0	6465	-92013.3150774
+0.0233572146909	0.0233572146909	0.0	6465	-90710.7482874
+0.0233572146909	0.0379269019073	0.0	6465	-90064.7091195
+0.0233572146909	0.0615848211066	0.0	6465	-90519.2706664
+0.0233572146909	0.1	0.0	6465	-92858.3119351
+0.0379269019073	1e-05	0.0	6465	-155397.716037
+0.0379269019073	1.62377673919e-05	0.0	6465	-153075.469965
+0.0379269019073	2.63665089873e-05	0.0	6465	-150753.659749
+0.0379269019073	4.28133239872e-05	0.0	6465	-148432.557279
+0.0379269019073	6.95192796178e-05	0.0	6465	-146112.604072
+0.0379269019073	0.000112883789168	0.0	6465	-143794.517117
+0.0379269019073	0.000183298071083	0.0	6465	-141479.460814
+0.0379269019073	0.000297635144163	0.0	6465	-139169.326349
+0.0379269019073	0.000483293023857	0.0	6465	-136867.185781
+0.0379269019073	0.000784759970351	0.0	6465	-134578.030614
+0.0379269019073	0.0012742749857	0.0	6465	-132309.974293
+0.0379269019073	0.00206913808111	0.0	6465	-130076.2133
+0.0379269019073	0.00335981828628	0.0	6465	-127898.2341
+0.0379269019073	0.00545559478117	0.0	6465	-125811.080347
+0.0379269019073	0.0088586679041	0.0	6465	-123872.065119
+0.0379269019073	0.0143844988829	0.0	6465	-122175.345352
+0.0379269019073	0.0233572146909	0.0	6465	-120876.746915
+0.0379269019073	0.0379269019073	0.0	6465	-120237.273319
+0.0379269019073	0.0615848211066	0.0	6465	-120702.8309
+0.0379269019073	0.1	0.0	6465	-123060.674326
+0.0615848211066	1e-05	0.0	6465	-205812.797279
+0.0615848211066	1.62377673919e-05	0.0	6465	-203490.55268
+0.0615848211066	2.63665089873e-05	0.0	6465	-201168.744856
+0.0615848211066	4.28133239872e-05	0.0	6465	-198847.64627
+0.0615848211066	6.95192796178e-05	0.0	6465	-196527.69937
+0.0615848211066	0.000112883789168	0.0	6465	-194209.622655
+0.0615848211066	0.000183298071083	0.0	6465	-191894.582984
+0.0615848211066	0.000297635144163	0.0	6465	-189584.475527
+0.0615848211066	0.000483293023857	0.0	6465	-187282.378824
+0.0615848211066	0.000784759970351	0.0	6465	-184993.29491
+0.0615848211066	0.0012742749857	0.0	6465	-182725.354351
+0.0615848211066	0.00206913808111	0.0	6465	-180491.781502
+0.0615848211066	0.00335981828628	0.0	6465	-178314.108261
+0.0615848211066	0.00545559478117	0.0	6465	-176227.452517
+0.0615848211066	0.0088586679041	0.0	6465	-174289.24913
+0.0615848211066	0.0143844988829	0.0	6465	-172593.856086
+0.0615848211066	0.0233572146909	0.0	6465	-171297.434622
+0.0615848211066	0.0379269019073	0.0	6465	-170661.557167
+0.0615848211066	0.0615848211066	0.0	6465	-171133.121996
+0.0615848211066	0.1	0.0	6465	-173501.192653
+0.1	1e-05	0.0	6465	-289124.154155
+0.1	1.62377673919e-05	0.0	6465	-286801.910532
+0.1	2.63665089873e-05	0.0	6465	-284480.104291
+0.1	4.28133239872e-05	0.0	6465	-282159.008277
+0.1	6.95192796178e-05	0.0	6465	-279839.065552
+0.1	0.000112883789168	0.0	6465	-277520.995618
+0.1	0.000183298071083	0.0	6465	-275205.966957
+0.1	0.000297635144163	0.0	6465	-272895.877382
+0.1	0.000483293023857	0.0	6465	-270593.80972
+0.1	0.000784759970351	0.0	6465	-268304.772978
+0.1	0.0012742749857	0.0	6465	-266036.909057
+0.1	0.00206913808111	0.0	6465	-263803.460759
+0.1	0.00335981828628	0.0	6465	-261625.990047
+0.1	0.00545559478117	0.0	6465	-259539.663924
+0.1	0.0088586679041	0.0	6465	-257601.997776
+0.1	0.0143844988829	0.0	6465	-255907.482428
+0.1	0.0233572146909	0.0	6465	-254612.500424
+0.1	0.0379269019073	0.0	6465	-253978.998831
+0.1	0.0615848211066	0.0	6465	-254454.526891
+0.1	0.1	0.0	6465	-256829.328482
diff --git a/experiments/process.py b/experiments/process.py
index d01b3fd..330a49e 100644
--- a/experiments/process.py
+++ b/experiments/process.py
@@ -12,13 +12,13 @@ if __name__ == "__main__":
         sys.exit("usage: {0} <file>".format(sys.argv[0]))
     root_victims, victims, non_victims, age = load(open(sys.argv[1]))
     
-    alphas = np.arange(10., 30., 3.)  # parameter of the time component
-    # alphas = np.logspace(0,2,num=10)
-    # deltas = np.arange(0.005, 0.5, 0.005)  # parameter of the structural component
-    deltas = np.logspace(-4,-2,num=5)
+    # alphas = np.arange(5e-4, 3e-3, 1e-4)  # parameter of the time component
+    alphas = np.logspace(-5,-1,num=20)
+    # deltas = np.arange(0.03, 0.1, 0.005)  # parameter of the structural component
+    deltas = np.logspace(-5,-1,num=20)
     with open("out.log", "w") as fh:
         for alpha, delta in product(alphas, deltas):
-            beta, roots, ll = ml(root_victims, victims, non_victims, age, alpha, delta)
+            beta, roots, ll = ml2(root_victims, victims, non_victims, age, alpha, delta)
             print "\t".join(map(str, [alpha, delta, beta, roots, ll]))
             fh.write("\t".join(map(str, [alpha, delta, beta, roots, ll])) + "\n")
             fh.flush()