Merge pull request #426 from ljwolf/lat2sw_bug

cast sw to csc and eliminate zeros

Author: ljwolf

libpysal/weights/tests/test_util.py

@@ -18,10 +18,6 @@
 except:
     HAS_GEOPANDAS = False
 
-SCIPY1_7 = False
-if scipy.version.version.startswith("1.7"):
-    SCIPY1_7 = True
-
 
 class Testutil(unittest.TestCase):
     def setUp(self):
@@ -35,7 +31,6 @@ def test_lat2W(self):
         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

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))