Skip to content

Commit b341d7b

Browse files
committed
Search for and replace initial_parameters by initial
1 parent 1269aac commit b341d7b

16 files changed

+46
-46
lines changed

src/inputoutput.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ function generate_control_function(sys::AbstractODESystem, inputs = unbound_inpu
211211
sys, _ = io_preprocessing(sys, inputs, []; simplify, kwargs...)
212212

213213
dvs = unknowns(sys)
214-
ps = parameters(sys; initial_parameters = true)
214+
ps = parameters(sys; initial = true)
215215
ps = setdiff(ps, inputs)
216216
if disturbance_inputs !== nothing
217217
# remove from inputs since we do not want them as actual inputs to the dynamics

src/linearization.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -487,7 +487,7 @@ function linearize_symbolic(sys::AbstractSystem, inputs,
487487
kwargs...)
488488
sts = unknowns(sys)
489489
t = get_iv(sys)
490-
ps = parameters(sys; initial_parameters = true)
490+
ps = parameters(sys; initial = true)
491491
p = reorder_parameters(sys, ps)
492492

493493
fun_expr = generate_function(sys, sts, ps; expression = Val{true})[1]

src/systems/abstractsystem.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ time-independent systems. If `split=true` (the default) was passed to [`complete
161161
object.
162162
"""
163163
function generate_custom_function(sys::AbstractSystem, exprs, dvs = unknowns(sys),
164-
ps = parameters(sys; initial_parameters = true);
164+
ps = parameters(sys; initial = true);
165165
expression = Val{true}, eval_expression = false, eval_module = @__MODULE__,
166166
cachesyms::Tuple = (), kwargs...)
167167
if !iscomplete(sys)
@@ -512,7 +512,7 @@ function SymbolicIndexingInterface.get_all_timeseries_indexes(sys::AbstractSyste
512512
end
513513

514514
function SymbolicIndexingInterface.parameter_symbols(sys::AbstractSystem)
515-
return parameters(sys; initial_parameters = true)
515+
return parameters(sys; initial = true)
516516
end
517517

518518
function SymbolicIndexingInterface.is_independent_variable(sys::AbstractSystem, sym)
@@ -771,7 +771,7 @@ function complete(
771771
@set! sys.index_cache = IndexCache(sys)
772772
# Ideally we'd do `get_ps` but if `flatten = false`
773773
# we don't get all of them. So we call `parameters`.
774-
all_ps = parameters(sys; initial_parameters = true)
774+
all_ps = parameters(sys; initial = true)
775775
if !isempty(all_ps)
776776
# reorder parameters by portions
777777
ps_split = reorder_parameters(sys, all_ps)
@@ -1334,13 +1334,13 @@ Get the standard parameters of the system `sys` and its subsystems.
13341334
13351335
# Keyword arguments
13361336
1337-
- `initial_parameters`: Whether to include parameters for initial values of variables in the initialization system.
1337+
- `initial`: Whether to include parameters for initial values of variables in the initialization system.
13381338
- `dependent_parameters`: Whether to include parameters that are determined by parameter dependencies.
13391339
13401340
See also [`full_parameters`](@ref) and [`ModelingToolkit.get_ps`](@ref).
13411341
"""
13421342
function parameters(
1343-
sys::AbstractSystem; initial_parameters = false, dependent_parameters = false)
1343+
sys::AbstractSystem; initial = false, dependent_parameters = false)
13441344
ps = get_ps(sys)
13451345
if ps == SciMLBase.NullParameters()
13461346
return []
@@ -1351,7 +1351,7 @@ function parameters(
13511351
systems = get_systems(sys)
13521352
ps = unique(isempty(systems) ? ps :
13531353
[ps; reduce(vcat, namespace_parameters.(systems))])
1354-
if !initial_parameters && !is_initializesystem(sys)
1354+
if !initial && !is_initializesystem(sys)
13551355
filter!(x -> !iscall(x) || !isa(operation(x), Initial), ps)
13561356
end
13571357
if dependent_parameters
@@ -1404,7 +1404,7 @@ Get all parameters of the system `sys` and its subsystems, including initial val
14041404
See also [`parameters`](@ref) and [`ModelingToolkit.get_ps`](@ref).
14051405
"""
14061406
function full_parameters(sys::AbstractSystem)
1407-
return parameters(sys; initial_parameters = true, dependent_parameters = true)
1407+
return parameters(sys; initial = true, dependent_parameters = true)
14081408
end
14091409

14101410
"""

src/systems/callbacks.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ function compile_affect(eqs::Vector{Equation}, cb, sys, dvs, ps; outputidxs = no
712712
end
713713

714714
function generate_rootfinding_callback(sys::AbstractTimeDependentSystem,
715-
dvs = unknowns(sys), ps = parameters(sys; initial_parameters = true); kwargs...)
715+
dvs = unknowns(sys), ps = parameters(sys; initial = true); kwargs...)
716716
cbs = continuous_events(sys)
717717
isempty(cbs) && return nothing
718718
generate_rootfinding_callback(cbs, sys, dvs, ps; kwargs...)
@@ -723,7 +723,7 @@ generate_rootfinding_callback and thus we can produce a ContinuousCallback inste
723723
"""
724724
function generate_single_rootfinding_callback(
725725
eq, cb, sys::AbstractTimeDependentSystem, dvs = unknowns(sys),
726-
ps = parameters(sys; initial_parameters = true); kwargs...)
726+
ps = parameters(sys; initial = true); kwargs...)
727727
if !isequal(eq.lhs, 0)
728728
eq = 0 ~ eq.lhs - eq.rhs
729729
end
@@ -766,7 +766,7 @@ end
766766

767767
function generate_vector_rootfinding_callback(
768768
cbs, sys::AbstractTimeDependentSystem, dvs = unknowns(sys),
769-
ps = parameters(sys; initial_parameters = true); rootfind = SciMLBase.RightRootFind,
769+
ps = parameters(sys; initial = true); rootfind = SciMLBase.RightRootFind,
770770
reinitialization = SciMLBase.CheckInit(), kwargs...)
771771
eqs = map(cb -> flatten_equations(cb.eqs), cbs)
772772
num_eqs = length.(eqs)
@@ -891,7 +891,7 @@ function compile_affect_fn(cb, sys::AbstractTimeDependentSystem, dvs, ps, kwargs
891891
end
892892

893893
function generate_rootfinding_callback(cbs, sys::AbstractTimeDependentSystem,
894-
dvs = unknowns(sys), ps = parameters(sys; initial_parameters = true); kwargs...)
894+
dvs = unknowns(sys), ps = parameters(sys; initial = true); kwargs...)
895895
eqs = map(cb -> flatten_equations(cb.eqs), cbs)
896896
num_eqs = length.(eqs)
897897
total_eqs = sum(num_eqs)
@@ -980,7 +980,7 @@ end
980980
function unassignable_variables(sys, expr)
981981
assignable_syms = reduce(
982982
vcat, Symbolics.scalarize.(vcat(
983-
unknowns(sys), parameters(sys; initial_parameters = true)));
983+
unknowns(sys), parameters(sys; initial = true)));
984984
init = [])
985985
written = reduce(vcat, Symbolics.scalarize.(vars(expr)); init = [])
986986
return filter(
@@ -1107,7 +1107,7 @@ function generate_discrete_callback(cb, sys, dvs, ps; postprocess_affect_expr! =
11071107
end
11081108

11091109
function generate_discrete_callbacks(sys::AbstractSystem, dvs = unknowns(sys),
1110-
ps = parameters(sys; initial_parameters = true); kwargs...)
1110+
ps = parameters(sys; initial = true); kwargs...)
11111111
has_discrete_events(sys) || return nothing
11121112
symcbs = discrete_events(sys)
11131113
isempty(symcbs) && return nothing

src/systems/diffeqs/abstractodesystem.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ end
106106

107107
function generate_tgrad(
108108
sys::AbstractODESystem, dvs = unknowns(sys), ps = parameters(
109-
sys; initial_parameters = true);
109+
sys; initial = true);
110110
simplify = false, kwargs...)
111111
tgrad = calculate_tgrad(sys, simplify = simplify)
112112
p = reorder_parameters(sys, ps)
@@ -118,7 +118,7 @@ function generate_tgrad(
118118
end
119119

120120
function generate_jacobian(sys::AbstractODESystem, dvs = unknowns(sys),
121-
ps = parameters(sys; initial_parameters = true);
121+
ps = parameters(sys; initial = true);
122122
simplify = false, sparse = false, kwargs...)
123123
jac = calculate_jacobian(sys; simplify = simplify, sparse = sparse)
124124
p = reorder_parameters(sys, ps)
@@ -130,15 +130,15 @@ function generate_jacobian(sys::AbstractODESystem, dvs = unknowns(sys),
130130
end
131131

132132
function generate_control_jacobian(sys::AbstractODESystem, dvs = unknowns(sys),
133-
ps = parameters(sys; initial_parameters = true);
133+
ps = parameters(sys; initial = true);
134134
simplify = false, sparse = false, kwargs...)
135135
jac = calculate_control_jacobian(sys; simplify = simplify, sparse = sparse)
136136
p = reorder_parameters(sys, ps)
137137
return build_function_wrapper(sys, jac, dvs, p..., get_iv(sys); kwargs...)
138138
end
139139

140140
function generate_dae_jacobian(sys::AbstractODESystem, dvs = unknowns(sys),
141-
ps = parameters(sys; initial_parameters = true); simplify = false, sparse = false,
141+
ps = parameters(sys; initial = true); simplify = false, sparse = false,
142142
kwargs...)
143143
jac_u = calculate_jacobian(sys; simplify = simplify, sparse = sparse)
144144
derivatives = Differential(get_iv(sys)).(unknowns(sys))
@@ -154,7 +154,7 @@ function generate_dae_jacobian(sys::AbstractODESystem, dvs = unknowns(sys),
154154
end
155155

156156
function generate_function(sys::AbstractODESystem, dvs = unknowns(sys),
157-
ps = parameters(sys; initial_parameters = true);
157+
ps = parameters(sys; initial = true);
158158
implicit_dae = false,
159159
ddvs = implicit_dae ? map(Differential(get_iv(sys)), dvs) :
160160
nothing,

src/systems/diffeqs/odesystem.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ function flatten(sys::ODESystem, noeqs = false)
405405
return ODESystem(noeqs ? Equation[] : equations(sys),
406406
get_iv(sys),
407407
unknowns(sys),
408-
parameters(sys; initial_parameters = true),
408+
parameters(sys; initial = true),
409409
parameter_dependencies = parameter_dependencies(sys),
410410
guesses = guesses(sys),
411411
observed = observed(sys),
@@ -482,7 +482,7 @@ function build_explicit_observed_function(sys, ts;
482482
eval_module = @__MODULE__,
483483
output_type = Array,
484484
checkbounds = true,
485-
ps = parameters(sys; initial_parameters = true),
485+
ps = parameters(sys; initial = true),
486486
return_inplace = false,
487487
param_only = false,
488488
op = Operator,

src/systems/diffeqs/sdesystem.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ function __get_num_diag_noise(mat)
418418
end
419419

420420
function generate_diffusion_function(sys::SDESystem, dvs = unknowns(sys),
421-
ps = parameters(sys; initial_parameters = true); isdde = false, kwargs...)
421+
ps = parameters(sys; initial = true); isdde = false, kwargs...)
422422
eqs = get_noiseeqs(sys)
423423
p = reorder_parameters(sys, ps)
424424
return build_function_wrapper(sys, eqs, dvs, p..., get_iv(sys); kwargs...)

src/systems/index_cache.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ function IndexCache(sys::AbstractSystem)
194194
[BufferTemplate(symtype, length(buf)) for buf in disc_syms_by_partition])
195195
end
196196

197-
for p in parameters(sys; initial_parameters = true)
197+
for p in parameters(sys; initial = true)
198198
p = unwrap(p)
199199
ctype = symtype(p)
200200
if ctype <: FnType
@@ -492,7 +492,7 @@ function check_index_map(idxmap, sym)
492492
end
493493

494494
function reorder_parameters(
495-
sys::AbstractSystem, ps = parameters(sys; initial_parameters = true); kwargs...)
495+
sys::AbstractSystem, ps = parameters(sys; initial = true); kwargs...)
496496
if has_index_cache(sys) && get_index_cache(sys) !== nothing
497497
reorder_parameters(get_index_cache(sys), ps; kwargs...)
498498
elseif ps isa Tuple

src/systems/nonlinear/initializesystem.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ function generate_initializesystem(sys::AbstractTimeDependentSystem;
121121

122122
# parameters do not include ones that became initialization unknowns
123123
pars = Vector{SymbolicParam}(filter(
124-
p -> !haskey(paramsubs, p), parameters(sys; initial_parameters = true)))
124+
p -> !haskey(paramsubs, p), parameters(sys; initial = true)))
125125
push!(pars, get_iv(sys))
126126

127127
# 8) use observed equations for guesses of observed variables if not provided
@@ -233,7 +233,7 @@ function generate_initializesystem(sys::AbstractTimeIndependentSystem;
233233

234234
# parameters do not include ones that became initialization unknowns
235235
pars = Vector{SymbolicParam}(filter(
236-
p -> !haskey(paramsubs, p), parameters(sys; initial_parameters = true)))
236+
p -> !haskey(paramsubs, p), parameters(sys; initial = true)))
237237
vars = collect(values(paramsubs))
238238

239239
# even if `p => tovar(p)` is in `paramsubs`, `isparameter(p[1]) === true` after substitution

src/systems/nonlinear/nonlinearsystem.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ end
281281

282282
function generate_jacobian(
283283
sys::NonlinearSystem, vs = unknowns(sys), ps = parameters(
284-
sys; initial_parameters = true);
284+
sys; initial = true);
285285
sparse = false, simplify = false, kwargs...)
286286
jac = calculate_jacobian(sys, sparse = sparse, simplify = simplify)
287287
p = reorder_parameters(sys, ps)
@@ -302,7 +302,7 @@ end
302302

303303
function generate_hessian(
304304
sys::NonlinearSystem, vs = unknowns(sys), ps = parameters(
305-
sys; initial_parameters = true);
305+
sys; initial = true);
306306
sparse = false, simplify = false, kwargs...)
307307
hess = calculate_hessian(sys, sparse = sparse, simplify = simplify)
308308
p = reorder_parameters(sys, ps)
@@ -311,7 +311,7 @@ end
311311

312312
function generate_function(
313313
sys::NonlinearSystem, dvs = unknowns(sys), ps = parameters(
314-
sys; initial_parameters = true);
314+
sys; initial = true);
315315
scalar = false, kwargs...)
316316
rhss = [deq.rhs for deq in equations(sys)]
317317
dvs′ = value.(dvs)
@@ -602,7 +602,7 @@ end
602602
function CacheWriter(sys::AbstractSystem, buffer_types::Vector{TypeT},
603603
exprs::Dict{TypeT, Vector{Any}}, solsyms, obseqs::Vector{Equation};
604604
eval_expression = false, eval_module = @__MODULE__)
605-
ps = parameters(sys; initial_parameters = true)
605+
ps = parameters(sys; initial = true)
606606
rps = reorder_parameters(sys, ps)
607607
obs_assigns = [eq.lhs eq.rhs for eq in obseqs]
608608
body = map(eachindex(buffer_types), buffer_types) do i, T
@@ -632,7 +632,7 @@ struct SCCNonlinearFunction{iip} end
632632
function SCCNonlinearFunction{iip}(
633633
sys::NonlinearSystem, _eqs, _dvs, _obs, cachesyms; eval_expression = false,
634634
eval_module = @__MODULE__, kwargs...) where {iip}
635-
ps = parameters(sys; initial_parameters = true)
635+
ps = parameters(sys; initial = true)
636636
rps = reorder_parameters(sys, ps)
637637

638638
obs_assignments = [eq.lhs eq.rhs for eq in _obs]

0 commit comments

Comments
 (0)