fix _varmap_to_vars, re-enable dde.jl test

Author: MasonProtter

src/systems/diffeqs/abstractodesystem.jl

@@ -1205,7 +1205,7 @@ function DiffEqBase.SDDEProblem{iip}(sys::AbstractODESystem, u0map = [],
     h_oop, h_iip = generate_history(sys, u0)
     h(out, p, t) = h_iip(out, p, t)
     h(p, t) = h_oop(p, t)
-    u0 = h(p, tspan[1])
+    u0 = h(p..., tspan[1])
     cbs = process_events(sys; callback, kwargs...)
     inits = []
     if has_discrete_subsystems(sys) && (dss = get_discrete_subsystems(sys)) !== nothing

src/variables.jl

@@ -193,9 +193,7 @@ function _varmap_to_vars(varmap::Dict, varlist; defaults = Dict(), check = false
     for var in varlist
         var = unwrap(var)
         val = unwrap(fixpoint_sub(fixpoint_sub(var, varmap), defaults))
-        if symbolic_type(val) === NotSymbolic()
-            values[var] = val
-        end
+        values[var] = val
     end
     missingvars = setdiff(varlist, collect(keys(values)))
     check && (isempty(missingvars) || throw(MissingVariablesError(missingvars)))

test/dde.jl

@@ -1,4 +1,6 @@
 using ModelingToolkit, DelayDiffEq, Test
+using ModelingToolkit: t_nounits as t, D_nounits as D
+
 p0 = 0.2;
 q0 = 0.3;
 v0 = 1;
@@ -29,21 +31,21 @@ prob2 = DDEProblem(bc_model, u0, h2, tspan, constant_lags = lags)
 sol2 = solve(prob2, alg, reltol = 1e-7, abstol = 1e-10)
 
 @parameters p0=0.2 p1=0.2 q0=0.3 q1=0.3 v0=1 v1=1 d0=5 d1=1 d2=1 beta0=1 beta1=1
-@variables t x₀(t) x₁(t) x₂(..)
+@variables x₀(t) x₁(t) x₂(..)
 tau = 1
-D = Differential(t)
 eqs = [D(x₀) ~ (v0 / (1 + beta0 * (x₂(t - tau)^2))) * (p0 - q0) * x₀ - d0 * x₀
        D(x₁) ~ (v0 / (1 + beta0 * (x₂(t - tau)^2))) * (1 - p0 + q0) * x₀ +
                (v1 / (1 + beta1 * (x₂(t - tau)^2))) * (p1 - q1) * x₁ - d1 * x₁
        D(x₂(t)) ~ (v1 / (1 + beta1 * (x₂(t - tau)^2))) * (1 - p1 + q1) * x₁ - d2 * x₂(t)]
-@named sys = System(eqs)
-prob = DDEProblem(sys,
+@named sys = System(eqs, t)
+final_sys = structural_simplify(sys)
+prob = DDEProblem(final_sys,
     [x₀ => 1.0, x₁ => 1.0, x₂(t) => 1.0],
     tspan,
     constant_lags = [tau])
 sol_mtk = solve(prob, alg, reltol = 1e-7, abstol = 1e-10)
 @test sol_mtk.u[end] ≈ sol.u[end]
-prob2 = DDEProblem(sys,
+prob2 = DDEProblem(final_sys,
     [x₀ => 1.0 - t * q1 * 10, x₁ => 1.0 - t * q1 * 10, x₂(t) => 1.0 - t * q1 * 10],
     tspan,
     constant_lags = [tau])
@@ -70,21 +72,18 @@ prob = SDDEProblem(hayes_modelf, hayes_modelg, [1.0], h, tspan, pmul;
     constant_lags = (pmul[1],));
 sol = solve(prob, RKMil())
 
-@variables t x(..)
+@variables x(..)
 @parameters a=-4.0 b=-2.0 c=10.0 α=-1.3 β=-1.2 γ=1.1
-D = Differential(t)
 @brownian η
 τ = 1.0
 eqs = [D(x(t)) ~ a * x(t) + b * x(t - τ) + c + (α * x(t) + γ) * η]
-@named sys = System(eqs)
+@named sys = System(eqs, t)
 sys = structural_simplify(sys)
 @test equations(sys) == [D(x(t)) ~ a * x(t) + b * x(t - τ) + c]
 @test isequal(ModelingToolkit.get_noiseeqs(sys), [α * x(t) + γ;;])
 prob_mtk = SDDEProblem(sys, [x(t) => 1.0 + t], tspan; constant_lags = (τ,));
 @test_nowarn sol_mtk = solve(prob_mtk, RKMil())
 
-@variables t
-D = Differential(t)
 @parameters x(..) a
 
 function oscillator(; name, k = 1.0, τ = 0.01)
@@ -93,7 +92,7 @@ function oscillator(; name, k = 1.0, τ = 0.01)
     eqs = [D(x(t)) ~ y,
         D(y) ~ -k * x(t - τ) + jcn,
         delx ~ x(t - τ)]
-    return System(eqs; name = name)
+    return System(eqs, t; name = name)
 end
 
 systems = @named begin

test/runtests.jl

@@ -35,6 +35,7 @@ end
             @safetestset "Mass Matrix Test" include("mass_matrix.jl")
             @safetestset "SteadyStateSystem Test" include("steadystatesystems.jl")
             @safetestset "SDESystem Test" include("sdesystem.jl")
+            @safetestset "DDESystem Test" include("dde.jl")
             @safetestset "NonlinearSystem Test" include("nonlinearsystem.jl")
             @safetestset "InitializationSystem Test" include("initializationsystem.jl")
             @safetestset "PDE Construction Test" include("pde.jl")