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

myokit/tests/test_formats_cuda.py

@@ -0,0 +1,226 @@
+#!/usr/bin/env python3
+#
+# Tests the expression writer for CUDA.
+#
+# This file is part of Myokit.
+# See http://myokit.org for copyright, sharing, and licensing details.
+#
+import unittest
+
+import myokit
+import myokit.formats.cuda
+
+from myokit import (
+    Number, PrefixPlus, PrefixMinus, Plus, Minus,
+    Multiply, Divide, Quotient, Remainder, Power, Sqrt,
+    Exp, Log, Log10, Sin, Cos, Tan, ASin, ACos, ATan, Floor, Ceil, Abs,
+    Not, And, Or, Equal, NotEqual, More, Less, MoreEqual, LessEqual,
+    If, Piecewise,
+)
+
+import myokit.tests
+
+
+class CudaExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
+    """
+    Test conversion to Ansi C, as used by the Simulation.
+    Numerical tests are provided by composing and evaluating a single RHS.
+    """
+    _name = 'cuda'
+    _target = myokit.formats.cuda.CudaExpressionWriter
+
+    def test_number(self):
+        self.eq(Number(1), '1.0f')
+        self.eq(Number(-2), '-2.0f')
+        self.eq(Number(13, 'mV'), '13.0f')
+
+    def test_number_double(self):
+        w = self._target(precision=myokit.DOUBLE_PRECISION)
+        self.assertEqual(w.ex(Number(1)), '1.0')
+        self.assertEqual(w.ex(Number(-2)), '-2.0')
+        self.assertEqual(w.ex(Number(13, 'mV')), '13.0')
+
+    def test_name(self):
+        self.eq(self.a, 'a')
+        w = self._target()
+        w.set_lhs_function(lambda v: v.var().qname().upper())
+        self.assertEqual(w.ex(self.a), 'COMP.A')
+
+    def test_derivative(self):
+        self.eq(myokit.Derivative(self.a), 'dot(a)')
+
+    def test_partial_derivative(self):
+        self.assertRaisesRegex(
+            NotImplementedError, 'Partial',
+            self.w.ex, myokit.PartialDerivative(self.a, self.b))
+
+    def test_initial_value(self):
+        self.assertRaisesRegex(
+            NotImplementedError, 'Initial',
+            self.w.ex, myokit.InitialValue(self.a))
+
+    def test_prefix_plus_minus(self):
+        # Inherited from c-based
+
+        p = Number(11, 'kV')
+        self.eq(PrefixPlus(p), '+11.0f')
+        self.eq(PrefixPlus(PrefixPlus(p)), '+(+11.0f)')
+        self.eq(PrefixPlus(PrefixPlus(PrefixPlus(p))), '+(+(+11.0f))')
+        self.eq(PrefixPlus(Number('+1')), '+1.0f')
+        self.eq(PrefixMinus(p), '-11.0f')
+        self.eq(PrefixMinus(PrefixMinus(p)), '-(-11.0f)')
+        self.eq(PrefixMinus(Number(-1)), '-(-1.0f)')
+        self.eq(PrefixMinus(PrefixMinus(Number(-2))), '-(-(-2.0f))')
+
+        # Test with operators of precedence SUM, PRODUCT
+        a, b, c = self.abc
+        self.eq(PrefixPlus(Plus(a, b)), '+(a + b)')
+        self.eq(Divide(PrefixPlus(Plus(a, b)), c), '+(a + b) / c')
+        self.eq(PrefixPlus(Divide(b, a)), '+(b / a)')
+        self.eq(PrefixMinus(Minus(a, b)), '-(a - b)')
+        self.eq(Multiply(PrefixMinus(Plus(b, a)), c), '-(b + a) * c')
+        self.eq(PrefixMinus(Divide(b, a)), '-(b / a)')
+
+    def test_prefix_plus_minus_double(self):
+        # Inherited from c-based
+
+        w = self._target(precision=myokit.DOUBLE_PRECISION)
+        p = Number(3, 'mA')
+        self.assertEqual(w.ex(PrefixPlus(p)), '+3.0')
+        self.assertEqual(w.ex(PrefixPlus(PrefixPlus(p))), '+(+3.0)')
+        self.assertEqual(
+            w.ex(PrefixPlus(PrefixPlus(PrefixPlus(p)))), '+(+(+3.0))')
+        self.assertEqual(w.ex(PrefixPlus(Number('+1'))), '+1.0')
+        self.assertEqual(w.ex(PrefixMinus(p)), '-3.0')
+        self.assertEqual(w.ex(PrefixMinus(PrefixMinus(p))), '-(-3.0)')
+        self.assertEqual(w.ex(PrefixMinus(Number(-1))), '-(-1.0)')
+        self.assertEqual(
+            w.ex(PrefixMinus(PrefixMinus(Number(-2)))), '-(-(-2.0))')
+
+    def test_arithmetic(self):
+        # Inherited from c-based
+
+        a, b, c = self.abc
+        self.eq(Minus(Plus(a, b), c), 'a + b - c')
+        self.eq(Minus(a, Plus(b, c)), 'a - (b + c)')
+        self.eq(Multiply(Minus(a, b), c), '(a - b) * c')
+        self.eq(Multiply(a, Plus(b, c)), 'a * (b + c)')
+        self.eq(Minus(Multiply(a, b), c), 'a * b - c')
+        self.eq(Divide(a, Minus(b, c)), 'a / (b - c)')
+        self.eq(Plus(Divide(a, b), c), 'a / b + c')
+        self.eq(Divide(Divide(a, b), c), 'a / b / c')
+
+    def test_quotient_remainder(self):
+        # Inherited from c-based
+
+        a, b, c = self.abc
+        self.eq(Quotient(a, Divide(b, c)), 'floorf(a / (b / c))')
+        self.eq(Remainder(Plus(a, c), b), '(a + c - b * floorf((a + c) / b))')
+        self.eq(Divide(c, Remainder(b, a)), 'c / ((b - a * floorf(b / a)))')
+
+    def test_quotient_remainder_double(self):
+        w = self._target(precision=myokit.DOUBLE_PRECISION)
+        a, b, c = self.abc
+        self.assertEqual(w.ex(Quotient(a, b)), 'floor(comp.a / comp.b)')
+
+    def test_power(self):
+        a, b, c = self.abc
+        self.eq(Power(a, b), 'powf(a, b)')
+        self.eq(Power(Power(a, b), c), 'powf(powf(a, b), c)')
+        self.eq(Power(a, Power(b, c)), 'powf(a, powf(b, c))')
+
+        self.eq(Power(Plus(a, b), c), 'powf(a + b, c)')
+        self.eq(Power(a, Minus(b, c)), 'powf(a, b - c)')
+        self.eq(Power(Multiply(a, b), c), 'powf(a * b, c)')
+        self.eq(Power(a, Divide(b, c)), 'powf(a, b / c)')
+
+    def test_power_double(self):
+        w = self._target(precision=myokit.DOUBLE_PRECISION)
+        a, b, c = self.abc
+        self.assertEqual(w.ex(Power(a, b)), 'pow(comp.a, comp.b)')
+        self.assertEqual(w.ex(Power(Plus(a, b), c)),
+                         'pow(comp.a + comp.b, comp.c)')
+
+    def test_log(self):
+        a, b = self.ab
+        self.eq(Log(a), 'logf(a)')
+        self.eq(Log10(a), 'log10f(a)')
+        self.eq(Log(a, b), '(logf(a) / logf(b))')
+
+    def test_log_double(self):
+        w = self._target(precision=myokit.DOUBLE_PRECISION)
+        a, b = self.ab
+        self.assertEqual(w.ex(Log(a)), 'log(comp.a)')
+        self.assertEqual(w.ex(Log10(b)), 'log10(comp.b)')
+        self.assertEqual(w.ex(Log(b, a)), '(log(comp.b) / log(comp.a))')
+
+    def test_functions(self):
+        a = self.a
+        self.eq(Sqrt(self.a), 'sqrtf(a)')
+        self.eq(Exp(self.a), 'expf(a)')
+        self.eq(Sin(self.a), 'sinf(a)')
+        self.eq(Cos(self.a), 'cosf(a)')
+        self.eq(Tan(self.a), 'tanf(a)')
+        self.eq(ASin(self.a), 'asinf(a)')
+        self.eq(ACos(self.a), 'acosf(a)')
+        self.eq(ATan(self.a), 'atanf(a)')
+        self.eq(Floor(self.a), 'floorf(a)')
+        self.eq(Ceil(self.a), 'ceilf(a)')
+        self.eq(Abs(self.a), 'fabsf(a)')
+
+    def test_functions_double(self):
+        w = self._target(precision=myokit.DOUBLE_PRECISION)
+        self.assertEqual(w.ex(Sqrt(self.a)), 'sqrt(comp.a)')
+        self.assertEqual(w.ex(Exp(self.a)), 'exp(comp.a)')
+        self.assertEqual(w.ex(Sin(self.a)), 'sin(comp.a)')
+        self.assertEqual(w.ex(Cos(self.a)), 'cos(comp.a)')
+        self.assertEqual(w.ex(Tan(self.a)), 'tan(comp.a)')
+        self.assertEqual(w.ex(ASin(self.a)), 'asin(comp.a)')
+        self.assertEqual(w.ex(ACos(self.a)), 'acos(comp.a)')
+        self.assertEqual(w.ex(ATan(self.a)), 'atan(comp.a)')
+        self.assertEqual(w.ex(Floor(self.a)), 'floor(comp.a)')
+        self.assertEqual(w.ex(Ceil(self.a)), 'ceil(comp.a)')
+        self.assertEqual(w.ex(Abs(self.a)), 'fabs(comp.a)')
+
+    def test_conditions(self):
+        # 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))')
+
+        self.eq(Equal(a, b), '(a == b)')
+        self.eq(NotEqual(a, b), '(a != b)')
+        self.eq(More(b, a), '(b > a)')
+        self.eq(Less(d, c), '(d < c)')
+        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(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
+
+        a, b, c, d = self.abcd
+        self.eq(If(Equal(a, b), d, c), '((a == b) ? d : c)')
+        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.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

@@ -11,6 +11,15 @@ import unittest
 import myokit
 import myokit.formats
 import myokit.formats.easyml
+import myokit.tests
+
+from myokit import (
+    Number, PrefixPlus, PrefixMinus, Plus, Minus,
+    Multiply, Divide, Quotient, Remainder, Power, Sqrt,
+    Exp, Log, Log10, Sin, Cos, Tan, ASin, ACos, ATan, Floor, Ceil, Abs,
+    Not, And, Or, Equal, NotEqual, More, Less, MoreEqual, LessEqual,
+    If, Piecewise,
+)
 
 from myokit.tests import TemporaryDirectory, WarningCollector, DIR_DATA
 
@@ -247,164 +256,172 @@ class EasyMLExporterTest(unittest.TestCase):
         self.assertTrue(e.supports_model())
 
 
-class EasyMLExpressionWriterTest(unittest.TestCase):
-    """ Tests EasyML expression writer functionality. """
-
-    def test_all(self):
-        w = myokit.formats.ewriter('easyml')
-
-        model = myokit.Model()
-        component = model.add_component('c')
-        avar = component.add_variable('a')
-
-        # Name
-        a = myokit.Name(avar)
-        self.assertEqual(w.ex(a), 'c.a')
-        # Number with unit
-        b = myokit.Number('12', 'pF')
-        self.assertEqual(w.ex(b), '12.0')
-        # Integer
-        c = myokit.Number(1)
-        self.assertEqual(w.ex(c), '1.0')
-        # Integer
-
-        # Prefix plus
-        x = myokit.PrefixPlus(b)
-        self.assertEqual(w.ex(x), '12.0')
-        # Prefix minus
-        x = myokit.PrefixMinus(b)
-        self.assertEqual(w.ex(x), '(-12.0)')
-
-        # Plus
-        x = myokit.Plus(a, b)
-        self.assertEqual(w.ex(x), 'c.a + 12.0')
-        # Minus
-        x = myokit.Minus(a, b)
-        self.assertEqual(w.ex(x), 'c.a - 12.0')
-        # Multiply
-        x = myokit.Multiply(a, b)
-        self.assertEqual(w.ex(x), 'c.a * 12.0')
-        # Divide
-        x = myokit.Divide(a, b)
-        self.assertEqual(w.ex(x), 'c.a / 12.0')
-
-        # 1 - exp() and exp() - 1
-        x = myokit.Minus(myokit.Exp(myokit.Number(2)), myokit.Number(1))
-        self.assertEqual(w.ex(x), 'expm1(2.0)')
-        x = myokit.Minus(myokit.Number(1), myokit.Exp(myokit.Number(3)))
-        self.assertEqual(w.ex(x), '-expm1(3.0)')
-
-        # Quotient
-        x = myokit.Quotient(a, b)
+class EasyMLExpressionWriterTest(myokit.tests.ExpressionWriterTestCase):
+    """ Test conversion to EasyML syntax. """
+    _name = 'easyml'
+    _target = myokit.formats.easyml.EasyMLExpressionWriter
+
+    def test_number(self):
+        self.eq(Number(1), '1.0')
+        self.eq(Number(-2), '-2.0')
+        self.eq(Number(13, 'mV'), '13.0')
+
+    def test_name(self):
+        # Inherited from CBasedExpressionWriter
+        self.eq(self.a, 'a')
+        w = self._target()
+        w.set_lhs_function(lambda v: v.var().qname().upper())
+        self.assertEqual(w.ex(self.a), 'COMP.A')
+
+    def test_derivative(self):
+        # Inherited from CBasedExpressionWriter
+        self.eq(myokit.Derivative(self.a), 'dot(a)')
+
+    def test_partial_derivative(self):
+        e = myokit.PartialDerivative(self.a, self.b)
+        self.assertRaisesRegex(NotImplementedError, 'Partial', self.w.ex, e)
+
+    def test_initial_value(self):
+        e = myokit.InitialValue(self.a)
+        self.assertRaisesRegex(NotImplementedError, 'Initial', self.w.ex, e)
+
+    def test_prefix_plus_minus(self):
+        # Inherited from CBasedExpressionWriter
+        p = Number(11, 'kV')
+        a, b, c = self.abc
+        self.eq(PrefixPlus(p), '+11.0')
+        self.eq(PrefixPlus(PrefixPlus(PrefixPlus(p))), '+(+(+11.0))')
+        self.eq(Divide(PrefixPlus(Plus(a, b)), c), '+(a + b) / c')
+        self.eq(PrefixMinus(p), '-11.0')
+        self.eq(PrefixMinus(PrefixMinus(p)), '-(-11.0)')
+        self.eq(PrefixMinus(Number(-1)), '-(-1.0)')
+        self.eq(PrefixMinus(Minus(a, b)), '-(a - b)')
+        self.eq(Multiply(PrefixMinus(Plus(b, a)), c), '-(b + a) * c')
+        self.eq(PrefixMinus(Divide(b, a)), '-(b / a)')
+
+    def test_plus_minus(self):
+        a, b, c = self.abc
+        self.eq(Plus(a, b), 'a + b')
+        self.eq(Plus(Plus(a, b), c), 'a + b + c')
+        self.eq(Plus(a, Plus(b, c)), 'a + (b + c)')
+
+        self.eq(Minus(a, b), 'a - b')
+        self.eq(Minus(Minus(a, b), c), 'a - b - c')
+        self.eq(Minus(a, Minus(b, c)), 'a - (b - c)')
+
+        self.eq(Minus(a, b), 'a - b')
+        self.eq(Plus(Minus(a, b), c), 'a - b + c')
+        self.eq(Minus(a, Plus(b, c)), 'a - (b + c)')
+        self.eq(Minus(Plus(a, b), c), 'a + b - c')
+        self.eq(Minus(a, Plus(b, c)), 'a - (b + c)')
+
+        # Substitution of expm for 1 - exp() and exp() - 1
+        self.eq(Minus(Exp(Number(2)), Number(1)), 'expm1(2.0)')
+        self.eq(Minus(Number(1), Exp(Number(3))), '-expm1(3.0)')
+
+    def test_multiply_divide(self):
+        # Inherited from CBasedExpressionWriter
+        a, b, c = self.abc
+        self.eq(Multiply(a, b), 'a * b')
+        self.eq(Multiply(Multiply(a, b), c), 'a * b * c')
+        self.eq(Multiply(a, Multiply(b, c)), 'a * (b * c)')
+        self.eq(Divide(a, b), 'a / b')
+        self.eq(Divide(Divide(a, b), c), 'a / b / c')
+        self.eq(Divide(a, Divide(b, c)), 'a / (b / c)')
+
+    def test_quotient(self):
+        # Inherited from CBasedExpressionWriter
+        a, b, c = self.abc
+        with WarningCollector():
+            self.eq(Quotient(a, b), 'floor(a / b)')
+            self.eq(Quotient(Plus(a, c), b), 'floor((a + c) / b)')
+            self.eq(Quotient(Divide(a, c), b), 'floor(a / c / b)')
+            self.eq(Quotient(a, Divide(b, c)), 'floor(a / (b / c))')
+            self.eq(Multiply(Quotient(a, b), c), 'floor(a / b) * c')
+            self.eq(Multiply(c, Quotient(a, b)), 'c * (floor(a / b))')
+
+    def test_remainder(self):
+        # Inherited from CBasedExpressionWriter
+        a, b, c = self.abc
+        with WarningCollector():
+            self.eq(Remainder(a, b), '(a - b * floor(a / b))')
+            self.eq(Remainder(Plus(a, c), b),
+                    '(a + c - b * floor((a + c) / b))')
+            self.eq(Multiply(Remainder(a, b), c), '(a - b * floor(a / b)) * c')
+            self.eq(Divide(c, Remainder(b, a)), 'c / ((b - a * floor(b / a)))')
+
+    def test_power(self):
+        # Inherited from CBasedExpressionWriter
+        a, b, c = self.abc
+        self.eq(Power(a, b), 'pow(a, b)')
+        self.eq(Power(Power(a, b), c), 'pow(pow(a, b), c)')
+        self.eq(Power(a, Power(b, c)), 'pow(a, pow(b, c))')
+
+    def test_log(self):
+        # Inherited from CBasedExpressionWriter
+        a, b = self.ab
+        self.eq(Log(a), 'log(a)')
+        self.eq(Log10(a), 'log10(a)')
+        self.eq(Log(a, b), '(log(a) / log(b))')
+
+    def test_functions(self):
+        a, b = self.ab
+
+        self.eq(Sqrt(a), 'sqrt(a)')
+        self.eq(Exp(a), 'exp(a)')
+        self.eq(Cos(a), 'cos(a)')
+        self.eq(ACos(a), 'acos(a)')
+        self.eq(Abs(a), 'fabs(a)')
+
         with WarningCollector() as c:
-            self.assertEqual(w.ex(x), 'floor(c.a / 12.0)')
-        # Remainder
-        x = myokit.Remainder(a, b)
+            self.eq(Sin(a), 'sin(a)')
+        self.assertIn('Unsupported', c.text())
+
         with WarningCollector() as c:
-            self.assertEqual(w.ex(x), 'c.a - 12.0 * (floor(c.a / 12.0))')
-
-        # Power
-        x = myokit.Power(a, b)
-        self.assertEqual(w.ex(x), 'pow(c.a, 12.0)')
-        # Sqrt
-        x = myokit.Sqrt(b)
-        self.assertEqual(w.ex(x), 'sqrt(12.0)')
-        # Exp
-        x = myokit.Exp(a)
-        self.assertEqual(w.ex(x), 'exp(c.a)')
-        # Log(a)
-        x = myokit.Log(b)
-        self.assertEqual(w.ex(x), 'log(12.0)')
-        # Log(a, b)
-        x = myokit.Log(a, b)
-        self.assertEqual(w.ex(x), '(log(c.a) / log(12.0))')
-        # Log10
-        x = myokit.Log10(b)
-        self.assertEqual(w.ex(x), 'log10(12.0)')
-
-        # Sin
+            self.eq(Tan(a), 'tan(a)')
+        self.assertIn('Unsupported', c.text())
+
         with WarningCollector() as c:
-            x = myokit.Sin(b)
-            self.assertEqual(w.ex(x), 'sin(12.0)')
-            # Cos
-            x = myokit.Cos(b)
-            self.assertEqual(w.ex(x), 'cos(12.0)')
-            # Tan
-            x = myokit.Tan(b)
-            self.assertEqual(w.ex(x), 'tan(12.0)')
-            # ASin
-            x = myokit.ASin(b)
-            self.assertEqual(w.ex(x), 'asin(12.0)')
-            # ACos
-            x = myokit.ACos(b)
-            self.assertEqual(w.ex(x), 'acos(12.0)')
-            # ATan
-            x = myokit.ATan(b)
-            self.assertEqual(w.ex(x), 'atan(12.0)')
+            self.eq(ASin(a), 'asin(a)')
+        self.assertIn('Unsupported', c.text())
 
         with WarningCollector() as c:
-            # Floor
-            x = myokit.Floor(b)
-            self.assertEqual(w.ex(x), 'floor(12.0)')
-            # Ceil
-            x = myokit.Ceil(b)
-            self.assertEqual(w.ex(x), 'ceil(12.0)')
-            # Abs
-            x = myokit.Abs(b)
-            self.assertEqual(w.ex(x), 'fabs(12.0)')
-
-        # Equal
-        x = myokit.Equal(a, b)
-        self.assertEqual(w.ex(x), '(c.a == 12.0)')
-        # NotEqual
-        x = myokit.NotEqual(a, b)
-        self.assertEqual(w.ex(x), '(c.a != 12.0)')
-        # More
-        x = myokit.More(a, b)
-        self.assertEqual(w.ex(x), '(c.a > 12.0)')
-        # Less
-        x = myokit.Less(a, b)
-        self.assertEqual(w.ex(x), '(c.a < 12.0)')
-        # MoreEqual
-        x = myokit.MoreEqual(a, b)
-        self.assertEqual(w.ex(x), '(c.a >= 12.0)')
-        # LessEqual
-        x = myokit.LessEqual(a, b)
-        self.assertEqual(w.ex(x), '(c.a <= 12.0)')
-
-        # Not
-        cond1 = myokit.parse_expression('5 > 3')
-        cond2 = myokit.parse_expression('2 < 1')
-        x = myokit.Not(cond1)
-        self.assertEqual(w.ex(x), '!((5.0 > 3.0))')
-        # And
-        x = myokit.And(cond1, cond2)
-        self.assertEqual(w.ex(x), '((5.0 > 3.0) and (2.0 < 1.0))')
-        # Or
-        x = myokit.Or(cond1, cond2)
-        self.assertEqual(w.ex(x), '((5.0 > 3.0) or (2.0 < 1.0))')
-
-        # If
-        x = myokit.If(cond1, a, b)
-        self.assertEqual(w.ex(x), '((5.0 > 3.0) ? c.a : 12.0)')
-        # Piecewise
-        c = myokit.Number(1)
-        x = myokit.Piecewise(cond1, a, cond2, b, c)
-        self.assertEqual(
-            w.ex(x),
-            '((5.0 > 3.0) ? c.a : ((2.0 < 1.0) ? 12.0 : 1.0))')
-
-        # Test without a Myokit expression
-        self.assertRaisesRegex(
-            ValueError, 'Unknown expression type', w.ex, 7)
-
-    def test_easyml_ewriter_fetching(self):
-
-        # Test fetching using ewriter method
-        w = myokit.formats.ewriter('easyml')
-        self.assertIsInstance(w, myokit.formats.easyml.EasyMLExpressionWriter)
+            self.eq(ATan(a), 'atan(a)')
+        self.assertIn('Unsupported', c.text())
+
+        with WarningCollector() as c:
+            self.eq(Floor(a), 'floor(a)')
+        self.assertIn('Unsupported', c.text())
+
+        with WarningCollector() as c:
+            self.eq(Ceil(a), 'ceil(a)')
+        self.assertIn('Unsupported', c.text())
+
+    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(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(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
+        a, b, c, d = self.abcd
+        self.eq(If(Equal(a, b), d, c), '((a == b) ? d : c)')
+        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__':
     unittest.main()
-

myokit/tests/{test_formats_exporters.py → test_formats_exporters_run.py}

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Tests the exporters from the format module.
+# Tests that exporters run: doesn't check output
 #
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
@@ -95,74 +95,6 @@ class ExportTest(unittest.TestCase):
                 raise Exception(
                     'No types of export supported by: ' + exporter)
 
-    def test_runnable_exporter_shared(self):
-        # Test shared functionality of the TemplatedRunnableExporters.
-
-        e = myokit.formats.exporter('ansic')
-
-        # Load model, protocol
-        m, p, x = myokit.load('example')
-
-        # Create empty output directory as subdirectory of DIR_OUT
-        with TemporaryDirectory() as d:
-            path = d.path()
-
-            # Simple export
-            dpath = os.path.join(path, 'runnable1')
-            ret = e.runnable(dpath, m)
-            self.assertIsNone(ret)
-            self.assertTrue(os.path.isdir(dpath))
-            self.assertTrue(len(os.listdir(dpath)) > 0)
-
-            # Write to complex path
-            dpath = os.path.join(path, 'runnable2', 'nest', 'test')
-            ret = e.runnable(dpath, m, p)
-            self.assertIsNone(ret)
-            self.assertTrue(os.path.isdir(dpath))
-            self.assertTrue(len(os.listdir(dpath)) > 0)
-
-            # Overwrite existing path
-            ret = e.runnable(dpath, m, p)
-            self.assertIsNone(ret)
-            self.assertTrue(os.path.isdir(dpath))
-            self.assertTrue(len(os.listdir(dpath)) > 0)
-
-            # Path pointing to file
-            dpath = os.path.join(path, 'file')
-            with open(dpath, 'w') as f:
-                f.write('contents\n')
-            self.assertRaisesRegex(
-                myokit.ExportError, 'file exists', e.runnable, dpath, m, p)
-
-            # Directory exists where we're trying to write a file
-            dpath = os.path.join(path, 'runnable3')
-            fname = os.path.join(dpath, 'sim.c')
-            os.makedirs(fname)
-            self.assertRaisesRegex(
-                myokit.ExportError, 'Directory exists',
-                e.runnable, dpath, m, p)
-
-            # Directory embedded in the output file path
-            def embedded():
-                return {'sim.c': 'nested/sim.c'}
-
-            # 1. Normal operation
-            e._dict = embedded
-            dpath = os.path.join(path, 'runnable4')
-            ret = e.runnable(dpath, m, p)
-            self.assertIsNone(ret)
-            self.assertTrue(os.path.isdir(dpath))
-            self.assertTrue(len(os.listdir(dpath)) > 0)
-
-            # 2. Try to create directory where file exists
-            def embedded():
-                return {'sim.c': 'nested/sim.c/som.c'}
-
-            e._dict = embedded
-            dpath = os.path.join(path, 'runnable4')
-            self.assertRaisesRegex(
-                myokit.ExportError, 'file or link', e.runnable, dpath, m, p)
-
     def test_completeness(self):
         # Test that all exporters have a test (so meta!).
 

myokit/tests/test_formats_html.py

@@ -112,9 +112,7 @@ line break.
 
 
 class AsciifierTest(unittest.TestCase):
-    """
-    Tests the method to convert html to ascii.
-    """
+    """ Tests converting HTML to ASCII. """
     def test_asciify(self):
 
         # Compare line by line