Merge pull request #100 from bauglir/set-ODESystem-defaults

Set known defaults for a `CellModel`s `ODESystem`

Project.toml

@@ -1,7 +1,7 @@
 name = "CellMLToolkit"
 uuid = "03cb29e0-1ef4-4721-aa24-cf58a006576f"
 authors = ["Shahriar Iravanian <siravan@svtsim.com>"]
-version = "2.9.1"
+version = "2.9.2"
 
 [deps]
 EzXML = "8f5d6c58-4d21-5cfd-889c-e3ad7ee6a615"

src/components.jl

@@ -234,6 +234,11 @@ function process_components(doc::Document; simplify = true)
     if simplify
         sys = structural_simplify(sys)
         @set! sys.eqs = substitute_eqs(equations(sys), post_sub)
+
+        # Defaults need to be set after simplifying as otherwise parameters and
+        # states for which no defaults are available may still be present in
+        # the system
+        @set! sys.defaults = Dict(find_list_value(doc, vcat(parameters(sys), states(sys))))
     end
 
     return sys

test/beeler.jl

@@ -17,6 +17,15 @@ V2 = map(x -> x[1], sol2.u)
 err = sum(abs.(V1 .- V2)) / length(V1)
 @test err < 0.1
 
+# Ensure defaults are set and that generating an `ODEProblem` directly from the
+# `ODESystem` is equivalent to doing so from a `CellModel`
+@test length(ModelingToolkit.defaults(ml.sys)) > 0
+sys_prob = ODEProblem(ml.sys; tspan = (0, 10000.0))
+sol3 = solve(prob, Euler(), dt = 0.01, saveat = 1.0)
+V3 = map(x -> x[1], sol3.u)
+err2 = sum(abs.(V1 .- V3)) / length(V1)
+@test err2 ≈ 0
+
 # prob = ODEProblem(ml, (0,10000.0); jac=true)
 # sol3 = solve(prob, TRBDF2(), dtmax=0.5, saveat=1.0)
 # V3 = map(x -> x[1], sol2.u)

test/noble_1962.jl

@@ -6,5 +6,14 @@ sol1 = solve(prob, Euler(), dt = 0.01, saveat = 1.0)
 sol2 = solve(prob, TRBDF2(), dtmax = 0.5, saveat = 1.0)
 V1 = map(x -> x[2], sol1.u)
 V2 = map(x -> x[2], sol2.u)
-err = sum(abs.(V1 .- V2)) / length(V1)
-@test err < 1.0
+err1 = sum(abs.(V1 .- V2)) / length(V1)
+@test err1 < 1.0
+
+# Ensure defaults are set and that generating an `ODEProblem` directly from the
+# `ODESystem` is equivalent to doing so from a `CellModel`
+@test length(ModelingToolkit.defaults(ml.sys)) > 0
+sys_prob = ODEProblem(ml.sys; tspan = (0, 10000.0))
+sol3 = solve(prob, Euler(), dt = 0.01, saveat = 1.0)
+V3 = map(x -> x[2], sol3.u)
+err2 = sum(abs.(V1 .- V3)) / length(V1)
+@test err2 ≈ 0