Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion test/parameter_indexing_test.jl
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ for sys in [
(:(a + b + t), p[1] + p[2] + fi.t, true),
([:(a + b + t), :c], [p[1] + p[2] + fi.t, p[3]], true),
((:(a + b + t), :c), (p[1] + p[2] + fi.t, p[3]), true),
((; a = (; b = :(a + b))), (; a = (; b = p[1] + p[2])), true),
((; a = (; b = :(a + b))), (; a = (; b = p[1] + p[2])), true)
]
get = getp(sys, sym)
if check_inference
Expand Down
148 changes: 74 additions & 74 deletions test/state_indexing_test.jl
Original file line number Diff line number Diff line change
Expand Up @@ -24,38 +24,38 @@ t = 0.5
fi = FakeIntegrator(sys, copy(u), copy(p), t)
# checking inference for non-concretely typed arrays will always fail
for (sym, val, newval, check_inference) in [(:x, u[1], 4.0, true)
(:y, u[2], 4.0, true)
(:z, u[3], 4.0, true)
(1, u[1], 4.0, true)
([:x, :y], u[1:2], 4ones(2), true)
([1, 2], u[1:2], 4ones(2), true)
((:z, :y), (u[3], u[2]), (4.0, 5.0), true)
((3, 2), (u[3], u[2]), (4.0, 5.0), true)
([:x, [:y, :z]], [u[1], u[2:3]],
[4.0, [5.0, 6.0]], false)
([:x, 2:3], [u[1], u[2:3]],
[4.0, [5.0, 6.0]], false)
([:x, (:y, :z)], [u[1], (u[2], u[3])],
[4.0, (5.0, 6.0)], false)
([:x, Tuple(2:3)], [u[1], (u[2], u[3])],
[4.0, (5.0, 6.0)], false)
([:x, [:y], (:z,)], [u[1], [u[2]], (u[3],)],
[4.0, [5.0], (6.0,)], false)
([:x, [:y], (3,)], [u[1], [u[2]], (u[3],)],
[4.0, [5.0], (6.0,)], false)
((:x, [:y, :z]), (u[1], u[2:3]),
(4.0, [5.0, 6.0]), true)
((:x, (:y, :z)), (u[1], (u[2], u[3])),
(4.0, (5.0, 6.0)), true)
((1, (:y, :z)), (u[1], (u[2], u[3])),
(4.0, (5.0, 6.0)), true)
((:x, [:y], (:z,)), (u[1], [u[2]], (u[3],)),
(4.0, [5.0], (6.0,)), true)
((a = :x, b = [:x, :y], c = (d = :z, e = :x)),
(a = u[1], b = u[1:2],
c = (d = u[3], e = u[1])),
(a = 4.0, b = [4.0, 5.0],
c = (d = 6.0, e = 4.0)), true)]
(:y, u[2], 4.0, true)
(:z, u[3], 4.0, true)
(1, u[1], 4.0, true)
([:x, :y], u[1:2], 4ones(2), true)
([1, 2], u[1:2], 4ones(2), true)
((:z, :y), (u[3], u[2]), (4.0, 5.0), true)
((3, 2), (u[3], u[2]), (4.0, 5.0), true)
([:x, [:y, :z]], [u[1], u[2:3]],
[4.0, [5.0, 6.0]], false)
([:x, 2:3], [u[1], u[2:3]],
[4.0, [5.0, 6.0]], false)
([:x, (:y, :z)], [u[1], (u[2], u[3])],
[4.0, (5.0, 6.0)], false)
([:x, Tuple(2:3)], [u[1], (u[2], u[3])],
[4.0, (5.0, 6.0)], false)
([:x, [:y], (:z,)], [u[1], [u[2]], (u[3],)],
[4.0, [5.0], (6.0,)], false)
([:x, [:y], (3,)], [u[1], [u[2]], (u[3],)],
[4.0, [5.0], (6.0,)], false)
((:x, [:y, :z]), (u[1], u[2:3]),
(4.0, [5.0, 6.0]), true)
((:x, (:y, :z)), (u[1], (u[2], u[3])),
(4.0, (5.0, 6.0)), true)
((1, (:y, :z)), (u[1], (u[2], u[3])),
(4.0, (5.0, 6.0)), true)
((:x, [:y], (:z,)), (u[1], [u[2]], (u[3],)),
(4.0, [5.0], (6.0,)), true)
((a = :x, b = [:x, :y], c = (d = :z, e = :x)),
(a = u[1], b = u[1:2],
c = (d = u[3], e = u[1])),
(a = 4.0, b = [4.0, 5.0],
c = (d = 6.0, e = 4.0)), true)]
get = getsym(sys, sym)
set! = setsym(sys, sym)
if check_inference
Expand Down Expand Up @@ -127,12 +127,12 @@ let fi = fi, sys = sys
end

for (sym, oldval, newval, check_inference) in [(:a, p[1], 4.0, true)
(:b, p[2], 5.0, true)
(:c, p[3], 6.0, true)
([:a, :b], p[1:2], [4.0, 5.0], true)
((:c, :b), (p[3], p[2]), (6.0, 5.0), true)
([:x, :a], [u[1], p[1]], [4.0, 5.0], false)
((:y, :b), (u[2], p[2]), (5.0, 6.0), true)]
(:b, p[2], 5.0, true)
(:c, p[3], 6.0, true)
([:a, :b], p[1:2], [4.0, 5.0], true)
((:c, :b), (p[3], p[2]), (6.0, 5.0), true)
([:x, :a], [u[1], p[1]], [4.0, 5.0], false)
((:y, :b), (u[2], p[2]), (5.0, 6.0), true)]
get = getsym(fi, sym)
set! = setsym(fi, sym)
if check_inference
Expand Down Expand Up @@ -201,42 +201,42 @@ yvals = getindex.(sol.u, 2)
zvals = getindex.(sol.u, 3)

for (sym, ans, check_inference) in [(:x, xvals, true)
(:y, yvals, true)
(:z, zvals, true)
(1, xvals, true)
([:x, :y], vcat.(xvals, yvals), true)
(1:2, vcat.(xvals, yvals), true)
([:x, 2], vcat.(xvals, yvals), true)
((:z, :y), tuple.(zvals, yvals), true)
((3, 2), tuple.(zvals, yvals), true)
([:x, [:y, :z]],
vcat.(xvals, [[x] for x in vcat.(yvals, zvals)]),
false)
([:x, (:y, :z)],
vcat.(xvals, tuple.(yvals, zvals)), false)
([1, (:y, :z)],
vcat.(xvals, tuple.(yvals, zvals)), false)
([:x, [:y, :z], (:x, :z)],
vcat.(xvals, [[x] for x in vcat.(yvals, zvals)],
tuple.(xvals, zvals)),
false)
([:x, [:y, 3], (1, :z)],
vcat.(xvals, [[x] for x in vcat.(yvals, zvals)],
tuple.(xvals, zvals)),
false)
((:x, [:y, :z]),
tuple.(xvals, vcat.(yvals, zvals)), true)
((:x, (:y, :z)),
tuple.(xvals, tuple.(yvals, zvals)), true)
((:x, [:y, :z], (:z, :y)),
tuple.(xvals, vcat.(yvals, zvals),
tuple.(zvals, yvals)),
true)
([:x, :a], vcat.(xvals, p[1]), false)
((:y, :b), tuple.(yvals, p[2]), true)
(:t, t, true)
([:x, :a, :t], vcat.(xvals, p[1], t), false)
((:x, :a, :t), tuple.(xvals, p[1], t), true)]
(:y, yvals, true)
(:z, zvals, true)
(1, xvals, true)
([:x, :y], vcat.(xvals, yvals), true)
(1:2, vcat.(xvals, yvals), true)
([:x, 2], vcat.(xvals, yvals), true)
((:z, :y), tuple.(zvals, yvals), true)
((3, 2), tuple.(zvals, yvals), true)
([:x, [:y, :z]],
vcat.(xvals, [[x] for x in vcat.(yvals, zvals)]),
false)
([:x, (:y, :z)],
vcat.(xvals, tuple.(yvals, zvals)), false)
([1, (:y, :z)],
vcat.(xvals, tuple.(yvals, zvals)), false)
([:x, [:y, :z], (:x, :z)],
vcat.(xvals, [[x] for x in vcat.(yvals, zvals)],
tuple.(xvals, zvals)),
false)
([:x, [:y, 3], (1, :z)],
vcat.(xvals, [[x] for x in vcat.(yvals, zvals)],
tuple.(xvals, zvals)),
false)
((:x, [:y, :z]),
tuple.(xvals, vcat.(yvals, zvals)), true)
((:x, (:y, :z)),
tuple.(xvals, tuple.(yvals, zvals)), true)
((:x, [:y, :z], (:z, :y)),
tuple.(xvals, vcat.(yvals, zvals),
tuple.(zvals, yvals)),
true)
([:x, :a], vcat.(xvals, p[1]), false)
((:y, :b), tuple.(yvals, p[2]), true)
(:t, t, true)
([:x, :a, :t], vcat.(xvals, p[1], t), false)
((:x, :a, :t), tuple.(xvals, p[1], t), true)]
get = getsym(sys, sym)
if check_inference
@inferred get(sol)
Expand Down
Loading