Skip to content

make symbolic indexing return VectorOfArray #466

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

make symbolic indexing return VectorOfArray #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
605824a
make symbolic indexing return VectorOfArray
oscardssmith Jul 13, 2023
7ff39ae
fix indexing
oscardssmith Jul 17, 2023
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
12 changes: 6 additions & 6 deletions src/ensemble/ensemble_solutions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,17 +199,17 @@ end
end


Base.@propagate_inbounds function Base.getindex(x::AbstractEnsembleSolution, ::Colon, s)
return [xi[s] for xi in x]
Base.@propagate_inbounds function Base.getindex(x::AbstractEnsembleSolution, s, ::Colon)
return VectorOfArray([xi[s] for xi in x])
end

Base.@propagate_inbounds function Base.getindex(x::AbstractEnsembleSolution, ::Colon, args::Colon...)
return invoke(getindex, Tuple{RecursiveArrayTools.AbstractVectorOfArray, Colon, typeof.(args)...}, x, :, args...)
end
Base.@propagate_inbounds function Base.getindex(x::AbstractEnsembleSolution, ::Colon, args::Int...)
return [xi[args...] for xi in x]
end
#Base.@propagate_inbounds function Base.getindex(x::AbstractEnsembleSolution, args::Int..., ::Colon)
# return VectorOfArray([xi[args...] for xi in x])
#end

function (sol::AbstractEnsembleSolution)(args...; kwargs...)
[s(args...; kwargs...) for s in sol]
VectorOfArray([s(args...; kwargs...) for s in sol])
end
6 changes: 3 additions & 3 deletions src/solutions/solution_interface.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ Base.@propagate_inbounds function Base.getindex(A::AbstractTimeseriesSolution, s
if has_sys(A.prob.f) && all(Base.Fix1(is_param_sym, A.prob.f.sys), sym) ||
!has_sys(A.prob.f) && has_paramsyms(A.prob.f) &&
all(in(getparamsyms(A)), Symbol.(sym))
return getindex.((A,), sym)
return VectorOfArray(getindex.((A,), sym))
else
return [getindex.((A,), sym, i) for i in eachindex(A)]
return VectorOfArray([getindex.((A,), sym, i) for i in eachindex(A)])
end
else
i = sym
Expand Down Expand Up @@ -110,7 +110,7 @@ Base.@propagate_inbounds function Base.getindex(A::AbstractTimeseriesSolution, s
observed(A, sym, :)
end
elseif i isa Base.Integer || i isa AbstractRange || i isa AbstractVector{<:Base.Integer}
A[i, :]
VectorOfArray(A[i, :])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how do you know this is a vector of arrays?

else
error("Invalid indexing of solution")
end
Expand Down
26 changes: 17 additions & 9 deletions test/downstream/ensemble_multi_prob.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,27 @@
using ModelingToolkit, OrdinaryDiffEq, Test

@variables t, x(t)
@variables t, x(t), y(t)
D = Differential(t)

@named sys1 = ODESystem([D(x) ~ 1.1*x])
@named sys2 = ODESystem([D(x) ~ 1.2*x])
@named sys1 = ODESystem([D(x) ~ x,
D(y) ~ -y])
@named sys2 = ODESystem([D(x) ~ 2x,
D(y) ~ -2y])
@named sys3 = ODESystem([D(x) ~ 3x,
D(y) ~ -3y])

prob1 = ODEProblem(sys1, [2.0], (0.0, 1.0))
prob2 = ODEProblem(sys2, [1.0], (0.0, 1.0))
prob1 = ODEProblem(sys1, [1.0, 1.0], (0.0, 1.0))
prob2 = ODEProblem(sys2, [2.0, 2.0], (0.0, 1.0))
prob3 = ODEProblem(sys3, [3.0, 3.0], (0.0, 1.0))

# test that when passing a vector of problems, trajectories and the prob_func are chosen appropriately
ensemble_prob = EnsembleProblem([prob1, prob2])
ensemble_prob = EnsembleProblem([prob1, prob2, prob3])
sol = solve(ensemble_prob, Tsit5(), EnsembleThreads())
@test isapprox(sol[:, x], [2,1] .* map(Base.Fix1(map, exp), [1.1, 1.2] .* sol[:, t]), rtol=1e-4)
for i in 1:3
@test sol[x, :][i] == sol[i][x]
@test sol[y, :][i] == sol[i][y]
end
# Ensemble is a recursive array
@test sol(0.0, idxs=[x]) == sol[:, 1] == first.(sol[:, x], 1)
@test Matrix(sol(0.0, idxs=[x])) == sol[1:1, 1, :] == Matrix(first(eachrow(sol[x, :]))')
# TODO: fix the interpolation
@test sol(1.0, idxs=[x]) ≈ last.(sol[:, x], 1)
@test vec(sol(1.0, idxs=[x])) ≈ last.(sol[x, :].u)