Merge pull request #2640 from AayushSabharwal/as/error-missing-params

fix: error when all parameters are not initialized

Author: ChrisRackauckas

src/systems/diffeqs/abstractodesystem.jl

@@ -876,31 +876,34 @@ function process_DEProblem(constructor, sys::AbstractODESystem, u0map, parammap;
             parammap = Dict(unwrap.(parameters(sys)) .=> parammap)
         end
     end
-    clockedparammap = Dict()
-    defs = ModelingToolkit.get_defaults(sys)
-    for v in ps
-        v = unwrap(v)
-        is_discrete_domain(v) || continue
-        op = operation(v)
-        if !isa(op, Symbolics.Operator) && parammap != SciMLBase.NullParameters() &&
-           haskey(parammap, v)
-            error("Initial conditions for discrete variables must be for the past state of the unknown. Instead of providing the condition for $v, provide the condition for $(Shift(iv, -1)(v)).")
+
+    if has_discrete_subsystems(sys) && get_discrete_subsystems(sys) !== nothing
+        clockedparammap = Dict()
+        defs = ModelingToolkit.get_defaults(sys)
+        for v in ps
+            v = unwrap(v)
+            is_discrete_domain(v) || continue
+            op = operation(v)
+            if !isa(op, Symbolics.Operator) && parammap != SciMLBase.NullParameters() &&
+               haskey(parammap, v)
+                error("Initial conditions for discrete variables must be for the past state of the unknown. Instead of providing the condition for $v, provide the condition for $(Shift(iv, -1)(v)).")
+            end
+            shiftedv = StructuralTransformations.simplify_shifts(Shift(iv, -1)(v))
+            if parammap != SciMLBase.NullParameters() &&
+               (val = get(parammap, shiftedv, nothing)) !== nothing
+                clockedparammap[v] = val
+            elseif op isa Shift
+                root = arguments(v)[1]
+                haskey(defs, root) || error("Initial condition for $v not provided.")
+                clockedparammap[v] = defs[root]
+            end
         end
-        shiftedv = StructuralTransformations.simplify_shifts(Shift(iv, -1)(v))
-        if parammap != SciMLBase.NullParameters() &&
-           (val = get(parammap, shiftedv, nothing)) !== nothing
-            clockedparammap[v] = val
-        elseif op isa Shift
-            root = arguments(v)[1]
-            haskey(defs, root) || error("Initial condition for $v not provided.")
-            clockedparammap[v] = defs[root]
+        parammap = if parammap == SciMLBase.NullParameters()
+            clockedparammap
+        else
+            merge(parammap, clockedparammap)
         end
     end
-    parammap = if parammap == SciMLBase.NullParameters()
-        clockedparammap
-    else
-        merge(parammap, clockedparammap)
-    end
     # TODO: make it work with clocks
     # ModelingToolkit.get_tearing_state(sys) !== nothing => Requires structural_simplify first
     if sys isa ODESystem && build_initializeprob &&
@@ -931,7 +934,12 @@ function process_DEProblem(constructor, sys::AbstractODESystem, u0map, parammap;
     if has_index_cache(sys) && get_index_cache(sys) !== nothing
         u0, defs = get_u0(sys, trueinit, parammap; symbolic_u0)
         check_eqs_u0(eqs, dvs, u0; kwargs...)
-        p = MTKParameters(sys, parammap, trueinit)
+        p = if parammap === nothing ||
+               parammap == SciMLBase.NullParameters() && isempty(defs)
+            nothing
+        else
+            MTKParameters(sys, parammap, trueinit)
+        end
     else
         u0, p, defs = get_u0_p(sys,
             trueinit,
@@ -1592,7 +1600,6 @@ function InitializationProblem{iip, specialize}(sys::AbstractODESystem,
     if !iscomplete(sys)
         error("A completed system is required. Call `complete` or `structural_simplify` on the system before creating an `ODEProblem`")
     end
-
     if isempty(u0map) && get_initializesystem(sys) !== nothing
         isys = get_initializesystem(sys)
     elseif isempty(u0map) && get_initializesystem(sys) === nothing
@@ -1620,9 +1627,9 @@ function InitializationProblem{iip, specialize}(sys::AbstractODESystem,
         @warn "Initialization system is underdetermined. $neqs equations for $nunknown unknowns. Initialization will default to using least squares. To suppress this warning pass warn_initialize_determined = false."
     end
 
-    parammap isa DiffEqBase.NullParameters || isempty(parammap) ?
-    [get_iv(sys) => t] :
-    merge(todict(parammap), Dict(get_iv(sys) => t))
+    parammap = parammap isa DiffEqBase.NullParameters || isempty(parammap) ?
+               [get_iv(sys) => t] :
+               merge(todict(parammap), Dict(get_iv(sys) => t))
 
     if neqs == nunknown
         NonlinearProblem(isys, guesses, parammap)

src/systems/nonlinear/nonlinearsystem.jl

@@ -241,7 +241,6 @@ function generate_function(
     pre, sol_states = get_substitutions_and_solved_unknowns(sys)
 
     p = reorder_parameters(sys, value.(ps))
-    @show p ps
     return build_function(rhss, value.(dvs), p...; postprocess_fbody = pre,
         states = sol_states, kwargs...)
 end
@@ -395,7 +394,6 @@ function process_NonlinearProblem(constructor, sys::NonlinearSystem, u0map, para
     eqs = equations(sys)
     dvs = unknowns(sys)
     ps = full_parameters(sys)
-
     if has_index_cache(sys) && get_index_cache(sys) !== nothing
         u0, defs = get_u0(sys, u0map, parammap)
         check_eqs_u0(eqs, dvs, u0; kwargs...)

src/systems/parameter_buffer.jl

@@ -43,14 +43,32 @@ function MTKParameters(
     p = merge(defs, p)
     p = merge(Dict(unwrap(k) => v for (k, v) in p),
         Dict(default_toterm(unwrap(k)) => v for (k, v) in p))
-    p = Dict(k => fixpoint_sub(v, p) for (k, v) in p)
+    p = Dict(unwrap(k) => fixpoint_sub(v, p) for (k, v) in p)
     for (sym, _) in p
         if istree(sym) && operation(sym) === getindex &&
            first(arguments(sym)) in all_ps
             error("Scalarized parameter values ($sym) are not supported. Instead of `[p[1] => 1.0, p[2] => 2.0]` use `[p => [1.0, 2.0]]`")
         end
     end
 
+    missing_params = Set()
+    for idxmap in (ic.tunable_idx, ic.discrete_idx, ic.constant_idx, ic.nonnumeric_idx)
+        for sym in keys(idxmap)
+            sym isa Symbol && continue
+            haskey(p, sym) && continue
+            hasname(sym) && haskey(p, getname(sym)) && continue
+            ttsym = default_toterm(sym)
+            haskey(p, ttsym) && continue
+            hasname(ttsym) && haskey(p, getname(ttsym)) && continue
+
+            istree(sym) && operation(sym) === getindex && haskey(p, arguments(sym)[1]) &&
+                continue
+            push!(missing_params, sym)
+        end
+    end
+
+    isempty(missing_params) || throw(MissingVariablesError(collect(missing_params)))
+
     tunable_buffer = Tuple(Vector{temp.type}(undef, temp.length)
     for temp in ic.tunable_buffer_sizes)
     disc_buffer = Tuple(Vector{temp.type}(undef, temp.length)

test/mtkparameters.jl

@@ -121,3 +121,16 @@ ps = MTKParameters(sys, [p => 1.0, q => 2.0, r => 3.0])
 newps = remake_buffer(sys, ps, Dict(p => 1.0f0))
 @test newps.tunable[1] isa Vector{Float32}
 @test newps.tunable[1] == [1.0f0, 2.0f0, 3.0f0]
+
+# Issue#2624
+@parameters p d
+@variables X(t)
+eqs = [D(X) ~ p - d * X]
+@mtkbuild sys = ODESystem(eqs, t)
+
+u0 = [X => 1.0]
+tspan = (0.0, 100.0)
+ps = [p => 1.0] # Value for `d` is missing
+
+@test_throws ModelingToolkit.MissingVariablesError ODEProblem(sys, u0, tspan, ps)
+@test_nowarn ODEProblem(sys, u0, tspan, [ps..., d => 1.0])