Fix deprecation warning for tuple conditions in new version of numpy

629ysf · Aug 15, 2021 · 0e60192 · 0e60192
1 parent b7c084e
commit 0e60192
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/ddm/functions.py b/ddm/functions.py
@@ -561,7 +561,7 @@ def solve_partial_conditions(model, sample=None, conditions=None, method=None):
         # conditions
         if len(cond_combs) == 1:
             cond_combs = cond_combs + cond_combs
-        samp = Sample.from_numpy_array(np.asarray(cond_combs), all_conds)
+        samp = Sample.from_numpy_array(np.asarray(cond_combs, dtype=object), all_conds)
     model_corr = 0*model.t_domain()
     model_err = 0*model.t_domain()
     model_undec = -1 # Set to dummy value -1 so we can detect this in our loop

diff --git a/ddm/plot.py b/ddm/plot.py
@@ -386,8 +386,6 @@ def setter(x,a,pv=pv,component=component,param_name=param_name):
     def update():
         """Redraws the plot according to the current parameters of the model
         and the selected conditions."""
-        print("cond var vals", condition_vars_values)
-        print("cond vars", condition_vars)
         current_conditions = {c : condition_vars_values[i][condition_vars[i].get()] for i,c in enumerate(required_conditions) if condition_vars[i].get() != "All"}
         # If any conditions were "all", they will not be in current
         # conditions.  Here, we update current_conditions with any

diff --git a/ddm/sample.py b/ddm/sample.py
@@ -169,7 +169,7 @@ def from_numpy_array(data, column_names):
         c = data[:,1].astype(bool)
         nc = (1-data[:,1]).astype(bool)
         def pt(x): # Pythonic types
-            arr = np.asarray(x)
+            arr = np.asarray(x, dtype=object)
             # The following is somewhat of a hack to get rid of object arrays
             # when a condition is not a number (e.g. string or tuple)
             if len(arr) > 0 and not isinstance(arr[0], (float, int, np.float_, np.int_)):
@@ -216,7 +216,7 @@ def from_pandas_dataframe(df, rt_column_name, correct_column_name):
         c = df[correct_column_name].astype(bool)
         nc = (1-df[correct_column_name]).astype(bool)
         def pt(x): # Pythonic types
-            arr = np.asarray(x)
+            arr = np.asarray(x, dtype=object)
             # The following is somewhat of a hack to get rid of object arrays
             # when a condition is not a number (e.g. string or tuple)
             if len(arr) > 0 and not isinstance(arr[0], (float, int, np.float_, np.int_)):