Merge pull request #4674 from SciML/as/fewer-warnings

refactor: eliminate unnecessary maxiters warnings if `missing_guess_value` is not `Error`

Author: AayushSabharwal

lib/ModelingToolkitBase/src/systems/parameter_buffer.jl

@@ -107,7 +107,8 @@ function MTKParameters(
     # Substitute through `AADSubWrapper` so that `COMMON_NOTHING` holes in partially
     # specified array values are never substituted into expressions (issue #4607).
     wrapped_op = AADSubWrapper(op)
-    evaluate_varmap!(wrapped_op, all_ps; limit = substitution_limit)
+    ir = get_irstructure(sys)
+    evaluate_varmap!(ir, wrapped_op, all_ps; limit = substitution_limit)
 
     tunable_buffer = Vector{ic.tunable_buffer_size.type}(
         undef, ic.tunable_buffer_size.length

lib/ModelingToolkitBase/src/systems/problem_utils.jl

@@ -332,7 +332,7 @@ Keyword arguments:
   itself to get a numeric value for each variable in `vars`.
 """
 function varmap_to_vars(
-        varmap::AbstractDict, vars::Vector;
+        varmap::AbstractDict, vars::Vector; ir = nothing,
         tofloat = true, use_union = false, container_type = Array, buffer_eltype = Nothing,
         toterm = default_toterm, check = true, allow_symbolic = false,
         is_initializeprob = false, substitution_limit = 100, missing_values = MissingGuessValue.Error()
@@ -345,7 +345,21 @@ function varmap_to_vars(
     if toterm !== nothing
         add_toterms!(varmap; toterm)
     end
-    evaluate_varmap!(AtomicArrayDictSubstitutionWrapper(varmap), vars; limit = substitution_limit, allow_symbolic)
+    if ir !== nothing
+        evaluate_varmap!(
+            ir, AtomicArrayDictSubstitutionWrapper(varmap), vars;
+            limit = substitution_limit,
+            allow_symbolic = allow_symbolic ||
+                !Moshi.Data.isa_variant(missing_values, MissingGuessValue.Error)
+        )
+    else
+        evaluate_varmap!(
+            AtomicArrayDictSubstitutionWrapper(varmap), vars;
+            limit = substitution_limit,
+            allow_symbolic = allow_symbolic ||
+                !Moshi.Data.isa_variant(missing_values, MissingGuessValue.Error)
+        )
+    end
     if check && !allow_symbolic
         missing_vars = missingvars(varmap, vars; toterm)
         for var in vars
@@ -519,6 +533,20 @@ function evaluate_varmap!(varmap::AbstractDict{SymbolicT, SymbolicT}, vars; limi
     return
 end
 
+function evaluate_varmap!(
+        ir::IRStructure{SymReal}, varmap::AtomicArrayDictSubstitutionWrapper, vars;
+        limit = 100, allow_symbolic = false
+    )
+    subber = Symbolics.FixpointSubstituter(SU.IRSubstituter{true}(ir, varmap); maxiters = limit, warn_maxiters = !allow_symbolic)
+    for k in vars
+        v = get(varmap, k, COMMON_NOTHING)
+        v === COMMON_NOTHING && continue
+        SU.isconst(v) && continue
+        varmap[k] = subber(v)
+    end
+    return
+end
+
 """
     $(TYPEDSIGNATURES)
 
@@ -1932,15 +1960,16 @@ function __process_SciMLProblem(
         end
     end
 
+    ir = get_irstructure(sys)
     if is_initializeprob
         u0 = varmap_to_vars(
-            op, dvs; buffer_eltype = u0_eltype, container_type = u0Type,
+            op, dvs; ir, buffer_eltype = u0_eltype, container_type = u0Type,
             allow_symbolic = symbolic_u0, is_initializeprob, substitution_limit,
             missing_values = missing_guess_value
         )
     else
         u0 = varmap_to_vars(
-            op, dvs; buffer_eltype = u0_eltype, container_type = u0Type,
+            op, dvs; ir, buffer_eltype = u0_eltype, container_type = u0Type,
             allow_symbolic = symbolic_u0, is_initializeprob, substitution_limit
         )
     end