add tests

Author: vyudu

src/systems/problem_utils.jl

@@ -687,11 +687,11 @@ function process_SciMLProblem(
 
     u0map = to_varmap(u0map, dvs)
     symbols_to_symbolics!(sys, u0map)
-    check_keys(sys, u0map)
 
     pmap = to_varmap(pmap, ps)
     symbols_to_symbolics!(sys, pmap)
-    check_keys(sys, pmap)
+
+    check_inputmap_keys(sys, u0map, pmap)
 
     defs = add_toterms(recursive_unwrap(defaults(sys)))
     cmap, cs = get_cmap(sys)
@@ -783,29 +783,37 @@ end
 
 # Check that the keys of a u0map or pmap are valid
 # (i.e. are symbolic keys, and are defined for the system.)
-function check_keys(sys, map) 
-    badkeys = Any[]
-    for k in keys(map)
+function check_inputmap_keys(sys, u0map, pmap)
+    badvarkeys = Any[]
+    for k in keys(u0map)
         if symbolic_type(k) === NotSymbolic()
-            push!(badkeys, k)
+            push!(badvarkeys, k)
         end
     end
 
-    isempty(badkeys) || throw(BadKeyError(collect(badkeys)))
+    badparamkeys = Any[]
+    for k in keys(pmap)
+        if symbolic_type(k) === NotSymbolic()
+            push!(badparamkeys, k)
+        end
+    end
+    (isempty(badvarkeys) && isempty(badparamkeys)) || throw(InvalidKeyError(collect(badvarkeys), collect(badparamkeys)))
 end
 
 const BAD_KEY_MESSAGE = """
-                        Undefined keys found in the parameter or initial condition maps. 
-                        The following keys are either invalid or not parameters/states of the system:
+                        Undefined keys found in the parameter or initial condition maps. Check if symbolic variable names have been reassigned. 
+                        The following keys are invalid:
                         """
 
-struct BadKeyError <: Exception
+struct InvalidKeyError <: Exception
     vars::Any
+    params::Any
 end
 
-function Base.showerror(io::IO, e::BadKeyError) 
+function Base.showerror(io::IO, e::InvalidKeyError) 
     println(io, BAD_KEY_MESSAGE)
-    println(io, join(e.vars, ", "))
+    println(io, "u0map: $(join(e.vars, ", "))")
+    println(io, "pmap: $(join(e.params, ", "))")
 end
 
 

test/odesystem.jl

@@ -1626,3 +1626,18 @@ end
     prob = ODEProblem{false}(lowered_dae_sys; u0_constructor = x -> SVector(x...))
     @test prob.u0 isa SVector
 end
+
+@testset "input map validation" begin
+    import ModelingToolkit: InvalidKeyError 
+    @variables x(t) y(t) z(t)
+    @parameters a b c d 
+    eqs = [D(x) ~ x*a, D(y) ~ y*c, D(z) ~ b + d]
+    @mtkbuild sys = ODESystem(eqs, t)
+    pmap = [a => 1, b => 2, c => 3, d => 4, "b" => 2]
+    u0map = [x => 1, y => 2, z => 3]
+    @test_throws InvalidKeyError ODEProblem(sys, u0map, (0., 1.), pmap)
+
+    pmap = [a => 1, b => 2, c => 3, d => 4]
+    u0map = [x => 1, y => 2, z => 3, :0 => 3]
+    @test_throws InvalidKeyError ODEProblem(sys, u0map, (0., 1.), pmap)
+end