myokit 1.35.0__py3-none-any.whl → 1.35.2__py3-none-any.whl

myokit/tests/{ansic_fixed_form_pacing.py → ansic_time_series_pacing.py}

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Class for testing the fixed-form pacing system.
+# Class for testing the time-series pacing system.
 #
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
@@ -12,12 +12,12 @@ import myokit
 from myokit.tests import DIR_TEST
 
 # Location of C template
-SOURCE_FILE = 'ansic_fixed_form_pacing.c'
+SOURCE_FILE = 'ansic_time_series_pacing.c'
 
 
-class AnsicFixedFormPacing(myokit.CModule):
+class AnsicTimeSeriesPacing(myokit.CModule):
     """
-    Class for testing the fixed-form pacing system.
+    Class for testing the time-series pacing system.
     """
     _index = 0
 
@@ -25,9 +25,9 @@ class AnsicFixedFormPacing(myokit.CModule):
         super().__init__()
 
         # Unique id
-        AnsicFixedFormPacing._index += 1
+        AnsicTimeSeriesPacing._index += 1
         module_name = \
-            'myokit_ansic_fpacing_' + str(AnsicFixedFormPacing._index)
+            'myokit_ansic_fpacing_' + str(AnsicTimeSeriesPacing._index)
 
         # Arguments
         fname = os.path.join(DIR_TEST, SOURCE_FILE)

myokit/tests/test_datablock.py

@@ -700,6 +700,90 @@ class DataBlock2dTest(unittest.TestCase):
         self.assertTrue(np.all(c[1] == t1))
         self.assertTrue(np.all(c[2] == t2))
 
+        # Gray colormap
+        t0 = np.array([  # Deepest array is a pixel
+            [[0] * 3, [51] * 3],
+            [[102] * 3, [153] * 3],
+            [[204] * 3, [255] * 3],
+        ])
+        t1 = np.array([
+            [[255] * 3, [204] * 3],
+            [[153] * 3, [102] * 3],
+            [[51] * 3, [0] * 3],
+        ])
+        t2 = np.array([
+            [[0] * 3, [0] * 3],
+            [[0] * 3, [0] * 3],
+            [[0] * 3, [0] * 3],
+        ])
+        c = b.colors('x', colormap='gray')
+        self.assertTrue(np.all(c[0] == t0))
+        self.assertTrue(np.all(c[1] == t1))
+        self.assertTrue(np.all(c[2] == t2))
+
+        # Cividis colormap
+        t0 = np.array([  # Deepest array is a pixel
+            [[0, 32, 76], [49, 68, 107]],
+            [[102, 104, 112], [150, 143, 119]],
+            [[203, 186, 104], [255, 233, 69]],
+        ])
+        t1 = np.array([
+            [[255, 233, 69], [203, 186, 104]],
+            [[150, 143, 119], [102, 104, 112]],
+            [[49, 68, 107], [0, 32, 76]],
+        ])
+        t2 = np.array([
+            [[0, 32, 76], [0, 32, 76]],
+            [[0, 32, 76], [0, 32, 76]],
+            [[0, 32, 76], [0, 32, 76]],
+        ])
+        c = b.colors('x', colormap='cividis')
+        self.assertTrue(np.all(c[0] == t0))
+        self.assertTrue(np.all(c[1] == t1))
+        self.assertTrue(np.all(c[2] == t2))
+
+        # Inferno colormap
+        t0 = np.array([  # Deepest array is a pixel
+            [[0, 0, 4], [66, 10, 104]],
+            [[148, 38, 104], [223, 82, 57]],
+            [[253, 167, 12], [253, 255, 165]],
+        ])
+        t1 = np.array([
+            [[253, 255, 165], [253, 167, 12]],
+            [[223, 82, 57], [148, 38, 104]],
+            [[66, 10, 104], [0, 0, 4]],
+        ])
+        t2 = np.array([
+            [[0, 0, 4], [0, 0, 4]],
+            [[0, 0, 4], [0, 0, 4]],
+            [[0, 0, 4], [0, 0, 4]],
+        ])
+        c = b.colors('x', colormap='inferno')
+        self.assertTrue(np.all(c[0] == t0))
+        self.assertTrue(np.all(c[1] == t1))
+        self.assertTrue(np.all(c[2] == t2))
+
+        # Viridis colormap
+        t0 = np.array([  # Deepest array is a pixel
+            [[68, 1, 84], [65, 68, 136]],
+            [[42, 121, 143], [35, 170, 132]],
+            [[125, 211, 80], [254, 232, 37]],
+        ])
+        t1 = np.array([
+            [[254, 232, 37], [125, 211, 80]],
+            [[35, 170, 132], [42, 121, 143]],
+            [[65, 68, 136], [68, 1, 84]],
+        ])
+        t2 = np.array([
+            [[68, 1, 84], [68, 1, 84]],
+            [[68, 1, 84], [68, 1, 84]],
+            [[68, 1, 84], [68, 1, 84]],
+        ])
+        c = b.colors('x', colormap='viridis')
+        self.assertTrue(np.all(c[0] == t0))
+        self.assertTrue(np.all(c[1] == t1))
+        self.assertTrue(np.all(c[2] == t2))
+
     def test_colors_multiplier(self):
         # Test using the multiplier argument in colors
 

myokit/tests/test_datalog.py

@@ -2189,7 +2189,8 @@ class DataLogTest(unittest.TestCase):
             self.assertTrue(np.abs(np.exp(y) - e['values'][i]) < 0.02)
 
         # test setting tmin and tmax
-        e = d.regularize(dt=0.5, tmin=0.4, tmax=2.6)
+        with WarningCollector() as w:
+            e = d.regularize(dt=0.5, tmin=0.4, tmax=2.6)
         self.assertEqual(len(e['time']), 5)
         x = np.array([0.4, 0.9, 1.4, 1.9, 2.4])
         self.assertTrue(np.all(e['time'] == x))