feat: return observed equations in SII.default_values, add test

also move SII testset to SII group

Author: AayushSabharwal

src/systems/abstractsystem.jl

@@ -495,7 +495,12 @@ function SymbolicIndexingInterface.is_observed(sys::AbstractSystem, sym)
            !is_independent_variable(sys, sym) && symbolic_type(sym) != NotSymbolic()
 end
 
-SymbolicIndexingInterface.default_values(sys::AbstractSystem) = get_defaults(sys)
+function SymbolicIndexingInterface.default_values(sys::AbstractSystem)
+    return merge(
+        Dict(eq.lhs => eq.rhs for eq in observed(sys)),
+        defaults(sys)
+    )
+end
 
 SymbolicIndexingInterface.is_time_dependent(::AbstractTimeDependentSystem) = true
 SymbolicIndexingInterface.is_time_dependent(::AbstractTimeIndependentSystem) = false

test/runtests.jl

@@ -24,7 +24,6 @@ end
             @safetestset "Parsing Test" include("variable_parsing.jl")
             @safetestset "Simplify Test" include("simplify.jl")
             @safetestset "Direct Usage Test" include("direct.jl")
-            @safetestset "SymbolicIndeingInterface test" include("symbolic_indexing_interface.jl")
             @safetestset "System Linearity Test" include("linearity.jl")
             @safetestset "Input Output Test" include("input_output_handling.jl")
             @safetestset "Clock Test" include("clock.jl")
@@ -73,6 +72,7 @@ end
     end
 
     if GROUP == "All" || GROUP == "InterfaceI" || GROUP == "SymbolicIndexingInterface"
+        @safetestset "SymbolicIndexingInterface test" include("symbolic_indexing_interface.jl")
         @safetestset "MTKParameters Test" include("mtkparameters.jl")
     end
 

test/symbolic_indexing_interface.jl

@@ -1,10 +1,10 @@
 using ModelingToolkit, SymbolicIndexingInterface, SciMLBase
+using ModelingToolkit: t_nounits as t, D_nounits as D
 
-@parameters t a b
-@variables x(t)=1.0 y(t)=2.0
-D = Differential(t)
+@parameters a b
+@variables x(t)=1.0 y(t)=2.0 xy(t)
 eqs = [D(x) ~ a * y + t, D(y) ~ b * t]
-@named odesys = ODESystem(eqs, t, [x, y], [a, b])
+@named odesys = ODESystem(eqs, t, [x, y], [a, b]; observed = [xy ~ x + y])
 
 @test all(is_variable.((odesys,), [x, y, 1, 2, :x, :y]))
 @test all(.!is_variable.((odesys,), [a, b, t, 3, 0, :a, :b]))
@@ -24,6 +24,11 @@ eqs = [D(x) ~ a * y + t, D(y) ~ b * t]
 @test !isempty(default_values(odesys))
 @test default_values(odesys)[x] == 1.0
 @test default_values(odesys)[y] == 2.0
+@test isequal(default_values(odesys)[xy], x + y)
+
+@named odesys = ODESystem(
+    eqs, t, [x, y], [a, b]; defaults = [xy => 3.0], observed = [xy ~ x + y])
+@test default_values(odesys)[xy] == 3.0
 
 @variables x y z
 @parameters σ ρ β