simplifies _varmap_to_vars

Author: ValentinKaisermayer

src/systems/jumps/jumpsystem.jl

@@ -225,8 +225,8 @@ function DiffEqBase.DiscreteProblem(sys::JumpSystem, u0map, tspan::Union{Tuple,N
     ps = parameters(sys)
 
     defs = defaults(sys)
-    # defs = mergedefaults(defs,parammap,ps)
-    # defs = mergedefaults(defs,u0map,dvs) # fill result in wrong type for u0
+    defs = mergedefaults(defs,parammap,ps)
+    defs = mergedefaults(defs,u0map,dvs) 
 
     u0 = varmap_to_vars(u0map,dvs; defaults=defs)
     p = varmap_to_vars(parammap,ps; defaults=defs)

src/variables.jl

@@ -73,23 +73,13 @@ function _varmap_to_vars(varmap::Dict, varlist; defaults=Dict(), check=false, to
     varmap = Dict(toterm(value(k))=>value(varmap[k]) for k in keys(varmap))
     # resolve symbolic parameter expressions
     for (p, v) in pairs(varmap)
-        val = varmap[p] = fixpoint_sub(v, varmap)
+        varmap[p] = fixpoint_sub(v, varmap)
     end
-    vs = values(varmap)
-    T′ = eltype(vs)
-    if Base.isconcretetype(T′)
-        T = T′
-    else
-        T = foldl((t, elem)->promote_type(t, eltype(elem)), vs; init=typeof(first(vs)))
-    end
-    out = Vector{T}(undef, length(varlist))
+    
     missingvars = setdiff(varlist, keys(varmap))
     check && (isempty(missingvars) || throw_missingvars(missingvars))
 
-    for (i, var) in enumerate(varlist)
-        out[i] = varmap[var]
-    end
-    out
+    out = [varmap[var] for var in varlist]
 end
 
 @noinline throw_missingvars(vars) = throw(ArgumentError("$vars are missing from the variable map."))