Skip to content

Commit 22a81f2

Browse files
refactor: revert eachindex to iterating over indices of VA.u
1 parent 26c5873 commit 22a81f2

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

src/vector_of_array.jl

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ Base.IndexStyle(::Type{<:AbstractVectorOfArray}) = IndexCartesian()
206206

207207
@inline Base.length(VA::AbstractVectorOfArray) = length(VA.u)
208208
@inline function Base.eachindex(VA::AbstractVectorOfArray)
209-
return Iterators.flatten((CartesianIndex(i, j) for i in eachindex(arr)) for (j, arr) in enumerate(VA.u))
209+
return eachindex(VA.u)
210210
end
211211
@inline Base.IteratorSize(::Type{<:AbstractVectorOfArray}) = Base.HasLength()
212212
@inline Base.first(VA::AbstractVectorOfArray) = first(VA.u)
@@ -526,14 +526,8 @@ end
526526
Base.reshape(A::VectorOfArray, dims...) = Base.reshape(Array(A), dims...)
527527

528528
# Need this for ODE_DEFAULT_UNSTABLE_CHECK from DiffEqBase to work properly
529-
@inline Base.any(f, VA::AbstractVectorOfArray) = any(f, VA[i] for i in eachindex(VA))
530-
@inline Base.all(f, VA::AbstractVectorOfArray) = all(f, VA[i] for i in eachindex(VA))
531-
@inline function Base.any(f::Function, VA::AbstractVectorOfArray)
532-
any(f, VA[i] for i in eachindex(VA))
533-
end
534-
@inline function Base.all(f::Function, VA::AbstractVectorOfArray)
535-
all(f, VA[i] for i in eachindex(VA))
536-
end
529+
@inline Base.any(f, VA::AbstractVectorOfArray) = any(any(f, u) for u in VA.u)
530+
@inline Base.all(f, VA::AbstractVectorOfArray) = all(all(f, u) for u in VA.u)
537531

538532
# conversion tools
539533
vecarr_to_vectors(VA::AbstractVectorOfArray) = [VA[i, :] for i in eachindex(VA[1])]

0 commit comments

Comments
 (0)