fixup

Author: dweindl

petab/v1/math/printer.py

@@ -10,7 +10,7 @@ class PetabStrPrinter(StrPrinter):
     """A PEtab-compatible sympy string-printer."""
 
     #: Mapping of sympy functions to PEtab functions
-    func_map = {
+    _func_map = {
         "asin": "arcsin",
         "acos": "arccos",
         "atan": "arctan",
@@ -51,7 +51,7 @@ def _print_Function(self, expr):
         if expr.func.__name__ == "Piecewise":
             return self._print_Piecewise(expr)
 
-        if func := self.func_map.get(expr.func.__name__):
+        if func := self._func_map.get(expr.func.__name__):
             return f"{func}({', '.join(map(self._print, expr.args))})"
 
         return super()._print_Function(expr)
@@ -61,7 +61,7 @@ def _print_Piecewise(self, expr):
         # merge the tuples and drop the final `True` condition
         str_args = map(
             self._print,
-            islice(chain.from_iterable(expr.args), len(expr.args) - 1),
+            islice(chain.from_iterable(expr.args), 2 * len(expr.args) - 1),
         )
         return f"piecewise({', '.join(str_args)})"
 
@@ -81,8 +81,9 @@ def petab_math_str(expr: sp.Basic | sp.Expr | None) -> str:
     >>> expr = sp.sympify("x**2 + sin(y)")
     >>> petab_math_str(expr)
     'x ^ 2 + sin(y)'
+    >>> expr = sp.sympify("Piecewise((1, x > 0), (0, True))")
     >>> petab_math_str(expr)
-    'x ^ 2 + sin(y)'
+    'piecewise(1, x > 0, 0)'
     """
     if expr is None:
         return ""