myokit 1.36.1__py3-none-any.whl → 1.37.1__py3-none-any.whl

myokit/tests/test_datablock.py

@@ -167,11 +167,11 @@ class DataBlock1dTest(unittest.TestCase):
         d = myokit.DataLog()
         d.set_time_key('time')
         d['time'] = time
-        d['x', 0] = np.array(down, copy=True)
-        d['x', 1] = np.array(down, copy=True)
-        d['x', 2] = np.array(down, copy=True)
-        d['x', 3] = np.array(down, copy=True)
-        d['x', 4] = np.array(down, copy=True)
+        d['x', 0] = np.copy(down)
+        d['x', 1] = np.copy(down)
+        d['x', 2] = np.copy(down)
+        d['x', 3] = np.copy(down)
+        d['x', 4] = np.copy(down)
         d['x', 1][10:] = 40
         b = myokit.DataBlock1d.from_log(d)
         self.assertEqual(b.cv('x'), 0)
@@ -180,11 +180,11 @@ class DataBlock1dTest(unittest.TestCase):
         d = myokit.DataLog()
         d.set_time_key('time')
         d['time'] = time
-        d['x', 0] = np.array(down, copy=True)
-        d['x', 1] = np.array(down, copy=True)
-        d['x', 2] = np.array(down, copy=True)
-        d['x', 3] = np.array(down, copy=True)
-        d['x', 4] = np.array(down, copy=True)
+        d['x', 0] = np.copy(down)
+        d['x', 1] = np.copy(down)
+        d['x', 2] = np.copy(down)
+        d['x', 3] = np.copy(down)
+        d['x', 4] = np.copy(down)
         d['x', 1][10:] = 40
         d['x', 2][10:] = 40
         d['x', 3][10:] = 40
@@ -397,19 +397,19 @@ class DataBlock1dTest(unittest.TestCase):
         # Not enough data: detected at time level
         path = os.path.join(DIR_IO, 'bad1d-6-time-too-short.zip')
         self.assertRaisesRegex(
-            myokit.DataBlockReadError, 'larger data',
+            myokit.DataBlockReadError, 'more time data',
             myokit.DataBlock1d.load, path)
 
         # Not enoug data: detected at 0d level
         path = os.path.join(DIR_IO, 'bad1d-7-0d-too-short.zip')
         self.assertRaisesRegex(
-            myokit.DataBlockReadError, 'larger data',
+            myokit.DataBlockReadError, 'more 0d data',
             myokit.DataBlock1d.load, path)
 
         # Not enough data: detected at 1d level
         path = os.path.join(DIR_IO, 'bad1d-8-1d-too-short.zip')
         self.assertRaisesRegex(
-            myokit.DataBlockReadError, 'larger data',
+            myokit.DataBlockReadError, 'more 1d data',
             myokit.DataBlock1d.load, path)
 
         # Test progress reporter
@@ -1324,19 +1324,19 @@ class DataBlock2dTest(unittest.TestCase):
         # Unknown data type in data
         path = os.path.join(DIR_IO, 'bad2d-6-time-too-short.zip')
         self.assertRaisesRegex(
-            myokit.DataBlockReadError, 'larger data',
+            myokit.DataBlockReadError, 'more time data',
             myokit.DataBlock2d.load, path)
 
         # Unknown data type in data
         path = os.path.join(DIR_IO, 'bad2d-7-0d-too-short.zip')
         self.assertRaisesRegex(
-            myokit.DataBlockReadError, 'larger data',
+            myokit.DataBlockReadError, 'more 0d data',
             myokit.DataBlock2d.load, path)
 
         # Unknown data type in data
         path = os.path.join(DIR_IO, 'bad2d-8-2d-too-short.zip')
         self.assertRaisesRegex(
-            myokit.DataBlockReadError, 'larger data',
+            myokit.DataBlockReadError, 'more 2d data',
             myokit.DataBlock2d.load, path)
 
         # Test progress reporter

myokit/tests/test_datalog.py

@@ -683,6 +683,26 @@ class DataLogTest(unittest.TestCase):
         d = myokit.DataLog.load(path, progress=p)
         self.assertIsNone(d)
 
+    def test_load_csv_duplicate_keys(self):
+        # Test loading a CSV with duplicate key names
+
+        path = os.path.join(DIR_IO, 'datalog-18-duplicate-keys.csv')
+        d = myokit.DataLog.load_csv(path)
+        self.assertEqual(len(d), 7)
+        self.assertEqual(
+            list(d.keys()),
+            ['time', 'x-1', 'x-3', 'ys-2-1', 'x-4', 'ys-2-2', 'x-2'])
+
+    def test_load_csv_ufeff(self):
+        # Test ignoring byte order marker (BOM) at start of file
+
+        with TemporaryDirectory() as td:
+            path = td.path('test.csv')
+            with open(path, 'w', encoding='utf-8-sig') as f:
+                f.write('time,x\n0,2\n1,3\n')
+            d = myokit.DataLog.load_csv(path)
+            self.assertEqual(list(d.keys()), ['time', 'x'])
+
     def test_load_csv_errors(self):
         # Test for errors during csv loading.
 
@@ -2109,9 +2129,12 @@ class DataLogTest(unittest.TestCase):
         self.assertRaises(ValueError, d.split_periodic, 0)
         self.assertRaises(ValueError, d.split_periodic, -1)
 
-        # Test larger period than log data
+        # Test larger period than log data: Should return length-1 list
         d['x'] = [4, 5, 6, 7]
         e = d.split_periodic(100)
+        self.assertIsInstance(e, list)
+        self.assertEqual(len(e), 1)
+        e = e[0]
         self.assertEqual(set(d.keys()), set(e.keys()))
         self.assertFalse(d is e)