Sympy 1 10 (#237)

Fixed tests to pass with sympy 1.10 and required latest cellmlmanip, which also workes with sympy1.10. Updated sympy requirement to be >=1.9, < 1.11

Author: MauriceHendrix

RELEASE.md

@@ -1,7 +1,10 @@
+# Release 0.9.6
+- Fixed tests to pass with sympy 1.10 and required latest cellmlmanip, which also workes with sympy1.10. Updated sympy requirement to be >=1.9, < 1.11
+
 # Release 0.9.5
 - Corrected a type in the generated output for `--rush-larsen-c`
 - Updated the help text to no longer imply that CellML files can be converted from remote URIs (a local file is required)
-- Fixed required sympy version to be < 1.10 since the jacobean generation has in sympy1.10 changed and makes chaste_codegen tests fail
+- Fixed required sympy version to be < 1.9 since the jacobean generation has in sympy1.10 changed and makes chaste_codegen tests fail
 
 # Release 0.9.4
 - This version drops python 3.5 support. The reason for this is python 3.5 is end of life and the chase project will soon be dropping support.

chaste_codegen/_chaste_printer.py

@@ -140,9 +140,19 @@ def _print_ternary(self, cond, expr):
         parts += ') : ('
         return parts
 
+    def _print_IntegerConstant(self, expr):
+        return cxxcode(int(expr), standard='C++11')
+
     def _print_float(self, expr):
         """ Handles ``float``s. """
-        return cxxcode(expr, standard='C++11')
+        if expr.is_integer():
+            return cxxcode(int(expr), standard='C++11')
+        else:
+            return cxxcode(expr, standard='C++11')
+
+    def _print_int(self, expr):
+        """ Handles ``ints``s. """
+        return cxxcode(int(expr), standard='C++11')
 
     def _print_ITE(self, expr):
         """ Handles ITE (if then else) objects by rewriting them as Piecewise """

chaste_codegen/_partial_eval.py

@@ -5,8 +5,12 @@
     Float,
     Piecewise,
     cse,
+    exp,
     piecewise_fold,
 )
+from sympy.core import Symbol
+
+from chaste_codegen._math_functions import exp_
 
 
 def get_usage_count(equations):
@@ -32,10 +36,12 @@ def fold_piecewises(expr):
     # Since piecewise_fold hangs with some complicated nestings, due to simplification we use the following workaround:
     # First extract common terms, perform piecewise_fold, re-insert the common terms
     # see: https://github.com/sympy/sympy/issues/20850
+    expr = expr.replace(exp, exp_)
     common_terms, expr = cse(expr)
     expr = piecewise_fold(expr[0])
     for term, ex in reversed(common_terms):
         expr = expr.xreplace({term: ex})
+    expr = expr.replace(exp_, exp)
     return expr
 
 
@@ -45,11 +51,11 @@ def partial_eval(equations, required_lhs, keep_multiple_usages=True):
     :param equations: the equations to partially evaluate
     :param required_lhs: variables which which the defining equation is kept and not substituted
     :param keep_multiple_usages: if a variable is used multiple times keep its defining equation
-    :return: the equations wit defining equations substituted in to create a minimal set of equations
+    :return: the equations with defining equations substituted in to create a minimal set of equations
     """
 
     assert all(map(lambda eq: isinstance(eq, Eq), equations)), "Expecting equations to be a collection of equations"
-    assert all(map(lambda v: isinstance(v, Variable) or isinstance(v, Derivative), required_lhs)), \
+    assert all(map(lambda v: isinstance(v, (Variable, Derivative, Symbol)), required_lhs)), \
         "Expecting required_lhs to be a collection of variables or derivatives"
 
     evaluated_eqs = []
@@ -71,6 +77,5 @@ def partial_eval(equations, required_lhs, keep_multiple_usages=True):
             if not keep_multiple_usages:
                 subs_dict[eq.lhs] = new_rhs
             evaluated_eqs.append(Eq(eq.lhs, new_rhs))
-
     return evaluated_eqs