Clean up deps on JSMO and MTK v8

Author: BenChung

Project.toml

@@ -1,7 +1,7 @@
 name = "ModelTesting"
 uuid = "726cd793-0c59-4a7a-97d2-1baad301d093"
 authors = ["Ben Chung <benjamin.chung@juliahub.com> and contributors"]
-version = "1.0.4-DEV"
+version = "1.0.5-DEV"
 
 [deps]
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
@@ -12,12 +12,6 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
 SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
 
-[weakdeps]
-JuliaSimModelOptimizer = "e76a656c-db09-4a9a-8f5e-6a4d9ca4a950"
-
-[extensions]
-ModelTestingCalibration = "JuliaSimModelOptimizer"
-
 [compat]
 julia = "1.10"
 SymbolicIndexingInterface = "^0.3.15"
@@ -28,4 +22,4 @@ ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739"
 DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
 
 [targets]
-test = ["Test", "JuliaSimModelOptimizer", "ModelingToolkitStandardLibrary", "DifferentialEquations"]
+test = ["Test", "ModelingToolkitStandardLibrary", "DifferentialEquations"]

src/problem_config/problem.jl

@@ -1,6 +1,6 @@
 module ProblemHelpers
 import SciMLBase
-using DataFrame
+using DataFrames
 # some thin wrappers over remake
 initial_condition(prob::SciMLBase.AbstractDEProblem, u0) = remake(prob, u0 = u0)
 tspan(prob::SciMLBase.AbstractDEProblem, tspan) = remake(prob, tspan = tspan)

src/test/measured.jl

@@ -32,7 +32,7 @@ end
 end
 
 function Measurement(sensor; name)
-    @assert length(sensor.states) == 1 "The Measurement helper requires that the measurement component have only one scalar-valued state"
+    @assert length(variable_symbols(sensor)) == 1 "The Measurement helper requires that the measurement component have only one scalar-valued state"
     @variables t value(t) [measured = true]
     return ODESystem([
         value ~ first(sensor.states)

test/block_modeling.jl

@@ -1,8 +1,8 @@
 using ModelingToolkitStandardLibrary.Electrical
 using ModelingToolkitStandardLibrary.Blocks: Constant
-
+using SymbolicIndexingInterface
 @testset "Block Modeling" begin 
-    @testset "RC Explicit" begin 
+    @testset "RC Functional" begin 
         R = 1.0
         C = 1.0
         V = 1.0
@@ -23,42 +23,6 @@ using ModelingToolkitStandardLibrary.Blocks: Constant
                 connect(sensor.p, capacitor.p)
                 sensor.phi ~ key_parameter.value]
 
-        @named rc_model = ODESystem(rc_eqs, t,
-            systems = [resistor, capacitor, constant, source, ground, sensor, key_parameter])
-        sys = structural_simplify(rc_model)
-        prob1 = ODEProblem(sys, Pair[], (0, 10.0))
-        sol1 = solve(prob1, Tsit5())
-        prob2 = ODEProblem(sys, Pair[capacitor.C => 0.9], (0, 10.0))
-        sol2 = solve(prob2, Tsit5())
-        prob3 = ODEProblem(sys, Pair[capacitor.C => 5.0], (0, 10.0))
-        sol3 = solve(prob3, Tsit5())
-
-        d1 = discretize_solution(sol1, sol1)
-        d2 = discretize_solution(sol2, sol1)
-        d3 = discretize_solution(sol3, sol1)
-        results_good = compare_discrete(sys, d1, d2)
-        results_bad = compare_discrete(sys, d1, d3)
-    end
-    @testset "RC Functional" begin 
-        R = 1.0
-        C = 1.0
-        V = 1.0
-        @variables t
-        @named resistor = Resistor(R = R)
-        @named capacitor = Capacitor(C = C)
-        @named source = Voltage()
-        @named constant = Constant(k = V)
-        @named ground = Ground()
-
-        @named sensor = PotentialSensor()
-        @named key_parameter = Measurement(sensor)
-
-        rc_eqs = [connect(constant.output, source.V)
-                connect(source.p, resistor.p)
-                connect(resistor.n, capacitor.p)
-                connect(capacitor.n, source.n, ground.g)
-                connect(sensor.p, capacitor.p)]
-
         @named rc_model = ODESystem(rc_eqs, t,
             systems = [resistor, capacitor, constant, source, ground, sensor, key_parameter])
         sys = structural_simplify(rc_model)
@@ -78,7 +42,7 @@ using ModelingToolkitStandardLibrary.Blocks: Constant
 
         d1 = discretize_solution(sol1, sol1)
 
-        ds1 = discretize_solution(sol1, sol1; measured=states(sys))
+        ds1 = discretize_solution(sol1, sol1; measured=SymbolicIndexingInterface.all_variable_symbols(sys))
         println(compare(sol3, ds1))
         println(compare(sol2, ds1))
         println(compare(sol1, ds1))

test/instantaneous.jl

@@ -11,7 +11,6 @@
         @named ground = Ground()
 
         @named sensor = PotentialSensor()
-        @named key_parameter = Measurement(sensor)
 
         rc_eqs = [connect(constant.output, source.V)
                 connect(source.p, resistor.p)
@@ -20,7 +19,7 @@
                 connect(sensor.p, capacitor.p)]
 
         @named rc_model = ODESystem(rc_eqs, t,
-            systems = [resistor, capacitor, constant, source, ground, sensor, key_parameter])
+            systems = [resistor, capacitor, constant, source, ground, sensor])
         sys = structural_simplify(rc_model)
         @test test_instantaneous(sys, [], [resistor.v]; t = 0.0)[1] > 0
         @test test_instantaneous(sys, [], [resistor.i]; t = 0.0)[1] > 0

test/runtests.jl

@@ -1,11 +1,11 @@
-using JuliaSimModelOptimizer
+#using JuliaSimModelOptimizer
 using ModelTesting
 using DifferentialEquations, DataFrames, ModelingToolkit
 import SymbolicIndexingInterface
 using Test
 
 @testset "ModelTesting.jl" begin
-    include("timeseries.jl")
+    #include("timeseries.jl")
     include("block_modeling.jl")
     include("instantaneous.jl")
 end