myokit 1.36.0__py3-none-any.whl → 1.37.0__py3-none-any.whl

myokit/tests/test_formats_ansic.py

@@ -176,11 +176,13 @@ class AnsiCExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
 
     def test_conditions(self):
         a, b, c, d = self.abcd
+        p = myokit.Equal(a, b)
+        q = myokit.NotEqual(c, d)
 
-        self.eq(And(a, b), '(a && b)')
-        self.eq(Or(d, c), '(d || c)')
-        self.eq(Not(And(a, b)), '(!(a && b))')
-        self.eq(Not(c), '(!(c))')
+        self.eq(And(p, q), '((a == b) && (c != d))')
+        self.eq(Or(q, p), '((c != d) || (a == b))')
+        self.eq(Not(And(p, q)), '(!((a == b) && (c != d)))')
+        self.eq(Not(p), '(!(a == b))')
 
         self.eq(Equal(a, b), '(a == b)')
         self.eq(NotEqual(a, b), '(a != b)')
@@ -191,12 +193,6 @@ class AnsiCExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
 
         self.eq(And(Equal(a, b), NotEqual(c, d)), '((a == b) && (c != d))')
         self.eq(Or(More(d, c), Less(b, a)), '((d > c) || (b < a))')
-        self.eq(Not(Or(Number(1), Number(2))), '(!(1.0 || 2.0))')
-        self.eq(Not(Less(Number(1), Number(2))), '(!(1.0 < 2.0))')
-        self.eq(Not(Plus(Number(1), Number(2))), '(!(1.0 + 2.0))')
-
-        self.eq(Equal(Equal(Number(0), Number(0)), Number(0)),
-                '((0.0 == 0.0) == 0.0)')
 
     def test_conditionals(self):
 
@@ -206,11 +202,6 @@ class AnsiCExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         self.eq(Piecewise(Equal(a, b), c, Equal(a, d), Number(3), Number(4)),
                 '((a == b) ? c : ((a == d) ? 3.0 : 4.0))')
 
-        # Extra parentheses if condition is not a condition
-        self.eq(If(a, d, c), '((a) ? d : c)')
-        self.eq(Piecewise(a, b, c, d, Number(4)),
-                '((a) ? b : ((c) ? d : 4.0))')
-
         # Using if-then-else function
         w = self._target()
         w.set_lhs_function(lambda v: v.var().name())
@@ -329,9 +320,6 @@ class AnsiCExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         c.add(If(Not(true), a, b), 20)
         c.add(If(Not(false), a, b), 10)
 
-        c.add(If(Equal(Equal(Number(0), Number(0)), Number(0)), a, b), 20)
-        c.add(If(Equal(Equal(Number(0), Number(0)), Number(1)), a, b), 10)
-
         c.add(Piecewise(true, Number(10), false, Number(20), Number(30)), 10)
         c.add(Piecewise(true, Number(10), true, Number(20), Number(30)), 10)
         c.add(Piecewise(false, Number(10), true, Number(20), Number(30)), 20)

myokit/tests/test_formats_cpp.py

@@ -72,11 +72,6 @@ class CppExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
                                  myokit.Number(4)),
                 '((a == b) ? c : ((a == d) ? 3.0 : 4.0))')
 
-        # Extra parentheses if condition is not a condition
-        self.eq(myokit.If(a, d, c), '((a) ? d : c)')
-        self.eq(myokit.Piecewise(a, b, c, d, myokit.Number(4)),
-                '((a) ? b : ((c) ? d : 4.0))')
-
         # Using if-then-else function
         w = self._target()
         w.set_lhs_function(lambda v: v.var().name())

myokit/tests/test_formats_cuda.py

@@ -186,10 +186,12 @@ class CudaExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         # Inherited from c-based
 
         a, b, c, d = self.abcd
-        self.eq(And(a, b), '(a && b)')
-        self.eq(Or(d, c), '(d || c)')
-        self.eq(Not(And(a, b)), '(!(a && b))')
-        self.eq(Not(c), '(!(c))')
+        p = Equal(a, b)
+        q = NotEqual(c, d)
+        self.eq(And(p, q), '((a == b) && (c != d))')
+        self.eq(Or(q, p), '((c != d) || (a == b))')
+        self.eq(Not(And(p, p)), '(!((a == b) && (a == b)))')
+        self.eq(Not(q), '(!(c != d))')
 
         self.eq(Equal(a, b), '(a == b)')
         self.eq(NotEqual(a, b), '(a != b)')
@@ -198,14 +200,9 @@ class CudaExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         self.eq(MoreEqual(c, a), '(c >= a)')
         self.eq(LessEqual(b, d), '(b <= d)')
 
-        self.eq(And(Equal(a, b), NotEqual(c, d)), '((a == b) && (c != d))')
         self.eq(Or(More(d, c), Less(b, a)), '((d > c) || (b < a))')
-        self.eq(Not(Or(Number(1), Number(2))), '(!(1.0f || 2.0f))')
+        self.eq(Not(Equal(Number(1), Number(2))), '(!(1.0f == 2.0f))')
         self.eq(Not(Less(Number(1), Number(2))), '(!(1.0f < 2.0f))')
-        self.eq(Not(Plus(Number(1), Number(2))), '(!(1.0f + 2.0f))')
-
-        self.eq(Equal(Equal(Number(0), Number(0)), Number(0)),
-                '((0.0f == 0.0f) == 0.0f)')
 
     def test_conditionals(self):
         # Inherited from c-based
@@ -216,11 +213,6 @@ class CudaExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         self.eq(Piecewise(Equal(a, b), c, Equal(a, d), Number(3), Number(4)),
                 '((a == b) ? c : ((a == d) ? 3.0f : 4.0f))')
 
-        # If condition is not a condition
-        self.eq(If(a, d, c), '((a) ? d : c)')
-        self.eq(Piecewise(a, b, c, d, Number(4)),
-                '((a) ? b : ((c) ? d : 4.0f))')
-
 
 if __name__ == '__main__':
     unittest.main()

myokit/tests/test_formats_easyml.py

@@ -400,16 +400,14 @@ class EasyMLExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
     def test_conditions(self):
         # Inherited from CBasedExpressionWriter
         a, b, c, d = self.abcd
-        self.eq(Not(And(a, b)), '(!(a && b))')
-        self.eq(Not(c), '(!(c))')
+        self.eq(Not(NotEqual(a, b)), '(!(a != b))')
         self.eq(And(Equal(a, b), NotEqual(c, d)), '((a == b) && (c != d))')
         self.eq(Or(More(d, c), MoreEqual(b, a)), '((d > c) || (b >= a))')
         self.eq(Or(Less(d, c), LessEqual(b, a)), '((d < c) || (b <= a))')
-        self.eq(Not(Or(Number(1), Number(2))), '(!(1.0 || 2.0))')
+        self.eq(
+            Not(Or(Equal(Number(1), Number(2)), Equal(Number(3), Number(4)))),
+            '(!((1.0 == 2.0) || (3.0 == 4.0)))')
         self.eq(Not(Less(Number(1), Number(2))), '(!(1.0 < 2.0))')
-        self.eq(Not(Plus(Number(1), Number(2))), '(!(1.0 + 2.0))')
-        self.eq(Equal(Equal(Number(0), Number(0)), Number(0)),
-                '((0.0 == 0.0) == 0.0)')
 
     def test_conditionals(self):
         # Inherited from CBasedExpressionWriter
@@ -418,9 +416,6 @@ class EasyMLExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         self.eq(Piecewise(NotEqual(d, c), b, a), '((d != c) ? b : a)')
         self.eq(Piecewise(Equal(a, b), c, Equal(a, d), Number(3), Number(4)),
                 '((a == b) ? c : ((a == d) ? 3.0 : 4.0))')
-        self.eq(If(a, d, c), '((a) ? d : c)')
-        self.eq(Piecewise(a, b, c, d, Number(4)),
-                '((a) ? b : ((c) ? d : 4.0))')
 
 
 if __name__ == '__main__':

myokit/tests/test_formats_latex.py

@@ -179,10 +179,6 @@ class LatexExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
     def test_conditions(self):
         a, b, c, d = self.abcd
 
-        self.eq(And(a, b), r'\left(\text{a}\and\text{b}\right)')
-        self.eq(Or(d, c), r'\left(\text{d}\or\text{c}\right)')
-        self.eq(Not(c), r'\left(\not\text{c}\right)')
-
         self.eq(Equal(a, b), r'\left(\text{a}=\text{b}\right)')
         self.eq(NotEqual(a, b), r'\left(\text{a}\neq\text{b}\right)')
         self.eq(More(b, a), r'\left(\text{b}>\text{a}\right)')
@@ -193,18 +189,21 @@ class LatexExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         self.eq(And(Equal(a, b), NotEqual(c, d)),
                 r'\left(\left(\text{a}=\text{b}\right)\and'
                 r'\left(\text{c}\neq\text{d}\right)\right)')
+        self.eq(Or(Equal(a, b), NotEqual(c, d)),
+                r'\left(\left(\text{a}=\text{b}\right)\or'
+                r'\left(\text{c}\neq\text{d}\right)\right)')
         self.eq(Not(Equal(d, d)),
                 r'\left(\not\left(\text{d}=\text{d}\right)\right)')
-        self.eq(Equal(Equal(Number(0), Number(0)), Number(0)),
-                r'\left(\left(0.0=0.0\right)=0.0\right)')
 
     def test_conditionals(self):
-
         a, b, c, d = self.abcd
-        self.eq(myokit.If(a, b, c),
-                r'\text{if}\left(\text{a},\text{b},\text{c}\right)')
-        self.eq(myokit.Piecewise(a, b, c, d, Number(1)), r'\text{piecewise}'
-                r'\left(\text{a},\text{b},\text{c},\text{d},1.0\right)')
+        p = myokit.Equal(a, b)
+        q = myokit.NotEqual(c, d)
+        self.eq(myokit.If(p, c, d), r'\text{if}\left(\left(\text{a}=\text{b}'
+                r'\right),\text{c},\text{d}\right)')
+        self.eq(myokit.Piecewise(p, b, q, d, Number(1)), r'\text{piecewise}'
+                r'\left(\left(\text{a}=\text{b}\right),\text{b},\left(\text{c}'
+                r'\neq\text{d}\right),\text{d},1.0\right)')
 
 
 if __name__ == '__main__':

myokit/tests/test_formats_matlab.py

@@ -177,10 +177,6 @@ class MatlabExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
     def test_conditions(self):
         a, b, c, d = self.abcd
 
-        self.eq(And(a, b), '(a && b)')
-        self.eq(Or(d, c), '(d || c)')
-        self.eq(Not(c), '(!c)')
-
         self.eq(Equal(a, b), '(a == b)')
         self.eq(NotEqual(a, b), '(a != b)')
         self.eq(More(b, a), '(b > a)')
@@ -191,10 +187,6 @@ class MatlabExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         self.eq(And(Equal(a, b), NotEqual(c, d)), '((a == b) && (c != d))')
         self.eq(Or(More(d, c), Less(b, a)), '((d > c) || (b < a))')
         self.eq(Not(Equal(d, d)), '(!(d == d))')
-        self.eq(Not(Or(Number(1), Number(2))), '(!(1.0 || 2.0))')
-
-        self.eq(Equal(Equal(Number(0), Number(0)), Number(0)),
-                '((0.0 == 0.0) == 0.0)')
 
     def test_conditionals(self):
         a, b, c, d = self.abcd

myokit/tests/test_formats_opencl.py

@@ -170,16 +170,8 @@ class OpenCLExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         self.assertEqual(w.ex(Abs(self.a)), 'fabs(comp.a)')
 
     def test_conditions(self):
-        # Can be greatly simplified after
-        # https://github.com/myokit/myokit/issues/1056
-
         a, b, c, d = self.abcd
 
-        self.eq(And(a, b), '((a != 0.0f) && (b != 0.0f))')
-        self.eq(Or(d, c), '((d != 0.0f) || (c != 0.0f))')
-        self.eq(Not(And(a, b)), '(!((a != 0.0f) && (b != 0.0f)))')
-        self.eq(Not(c), '(!(c != 0.0f))')
-
         self.eq(Equal(a, b), '(a == b)')
         self.eq(NotEqual(a, b), '(a != b)')
         self.eq(More(b, a), '(b > a)')
@@ -189,23 +181,7 @@ class OpenCLExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
 
         self.eq(And(Equal(a, b), NotEqual(c, d)), '((a == b) && (c != d))')
         self.eq(Or(More(d, c), Less(b, a)), '((d > c) || (b < a))')
-        self.eq(Not(Or(Number(1), Number(2))),
-                '(!((1.0f != 0.0f) || (2.0f != 0.0f)))')
         self.eq(Not(Less(Number(1), Number(2))), '(!(1.0f < 2.0f))')
-        self.eq(Not(Plus(Number(1), Number(2))), '(!(1.0f + 2.0f != 0.0f))')
-
-        self.eq(Equal(Equal(Number(0), Number(0)), Number(0)),
-                '((0.0f == 0.0f) == (0.0f != 0.0f))')
-
-    def test_boolean_comparisons(self):
-        # Can be removed after https://github.com/myokit/myokit/issues/1056
-
-        a, b = self.ab
-        c1, c2 = More(Number(5), Number(3)), Less(Number(2), Number(1))
-        self.eq(Equal(c1, c2), '((5.0f > 3.0f) == (2.0f < 1.0f))')
-        self.eq(NotEqual(c1, a), '((5.0f > 3.0f) != (a != 0.0f))')
-        self.eq(More(b, c2), '((b != 0.0f) > (2.0f < 1.0f))')
-        self.eq(LessEqual(a, b), '(a <= b)')
 
     def test_conditionals(self):
         # Inherited from c-based
@@ -216,11 +192,6 @@ class OpenCLExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         self.eq(Piecewise(Equal(a, b), c, Equal(a, d), Number(3), Number(4)),
                 '((a == b) ? c : ((a == d) ? 3.0f : 4.0f))')
 
-        # If condition is not a condition
-        self.eq(If(a, d, c), '((a != 0.0f) ? d : c)')
-        self.eq(Piecewise(a, b, c, d, Number(4)),
-                '((a != 0.0f) ? b : ((c != 0.0f) ? d : 4.0f))')
-
 
 if __name__ == '__main__':
     unittest.main()

myokit/tests/test_formats_python.py

@@ -232,10 +232,6 @@ class PythonExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
     def test_conditions(self):
         a, b, c, d = self.abcd
 
-        self.eq(And(a, b), '(a and b)')
-        self.eq(Or(d, c), '(d or c)')
-        self.eq(Not(c), '(not c)')
-
         self.eq(Equal(a, b), '(a == b)')
         self.eq(NotEqual(a, b), '(a != b)')
         self.eq(More(b, a), '(b > a)')
@@ -246,7 +242,6 @@ class PythonExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         self.eq(And(Equal(a, b), NotEqual(c, d)), '((a == b) and (c != d))')
         self.eq(Or(More(d, c), Less(b, a)), '((d > c) or (b < a))')
         self.eq(Not(Equal(d, d)), '(not (d == d))')
-        self.eq(Not(Or(Number(1), Number(2))), '(not (1.0 or 2.0))')
 
         true = Equal(Number(3), Number(3))
         self.py(true, True)
@@ -267,11 +262,6 @@ class PythonExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         self.py(Not(true), False)
         self.py(Not(false), True)
 
-        self.eq(Equal(Equal(Number(0), Number(0)), Number(0)),
-                '((0.0 == 0.0) == 0.0)')
-        self.py(Equal(Equal(Number(0), Number(0)), Number(0)), False)
-        self.py(Equal(Equal(Number(0), Number(0)), Number(1)), True)
-
     def test_conditionals(self):
 
         a, b, c, d = self.abcd
@@ -501,10 +491,6 @@ class NumPyExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
     def test_conditions(self):
         a, b, c, d = self.abcd
 
-        self.eq(And(a, b), 'numpy.logical_and(a, b)')
-        self.eq(Or(d, c), 'numpy.logical_or(d, c)')
-        self.eq(Not(c), 'numpy.logical_not(c)')
-
         self.eq(Equal(a, b), '(a == b)')
         self.eq(NotEqual(a, b), '(a != b)')
         self.eq(More(b, a), '(b > a)')
@@ -517,8 +503,6 @@ class NumPyExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         self.eq(Or(More(d, c), Less(b, a)),
                 'numpy.logical_or((d > c), (b < a))')
         self.eq(Not(Equal(d, d)), 'numpy.logical_not((d == d))')
-        self.eq(Not(Or(Number(1), Number(2))),
-                'numpy.logical_not(numpy.logical_or(1.0, 2.0))')
 
         true = Equal(Number(3), Number(3))
         self.py(true, True)
@@ -532,9 +516,8 @@ class NumPyExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         self.py(LessEqual(Number(3), Number(3)), True)
         self.py(And(true, false), False)
         self.py(And(true, true), True)
-        self.py(Or(a, b), [True, True, True, False],
-                [True, True, False, False], [True, False, True, False])
-        self.py(Not(a), [True, False], [False, True])
+        self.py(Or(true, false), True)
+        self.py(Not(true), False)
 
     def test_conditionals(self):
         a, b, c, d = self.abcd

myokit/tests/test_formats_stan.py

@@ -139,10 +139,6 @@ class StanExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
     def test_conditions(self):
         a, b, c, d = self.abcd
 
-        self.eq(And(a, b), '(a && b)')
-        self.eq(Or(d, c), '(d || c)')
-        self.eq(Not(c), '(!c)')
-
         self.eq(Equal(a, b), '(a == b)')
         self.eq(NotEqual(a, b), '(a != b)')
         self.eq(More(b, a), '(b > a)')
@@ -153,10 +149,6 @@ class StanExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         self.eq(And(Equal(a, b), NotEqual(c, d)), '((a == b) && (c != d))')
         self.eq(Or(More(d, c), Less(b, a)), '((d > c) || (b < a))')
         self.eq(Not(Equal(d, d)), '(!(d == d))')
-        self.eq(Not(Or(Number(1), Number(2))), '(!(1.0 || 2.0))')
-
-        self.eq(Equal(Equal(Number(0), Number(0)), Number(0)),
-                '((0.0 == 0.0) == 0.0)')
 
     def test_conditionals(self):
         a, b, c, d = self.abcd
@@ -165,11 +157,6 @@ class StanExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
         self.eq(Piecewise(Equal(a, b), c, Equal(a, d), Number(3), Number(4)),
                 '((a == b) ? c : ((a == d) ? 3.0 : 4.0))')
 
-        # Extra parentheses if condition is not a condition
-        self.eq(If(a, d, c), '(a ? d : c)')
-        self.eq(Piecewise(a, b, c, d, Number(4)),
-                '(a ? b : (c ? d : 4.0))')
-
 
 if __name__ == '__main__':
     unittest.main()

myokit/tests/test_formats_sympy.py

@@ -237,10 +237,10 @@ class SymPyReadWriteTest(unittest.TestCase):
         self.assertEqual(r.ex(cx), x)
 
         # Not
-        x = myokit.Not(a)
-        cx = sp.Not(ca)
+        x = myokit.Not(x)
+        cx = sp.Not(cx)
         self.assertEqual(w.ex(x), cx)
-        self.assertEqual(r.ex(cx), x)
+        self.assertEqual(r.ex(cx), myokit.More(a, b))  # Can't test!
 
         # And
         cond1 = myokit.More(a, b)

myokit/tests/test_formats_wcp.py

@@ -210,6 +210,21 @@ class WcpTest(unittest.TestCase):
         self.assertRaises(NotImplementedError, w.da_units)
         self.assertRaises(NotImplementedError, w.da_protocol)
 
+    def test_empty_file(self):
+        # Tests reading a file with no data
+
+        path = os.path.join(DIR_FORMATS, 'wcp-file-empty.wcp')
+        w = wcp.WcpFile(path)
+        self.assertEqual(w.version(), '9')
+
+        # No records, but it still has a channel
+        self.assertEqual(w.record_count(), 0)
+        self.assertEqual(w.channel_count(), 1)
+        self.assertRaisesRegex(KeyError, 'empty file', w.channel, 0)
+
+        d = w.log()
+        self.assertEqual(len(d), 0)
+
     def test_figure_method(self):
         # Tests matplotlib_figure
         # Select matplotlib backend that doesn't require a screen

myokit/tests/test_lib_hh.py

@@ -15,6 +15,8 @@ import myokit.lib.hh as hh
 
 from myokit.tests import DIR_DATA
 
+from myokit.tests import WarningCollector
+
 
 MODEL = """
 [[model]]
@@ -914,6 +916,40 @@ class AnalyticalSimulationTest(unittest.TestCase):
         e = np.abs(d1['binding.I'] - d2['binding.I'])
         self.assertLess(np.max(e), 2e-4)
 
+    def test_tau_overflow(self):
+        # Overflows leading to tau=0 should still report current
+        # https://github.com/myokit/myokit/issues/1059
+
+        # Load model and convert to inf-tau form
+        fname = os.path.join(DIR_DATA, 'lr-1991-fitting.mmt')
+        model = hh.convert_hh_states_to_inf_tau_form(myokit.load_model(fname))
+
+        # Get initial state and set steady state
+        initial_state = model.get('ina.m').initial_value(as_float=True)
+        steady_state = 0.75
+        model.get('ina.m.inf').set_rhs(steady_state)
+
+        # Create an analytical simulation
+        model = hh.HHModel(model, states=['ina.m', 'ina.h', 'ina.j'],
+                           parameters=['ina.p5'], current='ina.INa')
+        p = myokit.pacing.steptrain_linear(20, 40, 10, -80, 10, 10)
+        s = hh.AnalyticalSimulation(model, protocol=p)
+
+        # Setting p5=0.001 will trigger an overflow in ina.m.beta
+        s.set_parameters([0.001])
+        with WarningCollector() as wc:
+            # Log times chosen so that s._function varies length of _t
+            log = s.run(41, log_times=np.array([0, 1, 2, 10, 11, 12, 20, 40]))
+        self.assertIn('overflow', wc.text())
+
+        # Should be no NaNs in log
+        self.assertFalse(np.any(np.isnan(log['ina.INa'])))
+        self.assertFalse(np.any(np.isnan(log['ina.m'])))
+
+        # Should immediately jump from initial state to steady state
+        self.assertTrue(log['ina.m'][0] == initial_state)
+        self.assertTrue(np.all(log['ina.m'][1:] == steady_state))
+
 
 if __name__ == '__main__':
     unittest.main()

myokit/tests/test_model.py

@@ -636,18 +636,18 @@ class ModelTest(unittest.TestCase):
         self.assertEqual(len(x), len(y))
 
         # Test with state argument
-        state1 = [1, 2, 3, 4, 5, 6, 7, 8]
+        state1 = [-40, 2, 3, 4, 5, 6, 7, 8]
         state1[2] = 536.46745856785678567845745637
         x = m.format_state_derivatives(state1).splitlines()
         y = [
-'membrane.V = 1                          dot =  1.90853168050245158e+07', # noqa
-'ina.m      = 2                          dot = -1.56738349674489310e+01', # noqa
-'ina.h      =  5.36467458567856738e+02   dot = -3.05729251015767022e+03', # noqa
-'ina.j      = 4                          dot = -1.15731427949362953e+00', # noqa
-'ica.d      = 5                          dot = -1.85001944916516836e-01', # noqa
-'ica.f      = 6                          dot = -2.15435819790876573e-02', # noqa
-'ik.x       = 7                          dot = -1.25154369264425316e-02', # noqa
-'ica.Ca_i   = 8                          dot = -5.63431267451130036e-01', # noqa                                       ^ ^^    ^ ---------   ^
+'membrane.V = -40                        dot =  3.03469590344436094e+07', # noqa
+'ina.m      = 2                          dot = -1.05478017767301395e+01', # noqa
+'ina.h      =  5.36467458567856738e+02   dot = -2.46776607600654586e+02', # noqa
+'ina.j      = 4                          dot = -3.72528160028099076e-01', # noqa
+'ica.d      = 5                          dot = -1.69660729614147049e-01', # noqa
+'ica.f      = 6                          dot = -6.23551094458582103e-02', # noqa
+'ik.x       = 7                          dot = -1.18521143826784449e-02', # noqa
+'ica.Ca_i   = 8                          dot = -5.52361267451130011e-01', # noqa
         ]
         for a, b in zip(x, y):
             self.assertTrue(almost_equal(a, b))
@@ -664,7 +664,7 @@ class ModelTest(unittest.TestCase):
         out = m.format_state_derivatives(
             state1, precision=myokit.SINGLE_PRECISION).splitlines()
         self.assertEqual(len(out), 8)
-        self.assertEqual(out[0][:15], 'membrane.V = 1 ')
+        self.assertEqual(out[0][:16], 'membrane.V = -40')
         self.assertEqual(out[1][:15], 'ina.m      = 2 ')
         self.assertEqual(out[2][:29], 'ina.h      =  5.364674586e+02')
         self.assertEqual(out[3][:15], 'ina.j      = 4 ')
@@ -673,18 +673,18 @@ class ModelTest(unittest.TestCase):
         self.assertEqual(out[6][:15], 'ik.x       = 7 ')
         self.assertEqual(out[7][:15], 'ica.Ca_i   = 8 ')
         out = [x[x.index('dot') + 6:] for x in out]
-        self.assertEqual(out[0][:8], ' 1.90853')
-        self.assertEqual(out[1][:8], '-1.56738')
-        self.assertEqual(out[2][:8], '-3.05729')
-        self.assertEqual(out[3][:8], '-1.15731')
-        self.assertEqual(out[4][:8], '-1.85001')
-        self.assertEqual(out[5][:8], '-2.15435')
-        self.assertEqual(out[6][:8], '-1.25154')
-        self.assertEqual(out[7][:8], '-5.63431')
+        self.assertEqual(out[0][:8], ' 3.03469')
+        self.assertEqual(out[1][:8], '-1.05478')
+        self.assertEqual(out[2][:8], '-2.46776')
+        self.assertEqual(out[3][:8], '-3.72528')
+        self.assertEqual(out[4][:8], '-1.69660')
+        self.assertEqual(out[5][:8], '-6.23551')
+        self.assertEqual(out[6][:8], '-1.18521')
+        self.assertEqual(out[7][:8], '-5.52361')
         self.assertEqual(out[0][12:], 'e+07')
         self.assertEqual(out[1][12:], 'e+01')
-        self.assertEqual(out[2][12:], 'e+03')
-        self.assertEqual(out[3][12:], 'e+00')
+        self.assertEqual(out[2][12:], 'e+02')
+        self.assertEqual(out[3][12:], 'e-01')
         self.assertEqual(out[4][12:], 'e-01')
         self.assertEqual(out[5][12:], 'e-02')
         self.assertEqual(out[6][12:], 'e-02')

myokit/tests/test_parsing.py

@@ -697,6 +697,25 @@ class PhasedParseTest(unittest.TestCase):
         self.assertRaisesRegex(
             myokit.ParseError, 'Duplicate variable unit', p, code)
 
+        # Invalid use of condition
+        code = (
+            '[[model]]',
+            '[x]',
+            't = 0 bind time',
+            'x = 3 == 2',
+        )
+        self.assertRaisesRegex(
+            myokit.ParseError, 'not be a condition', p, code)
+        code = (
+            '[[model]]',
+            'x.y = 1 < 2',
+            '[x]',
+            't = 0 bind time',
+            'dot(y) = 1',
+        )
+        self.assertRaisesRegex(
+            myokit.ParseError, 'not be a condition', p, code)
+
     def test_parse_unit(self):
         # Test :meth:`parse_unit` and :meth:`parse_unit_string`.
         from myokit._parsing import parse_unit_string as p

{myokit-1.36.0.dist-info → myokit-1.37.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: myokit
-Version: 1.36.0
+Version: 1.37.0
 Summary: A modeling and simulation tool for cardiac cellular electrophysiology
 Home-page: http://myokit.org
 Author: Michael Clerx