fix array conversion

Author: kjohnsen

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wslfp"
-version = "0.2.0"
+version = "0.2.1"
 description = "Weighted Sum Local Field Potentials - Implementation of the proxy method for point neurons from Mazzoni, Lindén et al., 2015"
 authors = [
     "Kyle Johnsen <kyle@kjohnsen.org>",

tests/test_wslfp.py

@@ -19,26 +19,27 @@
         # length of time and current array must equal
         ([1, 2, 4], [1, 2, 10], [9], True),
         # missing I_gaba at t=9
-        ([1, 2, 10], [1, 2, 4], [9], False),
+        ([1, 2, 10], [1, 2, 4], 9, False),
         ([3, 2, 1], [3, 2, 1], [2], False),  # Non-increasing order, should fail
         ([], [], [], False),  # Empty arrays, should fail
         ([1, 5, 9, 12, 17], [1, 3, 5, 9, 12], [8, 11], True),
         ([1, 5, 9, 12, 17], [1, 3, 5, 9, 12], [], False),
         ([2, 4, 6, 23, 25], [7, 10, 15, 21, 25], [12, 20, 24], True),
         ([2, 3, 4, 5, 6], [50, 60, 70, 80, 90], [70, 100], False),
         ([0], [6], [6], True),
-        ([6], [6], [6], False),
-        ([6], [0], [6], False),
+        (0, 6, 6, True),
+        ([6], 6, [6], False),
+        (6, [0], [6], False),
     ],
 )
 def test_calculate(t_ampa, t_gaba, t_eval, success, n_elec, seed):
     rng = np.random.default_rng(seed)
     # Dummy data for currents and coordinates
     n_src = 3
     n_elec = 2
-    I_ampa = np.arange(len(t_ampa))
+    I_ampa = np.arange(np.size(t_ampa))
     I_ampa = I_ampa[:, np.newaxis] + np.arange(n_src)
-    I_gaba = -np.arange(len(t_gaba)) - 2
+    I_gaba = -np.arange(np.size(t_gaba)) - 2
     I_gaba = I_gaba[:, np.newaxis] - np.arange(n_src)
 
     source_coords = rng.uniform(-10, 10, (n_src, 3))
@@ -47,7 +48,7 @@ def test_calculate(t_ampa, t_gaba, t_eval, success, n_elec, seed):
     calc = wslfp.from_xyz_coords(elec_coords, source_coords, strict_boundaries=True)
     if success:
         lfp_values = calc.calculate(t_eval, t_ampa, I_ampa, t_gaba, I_gaba)
-        assert lfp_values.shape == (len(t_eval), n_elec)
+        assert lfp_values.shape == (np.size(t_eval), n_elec)
         # increasing could be negative or positive
         # can't use np.abs since normalization can put values on either side of 0
         assert np.all(

wslfp/__init__.py

@@ -144,12 +144,12 @@ def calculate(
                 each electrode
         """
         # convert t to arrays if needed
-        if isinstance(t_eval_ms, (list, tuple, int, float)):
-            t_eval_ms = np.array(t_eval_ms)
-        if isinstance(t_ampa_ms, (list, tuple, int, float)):
-            t_ampa_ms = np.array(t_ampa_ms)
-        if isinstance(t_gaba_ms, (list, tuple, int, float)):
-            t_gaba_ms = np.array(t_gaba_ms)
+        if isinstance(t_eval_ms, (int, float)):
+            t_eval_ms = np.array([t_eval_ms])
+        if isinstance(t_ampa_ms, (int, float)):
+            t_ampa_ms = np.array([t_ampa_ms])
+        if isinstance(t_gaba_ms, (int, float)):
+            t_gaba_ms = np.array([t_gaba_ms])
 
         I_ampa = np.reshape(I_ampa, (-1, self.n_sources))
         assert I_ampa.shape == (