Skip to content

support Indexed and IndexedBase #440

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

Merged
jverzani merged 1 commit into from
Oct 13, 2021
Merged

support Indexed and IndexedBase #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 29 additions & 27 deletions src/lambdify.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,34 +43,34 @@ __ZERO__(xs...) = 0
__HEAVISIDE__ = (a...) -> (a[1] < 0 ? 0 : (a[1] > 0 ? 1 : (length(a) > 1 ? a[2] : NaN)))
# __SYMPY__ALL__,
fn_map = Dict(
"Add" => :+,
"Sub" => :-,
"Mul" => :*, # :(SymPy.__PROD__)
"Div" => :/,
"Pow" => :^,
"re" => :real,
"im" => :imag,
"Abs" => :abs,
"Min" => :min,
"Max" => :max,
"Poly" => :identity,
"Piecewise" => :(SymPy._piecewise),
"Order" => :(SymPy.__ZERO__), # :(as...) -> 0,
"And" => :(SymPy.__ALL__), #:((as...) -> all(as)), #:(&),
"Or" => :(SymPy.__ANY__), #:((as...) -> any(as)), #:(|),
"Less" => :(<),
"LessThan" => :(<=),
"StrictLessThan" => :(<),
"Equal" => :(==),
"Equality" => :(==),
"Unequality" => :(!==),
"StrictGreaterThan" => :(>),
"GreaterThan" => :(>=),
"Greater" => :(>),
"Add" => :+,
"Sub" => :-,
"Mul" => :*, # :(SymPy.__PROD__)
"Div" => :/,
"Pow" => :^,
"re" => :real,
"im" => :imag,
"Abs" => :abs,
"Min" => :min,
"Max" => :max,
"Poly" => :identity,
"Piecewise" => :(SymPy._piecewise),
"Order" => :(SymPy.__ZERO__), # :(as...) -> 0,
"And" => :(SymPy.__ALL__), #:((as...) -> all(as)), #:(&),
"Or" => :(SymPy.__ANY__), #:((as...) -> any(as)), #:(|),
"Less" => :(<),
"LessThan" => :(<=),
"StrictLessThan" => :(<),
"Equal" => :(==),
"Equality" => :(==),
"Unequality" => :(!==),
"StrictGreaterThan" => :(>),
"GreaterThan" => :(>=),
"Greater" => :(>),
"conjugate" => :conj,
"atan2" => :atan,
"Heaviside" => :(SymPy.__HEAVISIDE__)
)
"Heaviside" => :(SymPy.__HEAVISIDE__),
)

map_fn(key, fn_map) = haskey(fn_map, key) ? fn_map[key] : Symbol(key)

Expand All @@ -89,7 +89,7 @@ function walk_expression(ex; values=Dict(), fns=Dict())
return walk_expression(rhs(ex), values=values, fns=fns)
end

if fn == "Symbol" || fn == "Dummy"
if fn == "Symbol" || fn == "Dummy" || fn == "IndexedBase"
str_ex = string(ex)
return get(vals_map, str_ex, Symbol(str_ex))
elseif fn in ["Integer" , "Float"]
Expand All @@ -104,6 +104,8 @@ function walk_expression(ex; values=Dict(), fns=Dict())
return (val, walk_expression(cond, values=values, fns=fns))
elseif fn == "Tuple"
return walk_expression.(Introspection.args(ex), values=values, fns=fns)
elseif fn == "Indexed"
return Expr(:ref, [walk_expression(a, values=values, fns=fns) for a in Introspection.args(ex)]...)
elseif haskey(vals_map, fn)
return vals_map[fn]
end
Expand Down
2 changes: 2 additions & 0 deletions test/tests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,3 +809,5 @@ end
@test limit(ceil(x), x=>0, dir="+") != limit(ceil(x), x=>0, dir="-")
@test limit(floor(x), x=>0, dir="+") != limit(floor(x), x=>0, dir="-")
end

@test SymPy.convert_expr(sympy.Indexed(sympy.IndexedBase(:x), 1, -2)) == :(x[1, -2])