Merge pull request #5288 from jnothman/bicluster-example-speed

jnothman · jnothman · commit b9284a759f1c · 2015-09-20T22:31:46.000+10:00
[MRG] Bicluster example speed
diff --git a/examples/bicluster/bicluster_newsgroups.py b/examples/bicluster/bicluster_newsgroups.py
@@ -132,9 +132,11 @@ def bicluster_ncut(i):
         return sys.float_info.max
     row_complement = np.nonzero(np.logical_not(cocluster.rows_[i]))[0]
     col_complement = np.nonzero(np.logical_not(cocluster.columns_[i]))[0]
-    weight = X[rows[:, np.newaxis], cols].sum()
-    cut = (X[row_complement[:, np.newaxis], cols].sum() +
-           X[rows[:, np.newaxis], col_complement].sum())
+    # Note: the following is identical to X[rows[:, np.newaxis], cols].sum() but
+    # much faster in scipy <= 0.16
+    weight = X[rows][:, cols].sum()
+    cut = (X[row_complement][:, cols].sum() +
+           X[rows][:, col_complement].sum())
     return cut / weight
 
 
