feat: evaluate in better_varmap_to_vars

Author: AayushSabharwal

src/systems/problem_utils.jl

@@ -328,11 +328,26 @@ function Base.showerror(io::IO, err::MissingGuessError)
         In order to resolve this, please provide additional numeric guesses so that the chain can be resolved to assign numeric values to each variable.            """)
 end
 
+const MISSING_VARIABLES_MESSAGE = """
+                                Initial condition underdefined. Some are missing from the variable map.
+                                Please provide a default (`u0`), initialization equation, or guess
+                                for the following variables:
+                                """
+
+struct MissingVariablesError <: Exception
+    vars::Any
+end
+
+function Base.showerror(io::IO, e::MissingVariablesError)
+    println(io, MISSING_VARIABLES_MESSAGE)
+    println(io, join(e.vars, ", "))
+end
+
 """
     $(TYPEDSIGNATURES)
 
 Return an array of values where the `i`th element corresponds to the value of `vars[i]`
-in `varmap`. Does not perform symbolic substitution in the values of `varmap`.
+in `varmap`. Will mutate `varmap` by symbolically substituting it into itself.
 
 Keyword arguments:
 - `tofloat`: Convert values to floating point numbers using `float`.
@@ -345,11 +360,13 @@ Keyword arguments:
 - `allow_symbolic` allows the returned array to contain symbolic values. If this is `true`,
   `promotetoconcrete` is set to `false`.
 - `is_initializeprob, guesses`: Used to determine whether the system is missing guesses.
+- `substitution_limit`: The maximum number of times to substitute `varmap` into itself to
+  obtain numerical values for the variables in `vars`.
 """
 function better_varmap_to_vars(varmap::AbstractDict, vars::Vector;
         tofloat = true, container_type = Array, floatT = Nothing,
         toterm = default_toterm, promotetoconcrete = nothing, check = true,
-        allow_symbolic = false, is_initializeprob = false)
+        allow_symbolic = false, is_initializeprob = false, substitution_limit = 1000)
     isempty(vars) && return nothing
 
     varmap = recursive_unwrap(varmap)
@@ -358,6 +375,7 @@ function better_varmap_to_vars(varmap::AbstractDict, vars::Vector;
         missing_vars = missingvars(varmap, vars; toterm)
         isempty(missing_vars) || throw(MissingVariablesError(missing_vars))
     end
+    evaluate_varmap!(varmap, vars; limit = substitution_limit)
     vals = map(x -> varmap[x], vars)
     if !allow_symbolic
         missingsyms = Any[]