Skip to content

Commit 70e78da

Browse files
Run Runic formatting on ragged sublibrary
Co-Authored-By: Chris Rackauckas <accounts@chrisrackauckas.com> Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 901762d commit 70e78da

File tree

2 files changed

+53
-33
lines changed

2 files changed

+53
-33
lines changed

lib/RecursiveArrayToolsRaggedArrays/src/RecursiveArrayToolsRaggedArrays.jl

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,10 @@ function Adapt.adapt_structure(to, VA::AbstractRaggedVectorOfArray)
188188
end
189189

190190
function 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+
)
193195
end
194196

195197
function RaggedVectorOfArray(vec::AbstractVector{T}, ::NTuple{N}) where {T, N}
@@ -430,8 +432,10 @@ function RaggedDiffEqArray(
430432
end
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{
@@ -523,7 +527,7 @@ end
523527
function (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)
527531
end
528532

529533
Base.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+
)
697705
end
698706

699707
struct ParameterIndexingError <: Exception
@@ -875,8 +883,10 @@ end
875883
end
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+
)
880890
end
881891

882892
@inline function _ragged_getindex(A::AbstractRaggedVectorOfArray, I...)
@@ -1193,8 +1203,10 @@ Base.sizehint!(VA::AbstractRaggedVectorOfArray{T, N}, i) where {T, N} = sizehint
11931203
Base.reverse!(VA::AbstractRaggedVectorOfArray) = reverse!(VA.u)
11941204
Base.reverse(VA::AbstractRaggedVectorOfArray) = RaggedVectorOfArray(reverse(VA.u))
11951205
function 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+
)
11981210
end
11991211

12001212
function Base.resize!(VA::AbstractRaggedVectorOfArray, i::Integer)
@@ -1690,8 +1702,10 @@ end
16901702
Convert a `RaggedDiffEqArray` to a regular `DiffEqArray`.
16911703
"""
16921704
function 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+
)
16951709
end
16961710

16971711
"""
@@ -1700,10 +1714,12 @@ end
17001714
Convert a regular `DiffEqArray` to a `RaggedDiffEqArray`.
17011715
"""
17021716
function 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+
)
17071723
end
17081724

17091725
# Re-export has_discretes and get_discretes for the non-ragged types

lib/RecursiveArrayToolsRaggedArrays/test/runtests.jl

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -657,22 +657,26 @@ using Test
657657
arr = rand(3, 2, 4)
658658
copyto!(testva, arr)
659659
@test Array(testva) == arr
660-
testva = RaggedVectorOfArray([
661-
ones(3, 2, 2),
662-
RaggedVectorOfArray([
663-
2ones(3, 2),
664-
RaggedVectorOfArray([3ones(3), 4ones(3)]),
665-
]),
666-
RaggedDiffEqArray(
667-
[
668-
5ones(3, 2),
669-
RaggedVectorOfArray([6ones(3), 7ones(3)]),
670-
],
671-
[0.1, 0.2],
672-
[100.0, 200.0],
673-
SymbolCache([:x, :y], [:a, :b], :t)
674-
),
675-
])
660+
testva = RaggedVectorOfArray(
661+
[
662+
ones(3, 2, 2),
663+
RaggedVectorOfArray(
664+
[
665+
2ones(3, 2),
666+
RaggedVectorOfArray([3ones(3), 4ones(3)]),
667+
]
668+
),
669+
RaggedDiffEqArray(
670+
[
671+
5ones(3, 2),
672+
RaggedVectorOfArray([6ones(3), 7ones(3)]),
673+
],
674+
[0.1, 0.2],
675+
[100.0, 200.0],
676+
SymbolCache([:x, :y], [:a, :b], :t)
677+
),
678+
]
679+
)
676680
arr = rand(3, 2, 2, 3)
677681
copyto!(testva, arr)
678682
@test Array(testva) == arr

0 commit comments

Comments
 (0)