Skip to content

Commit 51c5446

Browse files
fix: various bug and test fixes
1 parent 192758b commit 51c5446

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

src/systems/abstractsystem.jl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,10 +482,12 @@ function SymbolicIndexingInterface.parameter_index(sys::AbstractSystem, sym)
482482
end
483483
elseif iscall(sym) && operation(sym) === getindex &&
484484
(idx = parameter_index(ic, first(arguments(sym)))) !== nothing
485-
if idx.portion isa SciMLStructures.Discrete && idx.idx[2] == idx.idx[3] == nothing
485+
if idx.portion isa SciMLStructures.Discrete &&
486+
idx.idx[2] == idx.idx[3] == nothing
486487
return nothing
487488
else
488-
ParameterIndex(idx.portion, (idx.idx..., arguments(sym)[(begin + 1):end]...))
489+
ParameterIndex(
490+
idx.portion, (idx.idx..., arguments(sym)[(begin + 1):end]...))
489491
end
490492
else
491493
nothing
@@ -505,7 +507,8 @@ end
505507
function SymbolicIndexingInterface.parameter_index(sys::AbstractSystem, sym::Symbol)
506508
if has_index_cache(sys) && (ic = get_index_cache(sys)) !== nothing
507509
idx = parameter_index(ic, sym)
508-
if idx === nothing || idx.portion isa SciMLStructures.Discrete && idx.idx[2] == idx.idx[3] == 0
510+
if idx === nothing ||
511+
idx.portion isa SciMLStructures.Discrete && idx.idx[2] == idx.idx[3] == 0
509512
return nothing
510513
else
511514
return idx

src/systems/parameter_buffer.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ function MTKParameters(
158158
end
159159
end
160160
tunable_buffer = narrow_buffer_type.(tunable_buffer)
161-
disc_buffer = narrow_buffer_type.(disc_buffer)
161+
disc_buffer = broadcast.(narrow_buffer_type, disc_buffer)
162162
const_buffer = narrow_buffer_type.(const_buffer)
163163
# Don't narrow nonnumeric types
164164
nonnumeric_buffer = nonnumeric_buffer
@@ -568,7 +568,7 @@ function SymbolicIndexingInterface.remake_buffer(indp, oldbuf::MTKParameters, va
568568
@set! newbuf.dependent = narrow_buffer_type_and_fallback_undefs.(
569569
oldbuf.dependent,
570570
split_into_buffers(
571-
newbuf.dependent_update_oop(newbuf...), oldbuf.dependent, Val(false)))
571+
newbuf.dependent_update_oop(newbuf...), oldbuf.dependent, Val(0)))
572572
end
573573
return newbuf
574574
end

test/mtkparameters.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,8 @@ with_updated_parameter_timeseries_values(
321321
@test SciMLBase.get_saveable_values(ps, 1).x == ps.discrete[1]
322322

323323
# With multiple types and clocks
324-
ps = MTKParameters((), SizedVector{2}([([1.0, 2.0, 3.0], [false]), ([4.0, 5.0, 6.0], Bool[])]), (), (), (), nothing, nothing)
325-
@test SciMLBase.get_saveable_values(ps, 1).x isa Tuple{Vector{Float64}, Vector{Bool}}
324+
ps = MTKParameters((), SizedVector{2}([([1.0, 2.0, 3.0], falses(1)), ([4.0, 5.0, 6.0], falses(0))]), (), (), (), nothing, nothing)
325+
@test SciMLBase.get_saveable_values(ps, 1).x isa Tuple{Vector{Float64}, BitVector}
326326
tsidx1 = 1
327327
tsidx2 = 2
328328
@test length(ps.discrete[tsidx1][1]) == 3

test/symbolic_indexing_interface.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ using SciMLStructures: Tunable
1919
@test parameter_index(odesys, a) isa ParameterIndex{Tunable, Tuple{Int, Int}}
2020
@test parameter_index(odesys, b) == parameter_index(odesys, :b)
2121
@test parameter_index(odesys, b) isa ParameterIndex{Tunable, Tuple{Int, Int}}
22-
@test parameter_index.((odesys,), [x, y, t, ParameterIndex(Tunable(), (1, 1)), :x, :y,]) ==
22+
@test parameter_index.(
23+
(odesys,), [x, y, t, ParameterIndex(Tunable(), (1, 1)), :x, :y]) ==
2324
[nothing, nothing, nothing, ParameterIndex(Tunable(), (1, 1)), nothing, nothing]
2425
@test isequal(parameter_symbols(odesys), [a, b])
2526
@test all(is_independent_variable.((odesys,), [t, :t]))

0 commit comments

Comments
 (0)