@@ -188,8 +188,10 @@ function Adapt.adapt_structure(to, VA::AbstractRaggedVectorOfArray)
188188end
189189
190190function Adapt. adapt_structure (to, VA:: AbstractRaggedDiffEqArray )
191- return RaggedDiffEqArray (Adapt. adapt .((to,), VA. u), Adapt. adapt (to, VA. t);
192- interp = VA. interp, dense = VA. dense)
191+ return RaggedDiffEqArray (
192+ Adapt. adapt .((to,), VA. u), Adapt. adapt (to, VA. t);
193+ interp = VA. interp, dense = VA. dense
194+ )
193195end
194196
195197function RaggedVectorOfArray (vec:: AbstractVector{T} , :: NTuple{N} ) where {T, N}
@@ -430,8 +432,10 @@ function RaggedDiffEqArray(
430432end
431433
432434# first element representative
433- function RaggedDiffEqArray (vec:: AbstractVector , ts:: AbstractVector , p, sys;
434- discretes = nothing , interp = nothing , dense = false )
435+ function RaggedDiffEqArray (
436+ vec:: AbstractVector , ts:: AbstractVector , p, sys;
437+ discretes = nothing , interp = nothing , dense = false
438+ )
435439 _size = size (vec[1 ])
436440 T = eltype (vec[1 ])
437441 return RaggedDiffEqArray{
523527function (A:: RaggedDiffEqArray )(t, deriv = Val{0 }; idxs = nothing , continuity = :left )
524528 A. interp === nothing &&
525529 error (" No interpolation data is available. Provide an interpolation object via the `interp` keyword." )
526- A. interp (t, idxs, deriv, A. p, continuity)
530+ return A. interp (t, idxs, deriv, A. p, continuity)
527531end
528532
529533Base. IndexStyle (A:: AbstractRaggedVectorOfArray ) = Base. IndexStyle (typeof (A))
@@ -663,8 +667,10 @@ Base.@propagate_inbounds function _getindex(
663667 # Create a vector of sliced arrays instead of stacking into higher-dim array
664668 u_slice = [A. u[col][Base. front (I)... ] for col in col_idxs]
665669 # Return as RaggedDiffEqArray with sliced time values
666- return RaggedDiffEqArray (u_slice, A. t[col_idxs], parameter_values (A), symbolic_container (A);
667- interp = A. interp, dense = A. dense)
670+ return RaggedDiffEqArray (
671+ u_slice, A. t[col_idxs], parameter_values (A), symbolic_container (A);
672+ interp = A. interp, dense = A. dense
673+ )
668674 else
669675 # Prefix indices are not all Colons - do the same as RaggedVectorOfArray
670676 # (stack the results into a higher-dimensional array)
@@ -692,8 +698,10 @@ Base.@propagate_inbounds function _getindex(
692698 A:: AbstractRaggedDiffEqArray , :: NotSymbolic , :: Colon ,
693699 I:: Union{AbstractArray{Int}, AbstractArray{Bool}}
694700 )
695- return RaggedDiffEqArray (A. u[I], A. t[I], parameter_values (A), symbolic_container (A);
696- interp = A. interp, dense = A. dense)
701+ return RaggedDiffEqArray (
702+ A. u[I], A. t[I], parameter_values (A), symbolic_container (A);
703+ interp = A. interp, dense = A. dense
704+ )
697705end
698706
699707struct ParameterIndexingError <: Exception
875883end
876884
877885@inline function _preserve_array_type (A:: AbstractRaggedDiffEqArray , u_slice, col_idxs)
878- return RaggedDiffEqArray (u_slice, A. t[col_idxs], parameter_values (A), symbolic_container (A);
879- interp = A. interp, dense = A. dense)
886+ return RaggedDiffEqArray (
887+ u_slice, A. t[col_idxs], parameter_values (A), symbolic_container (A);
888+ interp = A. interp, dense = A. dense
889+ )
880890end
881891
882892@inline function _ragged_getindex (A:: AbstractRaggedVectorOfArray , I... )
@@ -1193,8 +1203,10 @@ Base.sizehint!(VA::AbstractRaggedVectorOfArray{T, N}, i) where {T, N} = sizehint
11931203Base. reverse! (VA:: AbstractRaggedVectorOfArray ) = reverse! (VA. u)
11941204Base. reverse (VA:: AbstractRaggedVectorOfArray ) = RaggedVectorOfArray (reverse (VA. u))
11951205function Base. reverse (VA:: AbstractRaggedDiffEqArray )
1196- return RaggedDiffEqArray (reverse (VA. u), VA. t, parameter_values (VA), symbolic_container (VA);
1197- interp = VA. interp, dense = VA. dense)
1206+ return RaggedDiffEqArray (
1207+ reverse (VA. u), VA. t, parameter_values (VA), symbolic_container (VA);
1208+ interp = VA. interp, dense = VA. dense
1209+ )
11981210end
11991211
12001212function Base. resize! (VA:: AbstractRaggedVectorOfArray , i:: Integer )
@@ -1690,8 +1702,10 @@ end
16901702Convert a `RaggedDiffEqArray` to a regular `DiffEqArray`.
16911703"""
16921704function DiffEqArray (r:: AbstractRaggedDiffEqArray )
1693- return DiffEqArray (r. u, r. t, r. p, r. sys;
1694- discretes = r. discretes, interp = r. interp, dense = r. dense)
1705+ return DiffEqArray (
1706+ r. u, r. t, r. p, r. sys;
1707+ discretes = r. discretes, interp = r. interp, dense = r. dense
1708+ )
16951709end
16961710
16971711"""
@@ -1700,10 +1714,12 @@ end
17001714Convert a regular `DiffEqArray` to a `RaggedDiffEqArray`.
17011715"""
17021716function RaggedDiffEqArray (va:: AbstractDiffEqArray )
1703- return RaggedDiffEqArray (va. u, va. t, va. p, va. sys;
1717+ return RaggedDiffEqArray (
1718+ va. u, va. t, va. p, va. sys;
17041719 discretes = hasfield (typeof (va), :discretes ) ? getfield (va, :discretes ) : nothing ,
17051720 interp = hasfield (typeof (va), :interp ) ? getfield (va, :interp ) : nothing ,
1706- dense = hasfield (typeof (va), :dense ) ? getfield (va, :dense ) : false )
1721+ dense = hasfield (typeof (va), :dense ) ? getfield (va, :dense ) : false
1722+ )
17071723end
17081724
17091725# Re-export has_discretes and get_discretes for the non-ragged types
0 commit comments