merge inhomogeneous and propagator singularity handling

Author: C.A.P. Linssen

odetoolbox/analytic_integrator.py

@@ -91,6 +91,29 @@ def __init__(self, solver_dict, spike_times: Optional[Dict[str, List[float]]] =
 
 
     def _condition_holds(self, condition_string) -> bool:
+        r"""Check boolean conditions of the form:
+
+        ::
+
+           (p_1 && p_2 .. && p_k) || (q_1 && q_2 .. && q_j) || ...
+
+        """
+        for sub_condition_string in condition_string.split("||"):
+            # if any of the subterms hold, the whole expression holds (OR-ed together)
+            if self._and_condition_holds(sub_condition_string):
+                return True
+
+        return False
+
+
+    def _and_condition_holds(self, condition_string) -> bool:
+        r"""Check boolean conditions of the form:
+
+        ::
+
+           p_1 && p_2 .. && p_k
+
+        """
         sub_conditions = condition_string.split("&&")
         for sub_condition_string in sub_conditions:
             sub_condition_string = sub_condition_string.strip().strip("()")
@@ -110,6 +133,7 @@ def _condition_holds(self, condition_string) -> bool:
             sub_condition_holds = equation.subs(self.solver_dict["parameters"])
 
             if not sub_condition_holds:
+                # if any of the subterms do not hold, the whole expression does not hold (AND-ed together)
                 return False
 
         return True

odetoolbox/system_of_shapes.py

@@ -226,6 +226,25 @@ def _generate_propagator_matrix(self, A) -> sympy.Matrix:
 
         return P
 
+    def _merge_conditions(self, solver_dict):
+        r"""merge together conditions (a OR b OR c OR...) if the propagators and update_expressions are the same"""
+
+        for condition, sub_solver_dict in solver_dict["conditions"].items():
+            for condition2, sub_solver_dict2 in solver_dict["conditions"].items():
+                if condition == condition2:
+                    # don't check a condition against itself
+                    continue
+
+                if sub_solver_dict["propagators"] == sub_solver_dict2["propagators"] and sub_solver_dict["update_expressions"] == sub_solver_dict2["update_expressions"]:
+                    # ``condition`` and ``condition2`` can be merged
+                    solver_dict["conditions"]["(" + condition + ") || (" + condition2 + ")"] = sub_solver_dict
+                    solver_dict["conditions"].pop(condition)
+                    solver_dict["conditions"].pop(condition2)
+                    print("\n\n\n\n\n\nwqweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeen\n\n\n\n\n")
+                    return self._merge_conditions(solver_dict)
+
+        return solver_dict
+
     def generate_propagator_solver(self, disable_singularity_detection: bool = False):
         r"""
         Generate the propagator matrix and symbolic expressions for propagator-based updates; return as JSON.
@@ -303,7 +322,7 @@ def generate_propagator_solver(self, disable_singularity_detection: bool = False
                         solver_dict["conditions"][condition_str] = {"propagators": solver_dict_conditional["propagators"],
                                                                     "update_expressions": solver_dict_conditional["update_expressions"]}
 
-                    # XXX: TODO: merge together conditions (a OR b OR c OR...) if the propagators and update_expressions are the same
+                    solver_dict = self._merge_conditions(solver_dict)
 
                     return solver_dict