Merge branch 'master' of github.com:pysal/libpysal into todense

Author: ljwolf

libpysal/weights/tests/test_util.py

@@ -18,9 +18,6 @@
 except:
     HAS_GEOPANDAS = False
 
-SCIPY1_7 = False
-if scipy.version.version == '1.7.0':
-    SCIPY1_7 = True
 
 class Testutil(unittest.TestCase):
     def setUp(self):
@@ -33,9 +30,7 @@ def test_lat2W(self):
         self.assertEqual(w9.pct_nonzero, 29.62962962962963)
         self.assertEqual(w9[0], {1: 1.0, 3: 1.0})
         self.assertEqual(w9[3], {0: 1.0, 4: 1.0, 6: 1.0})
-    @unittest.skipIf(
-        SCIPY1_7, "Known failure due to dia change (TOFIX)"
-    )
+
     def test_lat2SW(self):
         w9 = util.lat2SW(3, 3)
         rows, cols = w9.shape
@@ -352,12 +347,16 @@ def test_fuzzy_contiguity(self):
         wf = fuzzy_contiguity(rs_df)
         self.assertEqual(wf.islands, [])
         self.assertEqual(set(wf.neighbors[0]), set([239, 59, 152, 23]))
-        buff = fuzzy_contiguity(rs_df, buffering=True, buffer=.2)
-        self.assertEqual(set(buff.neighbors[0]), set([175, 119, 239, 59, 152, 246, 23, 107]))
-        rs_index = rs_df.set_index('NM_MUNICIP')
+        buff = fuzzy_contiguity(rs_df, buffering=True, buffer=0.2)
+        self.assertEqual(
+            set(buff.neighbors[0]), set([175, 119, 239, 59, 152, 246, 23, 107])
+        )
+        rs_index = rs_df.set_index("NM_MUNICIP")
         index_w = fuzzy_contiguity(rs_index)
-        self.assertEqual(set(index_w.neighbors['TAVARES']), set(['SÃO JOSÉ DO NORTE', 'MOSTARDAS']))
-        wf_pred = fuzzy_contiguity(rs_df, predicate='touches')
+        self.assertEqual(
+            set(index_w.neighbors["TAVARES"]), set(["SÃO JOSÉ DO NORTE", "MOSTARDAS"])
+        )
+        wf_pred = fuzzy_contiguity(rs_df, predicate="touches")
         self.assertEqual(set(wf_pred.neighbors[0]), set([]))
         self.assertEqual(set(wf_pred.neighbors[1]), set([142, 82, 197, 285, 386, 350]))
 

libpysal/weights/util.py

@@ -1241,6 +1241,8 @@ def lat2SW(nrows=3, ncols=5, criterion="rook", row_st=False):
     m = m + m.T
     if row_st:
         m = sparse.spdiags(1.0 / m.sum(1).T, 0, *m.shape) * m
+    m = m.tocsc()
+    m.eliminate_zeros()
     return m
 
 
@@ -1510,8 +1512,17 @@ def nonplanar_neighbors(w, geodataframe, tolerance=0.001, **kwargs):
     w.non_planar_joins = fixes
     return w
 
-@requires('geopandas')
-def fuzzy_contiguity(gdf, tolerance=0.005, buffering=False, drop=True, buffer=None, predicate='intersects', **kwargs):
+
+@requires("geopandas")
+def fuzzy_contiguity(
+    gdf,
+    tolerance=0.005,
+    buffering=False,
+    drop=True,
+    buffer=None,
+    predicate="intersects",
+    **kwargs,
+):
     """
     Fuzzy contiguity spatial weights
 
@@ -1625,7 +1636,7 @@ def fuzzy_contiguity(gdf, tolerance=0.005, buffering=False, drop=True, buffer=No
         new_geometry = gdf.geometry.buffer(buffer)
         gdf["_buffer"] = new_geometry
         old_geometry_name = gdf.geometry.name
-        gdf.set_geometry('_buffer', inplace=True)
+        gdf.set_geometry("_buffer", inplace=True)
 
     neighbors = {}
     if GPD_08:
@@ -1641,8 +1652,8 @@ def fuzzy_contiguity(gdf, tolerance=0.005, buffering=False, drop=True, buffer=No
             ids = gdf.index[res[inp == i]].tolist()
             neighbors[ix] = ids
     else:
-        if predicate != 'intersects':
-            raise ValueError(f'Predicate `{predicate}` requires geopandas >= 0.8.0.')
+        if predicate != "intersects":
+            raise ValueError(f"Predicate `{predicate}` requires geopandas >= 0.8.0.")
         tree = gdf.sindex
         for i, (ix, geom) in enumerate(gdf.geometry.iteritems()):
             hits = list(tree.intersection(geom.bounds))