Skip to content

Commit 556963e

Browse files
fix: extra keywords passed to MTKParameters
1 parent dc98d54 commit 556963e

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

src/systems/abstractsystem.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2266,14 +2266,13 @@ function linearization_function(sys::AbstractSystem, inputs,
22662266
end
22672267
x0 = merge(defaults_and_guesses(sys), op)
22682268
if has_index_cache(sys) && get_index_cache(sys) !== nothing
2269-
sys_ps = MTKParameters(sys, p, x0; eval_expression, eval_module)
2269+
sys_ps = MTKParameters(sys, p, x0)
22702270
else
22712271
sys_ps = varmap_to_vars(p, parameters(sys); defaults = x0)
22722272
end
22732273
p[get_iv(sys)] = NaN
22742274
if has_index_cache(initsys) && get_index_cache(initsys) !== nothing
2275-
oldps = MTKParameters(initsys, p, merge(guesses(sys), defaults(sys), op);
2276-
eval_expression, eval_module)
2275+
oldps = MTKParameters(initsys, p, merge(guesses(sys), defaults(sys), op))
22772276
initsys_ps = parameters(initsys)
22782277
p_getter = build_explicit_observed_function(
22792278
sys, initsys_ps; eval_expression, eval_module)

src/systems/diffeqs/abstractodesystem.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ function process_DEProblem(constructor, sys::AbstractODESystem, u0map, parammap;
842842
parammap == SciMLBase.NullParameters() && isempty(defs)
843843
nothing
844844
else
845-
MTKParameters(sys, parammap, trueinit; t0 = t, eval_expression, eval_module)
845+
MTKParameters(sys, parammap, trueinit; t0 = t)
846846
end
847847
else
848848
u0, p, defs = get_u0_p(sys,

src/systems/discrete_system/discrete_system.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ function process_DiscreteProblem(constructor, sys::DiscreteSystem, u0map, paramm
254254
end
255255
if has_index_cache(sys) && get_index_cache(sys) !== nothing
256256
u0, defs = get_u0(sys, trueu0map, parammap)
257-
p = MTKParameters(sys, parammap, trueu0map; eval_expression, eval_module)
257+
p = MTKParameters(sys, parammap, trueu0map)
258258
else
259259
u0, p, defs = get_u0_p(sys, trueu0map, parammap; tofloat, use_union)
260260
end

src/systems/jumps/jumpsystem.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ function DiffEqBase.DiscreteProblem(sys::JumpSystem, u0map, tspan::Union{Tuple,
352352

353353
u0 = varmap_to_vars(u0map, dvs; defaults = defs, tofloat = false)
354354
if has_index_cache(sys) && get_index_cache(sys) !== nothing
355-
p = MTKParameters(sys, parammap, u0map; eval_expression, eval_module)
355+
p = MTKParameters(sys, parammap, u0map)
356356
else
357357
p = varmap_to_vars(parammap, ps; defaults = defs, tofloat = false, use_union)
358358
end
@@ -458,7 +458,7 @@ function DiffEqBase.ODEProblem(sys::JumpSystem, u0map, tspan::Union{Tuple, Nothi
458458

459459
u0 = varmap_to_vars(u0map, dvs; defaults = defs, tofloat = false)
460460
if has_index_cache(sys) && get_index_cache(sys) !== nothing
461-
p = MTKParameters(sys, parammap, u0map; eval_expression, eval_module)
461+
p = MTKParameters(sys, parammap, u0map)
462462
else
463463
p = varmap_to_vars(parammap, ps; defaults = defs, tofloat = false, use_union)
464464
end

src/systems/optimization/optimizationsystem.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem, u0map,
290290
if parammap isa MTKParameters
291291
p = parammap
292292
elseif has_index_cache(sys) && get_index_cache(sys) !== nothing
293-
p = MTKParameters(sys, parammap, u0map; eval_expression, eval_module)
293+
p = MTKParameters(sys, parammap, u0map)
294294
else
295295
p = varmap_to_vars(parammap, ps; defaults = defs, tofloat = false, use_union)
296296
end
@@ -524,7 +524,7 @@ function OptimizationProblemExpr{iip}(sys::OptimizationSystem, u0map,
524524

525525
u0 = varmap_to_vars(u0map, dvs; defaults = defs, tofloat = false)
526526
if has_index_cache(sys) && get_index_cache(sys) !== nothing
527-
p = MTKParameters(sys, parammap, u0map; eval_expression, eval_module)
527+
p = MTKParameters(sys, parammap, u0map)
528528
else
529529
p = varmap_to_vars(parammap, ps; defaults = defs, tofloat = false, use_union)
530530
end

0 commit comments

Comments
 (0)