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

Jump to bottom

Add support for diffing expressions with indexed vars in differentiate2c #1483

Merged
merged 7 commits into from
Oct 7, 2024
+18 −3
Merged

Add support for diffing expressions with indexed vars in differentiate2c #1483

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bd2fd36
Add support for diffing expressions with indexed vars
JCGoran Sep 30, 2024
edf33a7
Simplify condition
JCGoran Sep 30, 2024
f725f05
Isolate symbol-making
JCGoran Oct 2, 2024
6658bf4
Forgot one
JCGoran Oct 2, 2024
791cb34
Merge branch 'master' into jelic/diff_indexed
JCGoran Oct 3, 2024
4b680e9
Resolve stupid merge conflicts
JCGoran Oct 3, 2024
2c693fc
Okay I don't really need `make_symbols` after all
JCGoran Oct 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
5 changes: 4 additions & 1 deletion python/nmodl/ode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,10 @@ def differentiate2c(expression, dependent_var, vars, prev_expressions=None):
vars = set(vars)
vars.discard(dependent_var)
# declare all other supplied variables
sympy_vars = {var: sp.symbols(var, real=True) for var in vars}
sympy_vars = {
str(var): (sp.symbols(var, real=True) if isinstance(var, str) else var)
for var in vars
}
sympy_vars[dependent_var] = x

# parse string into SymPy equation
Expand Down
15 changes: 14 additions & 1 deletion test/unit/ode/test_ode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ def _equivalent(
"""
lhs = lhs.replace("pow(", "Pow(")
rhs = rhs.replace("pow(", "Pow(")
sympy_vars = {var: sp.symbols(var, real=True) for var in vars}
sympy_vars = {
str(var): (sp.symbols(var, real=True) if isinstance(var, str) else var)
for var in vars
}
JCGoran marked this conversation as resolved.
Show resolved Hide resolved
for l, r in zip(lhs.split("=", 1), rhs.split("=", 1)):
eq_l = sp.sympify(l, locals=sympy_vars)
eq_r = sp.sympify(r, locals=sympy_vars)
Expand Down Expand Up @@ -100,6 +103,16 @@ def test_differentiate2c():
"g",
)

assert _equivalent(
differentiate2c(
"(s[0] + s[1])*(z[0]*z[1]*z[2])*x",
"x",
{sp.IndexedBase("s", shape=[1]), sp.IndexedBase("z", shape=[1])},
),
"(s[0] + s[1])*(z[0]*z[1]*z[2])",
{sp.IndexedBase("s", shape=[1]), sp.IndexedBase("z", shape=[1])},
)


def test_integrate2c():

Expand Down
Loading