Skip to content

add error for discrete parameter update #3970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+9 −4
Open

add error for discrete parameter update #3970

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f686a3c
add error for discrete parameter update, do not add observed to algeb…
vyudu Oct 16, 2025
c1978a5
precompute ordered set of discrete parameters
vyudu Oct 16, 2025
e2fb2cf
ftest: fix discrete parameter in test
vyudu Oct 20, 2025
090c158
revert remove observed
vyudu Oct 20, 2025
d21154e
fix incorrect test value
vyudu Oct 21, 2025
101e0b5
test: add error if parameter not declared as discrete
vyudu Oct 24, 2025
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
4 changes: 4 additions & 0 deletions src/systems/callbacks.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,16 @@ function AffectSystem(affect::Vector{Equation}; discrete_parameters = Any[],

dvs = OrderedSet()
params = OrderedSet()
dp_set = OrderedSet(discrete_parameters)
_varsbuf = Set()
for eq in affect
if !haspre(eq) && !(symbolic_type(eq.rhs) === NotSymbolic() ||
symbolic_type(eq.lhs) === NotSymbolic())
@warn "Affect equation $eq has no `Pre` operator. As such it will be interpreted as an algebraic equation to be satisfied after the callback. If you intended to use the value of a variable x before the affect, use Pre(x). Errors may be thrown if there is no `Pre` and the algebraic equation is unsatisfiable, such as X ~ X + 1."
end
if ModelingToolkit.isparameter(eq.lhs) && (eq.lhs ∉ dp_set)
error("Detected explicit update to parameter $(eq.lhs), but it has not been passed in as a `discrete_parameters` to the callback constructor, for example: \n\n(SymbolicDiscreteCallback(cond => aff, discrete_parameters = [$(eq.lhs)])\n\nAs a result, the parameter update will fail.")
end
collect_vars!(dvs, params, eq, iv; op = Pre)
empty!(_varsbuf)
vars!(_varsbuf, eq; op = Pre)
Expand Down
7 changes: 3 additions & 4 deletions test/symbolic_events.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -874,10 +874,9 @@ end

# Test Simulation
@mtkcompile sys = TestSystem()

# Test Simulation
prob = ODEProblem(sys, [], (0.0, 150.0))
sol = solve(prob)

# This is singular at the second event, but the derivatives are zero so it's
# constant after that point anyway. Just make sure it hits the last event and
# had the correct `u`.
Expand Down Expand Up @@ -1374,7 +1373,7 @@ end
@parameters p2(t) = 1.0
@variables x(t) = 0.0
@variables x2(t)
event = [0.5] => [p2 ~ Pre(t)]
event = SymbolicDiscreteCallback([0.5] => [p2 ~ Pre(t)], discrete_parameters = p2)

eq = [
D(x) ~ p2,
Expand All @@ -1385,7 +1384,7 @@ end
prob = ODEProblem(sys, [], (0.0, 1.0))
sol = solve(prob)
@test SciMLBase.successful_retcode(sol)
@test sol[x, end]≈1.0 atol=1e-6
@test sol[x, end] ≈ 0.75 atol=1e-6
end

@testset "Symbolic affects are compiled in `complete`" begin
Expand Down
Loading