Skip to content
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

Make lastindex(::AbstractVectorOfArray, i) error when i!=1 #267

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

Make lastindex(::AbstractVectorOfArray, i) error when i!=1 #267

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f75132
make A[:, end] error for ragged AbstractVectorOfArray when the length…
oscardssmith Jul 12, 2023
068b313
Update src/vector_of_array.jl
ChrisRackauckas Jul 12, 2023
5d997df
fixup
oscardssmith Jul 12, 2023
4d8559a
typo
oscardssmith Jul 12, 2023
212b772
fix
oscardssmith Jul 12, 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
13 changes: 9 additions & 4 deletions src/vector_of_array.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ Base.@pure __parameterless_type(T) = Base.typename(T).wrapper
x <: Union{Symbol, AllObserved} && return quote true end
ss = ["Operation", "Variable", "Sym", "Num", "Term"]
s = string(Symbol(__parameterless_type(x)))
bool = any(x -> occursin(x, s), ss)
quote
bool = any(x -> occursin(x, s), ss)
quote
$bool
end
end
Expand Down Expand Up @@ -161,8 +161,13 @@ end

# Interface for the linear indexing. This is just a view of the underlying nested structure
@inline Base.firstindex(VA::AbstractVectorOfArray) = firstindex(VA.u)
@inline Base.lastindex(VA::AbstractVectorOfArray) = lastindex(VA.u)

function Base.lastindex(A::AbstractVectorOfArray, i=1)
i == 1 && return length(A)
len1 = lastindex(A[1], i-1)
all(x->isequal(lastindex(x, i-1), len1), A.u) && return len1
throw(ArgumentError("`end` is not defined for AbstractVectorOfArray types when the arrays have different sizes. Either enforce that the arrays are all similarly sized or directly define the index value.
Note that a common reason for this error in the SciMLSolution context comes from adaptively sized models. Using arguments like `saveat` can enforce that an ensemble of solutions are all saved at the same time points and thus all have the same size. Similarly, if an ODE is solved with adaptivity in the size of the system (such as for adaptive grids) then this error can refer to the changing size of the ODE through the time series."))
end
@inline Base.length(VA::AbstractVectorOfArray) = length(VA.u)
@inline Base.eachindex(VA::AbstractVectorOfArray) = Base.OneTo(length(VA.u))
@inline Base.IteratorSize(VA::AbstractVectorOfArray) = Base.HasLength()
Expand Down