Skip to content

Commit 7905b6a

Browse files
Consider non-timeseries parameters to be ContinuousTimeseries
This does a few things. First of all it fixes SciML/SciMLBase.jl#1061 by making parameters plot as lines. But secondly, it treats parameters the same way as variables, which is a requirement if we want to make it simpler for the compiler to change things from the state to parameters.
1 parent 7b5c5f0 commit 7905b6a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/systems/abstractsystem.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -300,10 +300,10 @@ function has_parameter_dependency_with_lhs(sys, sym)
300300
end
301301

302302
function _all_ts_idxs!(ts_idxs, ::NotSymbolic, sys, sym)
303-
if is_variable(sys, sym) || is_independent_variable(sys, sym)
304-
push!(ts_idxs, ContinuousTimeseries())
305-
elseif is_timeseries_parameter(sys, sym)
303+
if is_timeseries_parameter(sys, sym)
306304
push!(ts_idxs, timeseries_parameter_index(sys, sym).timeseries_idx)
305+
elseif is_variable(sys, sym) || is_independent_variable(sys, sym) || is_parameter(sys, sym)
306+
push!(ts_idxs, ContinuousTimeseries())
307307
end
308308
end
309309
# Need this to avoid ambiguity with the array case
@@ -315,10 +315,10 @@ for traitT in [
315315
allsyms = vars(sym; op = Symbolics.Operator)
316316
for s in allsyms
317317
s = unwrap(s)
318-
if is_variable(sys, s) || is_independent_variable(sys, s)
319-
push!(ts_idxs, ContinuousTimeseries())
320-
elseif is_timeseries_parameter(sys, s)
318+
if is_timeseries_parameter(sys, s)
321319
push!(ts_idxs, timeseries_parameter_index(sys, s).timeseries_idx)
320+
elseif is_variable(sys, s) || is_independent_variable(sys, s) || is_parameter(sys, sym)
321+
push!(ts_idxs, ContinuousTimeseries())
322322
elseif is_time_dependent(sys) && iscall(s) && issym(operation(s)) &&
323323
length(arguments(s)) == 1 && is_variable(sys, operation(s)(get_iv(sys)))
324324
# DDEs case, to detect x(t - k)

0 commit comments

Comments
 (0)