scipy compatibility with getting function "ndim_coords_from_arrays"

johnh865 · May 8, 2022 · 44ee7c2 · 44ee7c2
1 parent bd5befc
commit 44ee7c2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/docs/multiwinner/benchmark.py b/docs/multiwinner/benchmark.py
@@ -62,6 +62,8 @@ def multi_model(name, methods,
         e.set_models(voters=v, candidates=c)
         for method in methods:
             e.run(etype=method)
+    return e
+
 
 
 

diff --git a/votesim/models/spatial.py b/votesim/models/spatial.py
@@ -1225,18 +1225,7 @@ def append_stat(self, d: metrics.BaseStats, name='', update_docs=False):
                                              update_docs=update_docs)
 
 
-def combine_elections(elections: list[Election]):
-    candidates = [e.candidates for e in elections]
-    candidates = Candidates.concat(candidates)
-    voters = candidates.voters
-    election_datas = [e.data for e in elections]
-    winners
-    ties
-    ballots
-    raise NotImplementedError()
-
-
-
+
 
 
 

diff --git a/votesim/utilities/math.py b/votesim/utilities/math.py
@@ -7,9 +7,11 @@
 import scipy
 from scipy.stats import truncnorm
 from scipy.interpolate import NearestNDInterpolator
-from scipy.interpolate.ndgriddata import _ndim_coords_from_arrays
-
 
+try:
+    from scipy.interpolate.interpnd import _ndim_coords_from_arrays
+except ImportError:
+    from scipy.interpolate.ndgriddata import _ndim_coords_from_arrays
 
 def ltruncnorm(loc, scale, size, random_state=None):
     """