Skip to content

Commit 28e0f6e

Browse files
committed
Update tests
1 parent 31854ed commit 28e0f6e

File tree

2 files changed

+14
-19
lines changed

2 files changed

+14
-19
lines changed

test/ccompile.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ using ModelingToolkit, Test
44
D = Differential(t)
55
eqs = [D(x) ~ a*x - x*y,
66
D(y) ~ -3y + x*y]
7-
f = build_function(eqs,[x,y],[a],t,expression=Val{false},target=ModelingToolkit.CTarget())
7+
f = build_function([x.rhs for x in eqs],[x,y],[a],t,expression=Val{false},target=ModelingToolkit.CTarget())
88
f2 = eval(build_function([x.rhs for x in eqs],[x,y],[a],t)[2])
99
du = rand(2); du2 = rand(2)
1010
u = rand(2)

test/odesystem.jl

+13-18
Original file line numberDiff line numberDiff line change
@@ -89,35 +89,30 @@ eqs = [D(x) ~ σ′*(y-x),
8989
D(z) ~ x*y - β*z]
9090
de = ODESystem(eqs)
9191
test_diffeq_inference("global iv-varying", de, t, (x, y, z), (σ′, ρ, β))
92-
@test begin
93-
f = eval(generate_function(de, [x,y,z], [σ′,ρ,β])[2])
94-
du = [0.0,0.0,0.0]
95-
f(du, [1.0,2.0,3.0], [x->x+7,2,3], 5.0)
96-
du [11, -3, -7]
97-
end
92+
93+
f = eval(generate_function(de, [x,y,z], [σ′,ρ,β])[2])
94+
du = [0.0,0.0,0.0]
95+
f(du, [1.0,2.0,3.0], [x->x+7,2,3], 5.0)
96+
@test du [11, -3, -7]
9897

9998
@parameters σ(..)
10099
eqs = [D(x) ~ σ(t-1)*(y-x),
101100
D(y) ~ x*-z)-y,
102101
D(z) ~ x*y - β*z]
103102
de = ODESystem(eqs)
104103
test_diffeq_inference("single internal iv-varying", de, t, (x, y, z), (σ(t-1), ρ, β))
105-
@test begin
106-
f = eval(generate_function(de, [x,y,z], [σ,ρ,β])[2])
107-
du = [0.0,0.0,0.0]
108-
f(du, [1.0,2.0,3.0], [x->x+7,2,3], 5.0)
109-
du [11, -3, -7]
110-
end
104+
f = eval(generate_function(de, [x,y,z], [σ,ρ,β])[2])
105+
du = [0.0,0.0,0.0]
106+
f(du, [1.0,2.0,3.0], [x->x+7,2,3], 5.0)
107+
@test du [11, -3, -7]
111108

112109
eqs = [D(x) ~ x + 10σ(t-1) + 100σ(t-2) + 1000σ(t^2)]
113110
de = ODESystem(eqs)
114111
test_diffeq_inference("many internal iv-varying", de, t, (x,), (σ(t-2),σ(t^2), σ(t-1)))
115-
@test begin
116-
f = eval(generate_function(de, [x], [σ])[2])
117-
du = [0.0]
118-
f(du, [1.0], [t -> t + 2], 5.0)
119-
du [27561]
120-
end
112+
f = eval(generate_function(de, [x], [σ])[2])
113+
du = [0.0]
114+
f(du, [1.0], [t -> t + 2], 5.0)
115+
@test du [27561]
121116

122117
# Conversion to first-order ODEs #17
123118
D3 = Differential(t)^3

0 commit comments

Comments
 (0)