WIP: fix symbolic function expansions

Deltares · Feb 18, 2025 · af52198 · af52198
1 parent d25610b
commit af52198
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/rtctools/_internal/casadi_helpers.py b/src/rtctools/_internal/casadi_helpers.py
@@ -5,12 +5,12 @@
 logger = logging.getLogger("rtctools")
 
 
-def is_affine(e, v):
+def is_affine(expr, symbols):
     try:
-        Af = ca.Function("f", [v], [ca.jacobian(e, v)]).expand()
-    except RuntimeError as e:
-        if "'eval_sx' not defined for" in str(e):
-            Af = ca.Function("f", [v], [ca.jacobian(e, v)])
+        Af = ca.Function("f", [symbols], [ca.jacobian(expr, symbols)]).expand()
+    except RuntimeError as error:
+        if "'eval_sx' not defined for" in str(error):
+            Af = ca.Function("f", [symbols], [ca.jacobian(expr, symbols)])
         else:
             raise
     return Af.sparsity_jac(0, 0).nnz() == 0

diff --git a/src/rtctools/optimization/collocated_integrated_optimization_problem.py b/src/rtctools/optimization/collocated_integrated_optimization_problem.py
@@ -939,7 +939,7 @@ def _interpolate_constant_inputs(variables, raw_constant_inputs):
                     )
                 except RuntimeError as e:
                     # We only expect to fail if the DAE was an external function
-                    if "'eval_sx' not defined for External" in str(e):
+                    if "'eval_sx' not defined for" in str(e):
                         pass
                     else:
                         raise