Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/systems/abstractsystem.jl
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ function SymbolicIndexingInterface.parameter_index(sys::AbstractSystem, sym::Sym
if has_index_cache(sys) && (ic = get_index_cache(sys)) !== nothing
idx = parameter_index(ic, sym)
if idx === nothing ||
idx.portion isa SciMLStructures.Discrete && idx.idx[2] == idx.idx[3] == 0
idx.portion isa SciMLStructures.Discrete && idx.idx[1] == idx.idx[2] == 0
return nothing
else
return idx
Expand Down
12 changes: 12 additions & 0 deletions test/symbolic_indexing_interface.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ using ModelingToolkit, SymbolicIndexingInterface, SciMLBase
using ModelingToolkit: t_nounits as t, D_nounits as D, ParameterIndex,
SymbolicContinuousCallback
using SciMLStructures: Tunable
using OrdinaryDiffEq

@testset "System" begin
@parameters a b
Expand Down Expand Up @@ -236,3 +237,14 @@ end
@test timeseries_parameter_index(sys, p[1, 1]) ===
ParameterTimeseriesIndex(1, (1, 1, 1, 1))
end

@testset "Indexing with symbols work for discrete parameters" begin
t = ModelingToolkit.t_nounits; D = ModelingToolkit.D_nounits
@variables x(t) = 1.
@parameters p(t) = 1.
ev = ModelingToolkit.SymbolicDiscreteCallback((t == 1) => [p ~ Pre(p)*2], discrete_parameters = p)
@mtkcompile sys = System([D(x) ~ p], t; discrete_events = ev)
prob = ODEProblem(sys, [], (0., 2.))
sol = solve(prob, Tsit5())
@test sol[p] == sol[:p] == sol.ps[p] == sol.ps[:p]
end
Loading