Skip to content

Fix anonymous definition #44

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
merged 1 commit into from
Sep 20, 2018
Merged

Fix anonymous definition #44

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
10 changes: 5 additions & 5 deletions src/macros.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ macro ode_def(name,ex,params...)
:build_hes => false,
:build_invhes => false,
:build_dpfuncs => true)
name isa Expr ? ode_def_opts(gensym(),opts,name,params...) :
name isa Expr ? ode_def_opts(gensym(),opts,name,ex,params...) :
ode_def_opts(name,opts,ex,params...)
end

Expand All @@ -22,7 +22,7 @@ macro ode_def_bare(name,ex,params...)
:build_hes => false,
:build_invhes => false,
:build_dpfuncs => false)
name isa Expr ? ode_def_opts(gensym(),opts,name,params...) :
name isa Expr ? ode_def_opts(gensym(),opts,name,ex,params...) :
ode_def_opts(name,opts,ex,params...)
end

Expand All @@ -36,7 +36,7 @@ macro ode_def_nohes(name,ex,params...)
:build_hes => false,
:build_invhes => false,
:build_dpfuncs => true)
name isa Expr ? ode_def_opts(gensym(),opts,name,params...) :
name isa Expr ? ode_def_opts(gensym(),opts,name,ex,params...) :
ode_def_opts(name,opts,ex,params...)
end

Expand All @@ -50,7 +50,7 @@ macro ode_def_noinvhes(name,ex,params...)
:build_hes => false,
:build_invhes => false,
:build_dpfuncs => true)
name isa Expr ? ode_def_opts(gensym(),opts,name,params...) :
name isa Expr ? ode_def_opts(gensym(),opts,name,ex,params...) :
ode_def_opts(name,opts,ex,params...)
end

Expand All @@ -64,6 +64,6 @@ macro ode_def_noinvjac(name,ex,params...)
:build_hes => false,
:build_invhes => false,
:build_dpfuncs => true)
name isa Expr ? ode_def_opts(gensym(),opts,name,params...) :
name isa Expr ? ode_def_opts(gensym(),opts,name,ex,params...) :
ode_def_opts(name,opts,ex,params...)
end
6 changes: 6 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,12 @@ end a b c d

@test DiffEqBase.__has_syms(f_t_noname)

f = @ode_def begin
dx = a*x - b*x*y
dy = -c*y + d*x*y
end a b c d
@test_nowarn f([0.1,0.2], [1,2], [1,2,3,4], 1)

println("Make the problems in the problem library build")

using DiffEqProblemLibrary
Expand Down