Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix custom function handling in sympy solve visitor #1563

Merged
merged 2 commits into from
Dec 3, 2024
Merged

Fix custom function handling in sympy solve visitor #1563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1c0383
Fix issue with sympy integrator
JCGoran Dec 3, 2024
469e3f1
Add test
JCGoran Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion python/nmodl/ode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,10 +543,12 @@ def integrate2c(diff_string, dt_var, vars, use_pade_approx=False):
if _a1 == 0 and _a2 == 0:
solution = _a0

custom_fcts = {str(f.func): str(f.func) for f in solution.atoms(sp.Function)}

# return result as C code in NEURON format:
# - in the lhs x_0 refers to the state var at time (t+dt)
# - in the rhs x_0 refers to the state var at time t
return f"{sp.ccode(x)} = {sp.ccode(solution.evalf())}"
return f"{sp.ccode(x)} = {sp.ccode(solution.evalf(), user_functions=custom_fcts)}"


def forwards_euler2c(diff_string, dt_var, vars, function_calls):
Expand Down
2 changes: 2 additions & 0 deletions test/unit/ode/test_ode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ def test_integrate2c():
("a", "x + a*dt"),
("a*x", "x*exp(a*dt)"),
("a*x+b", "(-b + (a*x + b)*exp(a*dt))/a"),
# assume custom_function is defined in mod file
("custom_function(a)*x", "x*exp(custom_function(a)*dt)"),
]
for eq, sol in test_cases:
assert _equivalent(
Expand Down
Loading