Merge pull request #95 from sjsrey/master

ENH: bumping version and handle array creation error in join counts
pysal · Dec 18, 2019 · 2299416 · 2299416
2 parents bbf8ce7 + 0497257
commit 2299416
Show file tree

Hide file tree

Showing 3 changed files with 888 additions and 2 deletions.
diff --git a/esda/__init__.py b/esda/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "2.1.1"
+__version__ = "2.2.0"
 """
 :mod:`esda` --- Exploratory Spatial Data Analysis
 =================================================

diff --git a/esda/join_counts.py b/esda/join_counts.py
@@ -179,7 +179,7 @@ def __init__(self, y, w, permutations=PERMUTATIONS):
                 except ValueError:
                     # expected count of 0 -> inadmissible
                     pass
-            sim_jc = np.array(sim)
+            sim_jc = np.array(sim, dtype=object)
             self.sim_bb = sim_jc[:, 0]
             self.min_bb = np.min(self.sim_bb)
             self.mean_bb = np.mean(self.sim_bb)

diff --git a/notebooks/geosilhouettes.ipynb b/notebooks/geosilhouettes.ipynb