evaluate / simplify

Author: dweindl

python/sdist/amici/import_utils.py

@@ -509,6 +509,8 @@ def _parse_heaviside_trigger(trigger: sp.Expr) -> sp.Expr:
     :param trigger:
     :return: real valued root function expression
     """
+    trigger = trigger.simplify()
+
     if trigger.is_Relational:
         root = trigger.args[0] - trigger.args[1]
         _check_unsupported_functions(root, "sympy.Expression")

python/sdist/amici/sbml_import.py

@@ -199,6 +199,7 @@ def __init__(
             sbml_version=self.sbml.getVersion(),
             symbol_kwargs={"real": True},
             ignore_units=True,
+            evaluate=True,
         )
 
     @log_execution_time("loading SBML", logger)
@@ -2892,10 +2893,6 @@ def _sympy_from_sbml_math(
                     "contains an unsupported expression: "
                     f"{err}."
                 )
-            # SBML math is currently parsed with evaluate=False, causing
-            #  some problems that are solved by .simplify(), e.g.,
-            #  evaluating constant piecewise conditions
-            expr = expr.simplify()
             # replace special time object by `sbml_time_symbol`
             #  which will later be replaced by `amici_time_symbol`
             expr = expr.replace(TimeSymbol, lambda *args: sbml_time_symbol)