dist zero adaption

psinger · Jul 30, 2015 · 7311833 · 7311833
1 parent 78258ff
commit 7311833
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/hyptrails/trial_roulette.py b/hyptrails/trial_roulette.py
@@ -139,7 +139,7 @@ def distr_chips_row(matrix, chips, n_jobs=-1, norm=True, dist_zero_rows=True, mo
                        matrix.data, norma)
 
     if mode == "integers":
-        r = Parallel(n_jobs=n_jobs)(delayed(distr_chips)(matrix[i,:],chips,norm=False) for i in xrange(matrix.shape[0]))
+        r = Parallel(n_jobs=n_jobs)(delayed(distr_chips)(matrix[i,:],chips,dist_zero_matrix=dist_zero_rows,norm=False) for i in xrange(matrix.shape[0]))
         return scipy.sparse.vstack(r)
 
     if mode == "reals":

diff --git a/tests/unittests.py b/tests/unittests.py
@@ -100,6 +100,22 @@ def test_distr_chips_row_reals_all_zeros(self):
 
         self.assertEqual(ret.sum(), self.states*self.states)
 
+    def test_distr_chips_row_reals_zeros_ignore(self):
+        m = self.matrix
+        m[0,:] = 0.
+        m.eliminate_zeros()
+        ret = distr_chips_row(m, self.states, dist_zero_rows=False, mode="reals")
+
+        self.assertEqual(ret.sum(), self.states*self.states - self.states)
+
+    def test_distr_chips_row_zeros_ignore(self):
+        m = self.matrix
+        m[0,:] = 0.
+        m.eliminate_zeros()
+        ret = distr_chips_row(m, self.states, dist_zero_rows=False)
+
+        self.assertEqual(ret.sum(), self.states*self.states - self.states)
+
     def test_distr_chips_row_strange_chips(self):
         tmp = lil_matrix(self.matrix.shape)
         for i in xrange(self.states):