refactor: replace ODESystem with System

Author: AayushSabharwal

src/Blocks/analysis_points.jl

@@ -81,7 +81,7 @@ using ModelingToolkitStandardLibrary.Blocks
 t = ModelingToolkit.get_iv(P)
 eqs = [connect(P.output, C.input)
        connect(C.output, :plant_input, P.input)]
-sys = ODESystem(eqs, t, systems = [P, C], name = :feedback_system)
+sys = System(eqs, t, systems = [P, C], name = :feedback_system)
 
 matrices_S, _ = get_sensitivity(sys, :plant_input) # Compute the matrices of a state-space representation of the (input) sensitivity function.
 matrices_T, _ = get_comp_sensitivity(sys, :plant_input)
@@ -131,8 +131,8 @@ function Base.show(io::IO, ::MIME"text/plain", ap::AnalysisPoint)
     end
 end
 
-_isinput(x) = x isa ODESystem && endswith(string(nameof(x)), "input")
-_isoutput(x) = x isa ODESystem && endswith(string(nameof(x)), "output")
+_isinput(x) = x isa System && endswith(string(nameof(x)), "input")
+_isoutput(x) = x isa System && endswith(string(nameof(x)), "output")
 function ap_warning(n)
     @warn "The $(n == 1 ? "first" : "third") argument to a connection with an analysis point was a $(n == 1 ? "RealInput" : "RealOutput"). This is supported in order to handle inverse models, but may not be what you intended. If you are building a forward model (causal), you may want to swap the first and the third arguments to connect. Learn more about the causality of analysis points in the docstring for AnalysisPoint. Silence this message by connect(out, :name, in; verbose = false)"
 end

src/Blocks/continuous.jl

@@ -312,7 +312,7 @@ See also [`LimPID`](@ref)
     else
         push!(eqs, connect(Dzero.output, addPID.input3))
     end
-    ODESystem(eqs, t, [], pars; name = name, systems = sys)
+    System(eqs, t, [], pars; name = name, systems = sys)
 end
 
 """
@@ -372,7 +372,7 @@ The simplified expression above is given without the anti-windup protection.
         connect(addTrack.output, int.input),
         connect(int.output, addPI.input2)
     ]
-    ODESystem(eqs, t, [], pars; name = name, systems = sys)
+    System(eqs, t, [], pars; name = name, systems = sys)
 end
 
 """
@@ -514,7 +514,7 @@ where the transfer function for the derivative includes additional filtering, se
         push!(eqs, connect(Dzero.output, addPID.input2))
     end
 
-    ODESystem(eqs, t, [], pars; name = name, systems = sys)
+    System(eqs, t, [], pars; name = name, systems = sys)
 end
 
 """
@@ -579,7 +579,7 @@ linearized around the operating point `x₀, u₀`, we have `y0, u0 = h(x₀, u
                        sum(D[j, k] * (input.u[k] - u0[k]) for k in 1:nu) + y0[j]
          for j in 1:ny]...
     ]
-    compose(ODESystem(eqs, t, vcat(x...), [], name = name), [input, output])
+    compose(System(eqs, t, vcat(x...), [], name = name), [input, output])
 end
 
 StateSpace(A, B, C, D = nothing; kwargs...) = StateSpace(; A, B, C, D, kwargs...)
@@ -664,5 +664,5 @@ See also [`StateSpace`](@ref) which handles MIMO systems, as well as [ControlSys
     end
     push!(eqs, input.u ~ u)
     push!(eqs, output.u ~ y)
-    compose(ODESystem(eqs, t, sts, pars; name = name), input, output)
+    compose(System(eqs, t, sts, pars; name = name), input, output)
 end

src/Blocks/nonlinear.jl

@@ -27,7 +27,7 @@ Limit the range of a signal.
     eqs = [
         y ~ _clamp(u, y_min, y_max)
     ]
-    extend(ODESystem(eqs, t, [], pars; name = name), siso)
+    extend(System(eqs, t, [], pars; name = name), siso)
 end
 
 """
@@ -118,5 +118,5 @@ Initial value of state `Y` can be set with `int.y`
         y ~ y_start
     ]
 
-    return extend(ODESystem(eqs, t, [], pars; name, initialization_eqs), siso)
+    return extend(System(eqs, t, [], pars; name, initialization_eqs), siso)
 end

src/Blocks/sources.jl

@@ -151,7 +151,7 @@ Generate sine signal.
         output.u ~ equation
     ]
 
-    compose(ODESystem(eqs, t, [], pars; name = name), [output])
+    compose(System(eqs, t, [], pars; name = name), [output])
 end
 
 """
@@ -192,7 +192,7 @@ Generate cosine signal.
         output.u ~ equation
     ]
 
-    compose(ODESystem(eqs, t, [], pars; name = name), [output])
+    compose(System(eqs, t, [], pars; name = name), [output])
 end
 
 """
@@ -216,7 +216,7 @@ Generate current time signal.
         output.u ~ offset + ifelse(t < start_time, zero(t), t - start_time)
     ]
 
-    compose(ODESystem(eqs, t, [], pars; name = name), [output])
+    compose(System(eqs, t, [], pars; name = name), [output])
 end
 
 """
@@ -258,7 +258,7 @@ Generate ramp signal.
         output.u ~ equation
     ]
 
-    compose(ODESystem(eqs, t, [], pars; name = name), [output])
+    compose(System(eqs, t, [], pars; name = name), [output])
 end
 
 """
@@ -300,7 +300,7 @@ Generate smooth square signal.
         output.u ~ equation
     ]
 
-    compose(ODESystem(eqs, t, [], pars; name = name), [output])
+    compose(System(eqs, t, [], pars; name = name), [output])
 end
 
 """
@@ -344,7 +344,7 @@ Generate step signal.
         output.u ~ equation
     ]
 
-    compose(ODESystem(eqs, t, [], pars; name = name), [output])
+    compose(System(eqs, t, [], pars; name = name), [output])
 end
 
 """
@@ -392,7 +392,7 @@ Exponentially damped sine signal.
         output.u ~ equation
     ]
 
-    compose(ODESystem(eqs, t, [], pars; name = name), [output])
+    compose(System(eqs, t, [], pars; name = name), [output])
 end
 
 """
@@ -435,7 +435,7 @@ Generate smooth triangular signal for frequencies less than or equal to 25 Hz
         output.u ~ equation
     ]
 
-    compose(ODESystem(eqs, t, [], pars; name = name), [output])
+    compose(System(eqs, t, [], pars; name = name), [output])
 end
 
 # TODO:
@@ -672,7 +672,7 @@ data input component.
     eqs = [
         output.u ~ get_sampled_data(t, p)
     ]
-    return ODESystem(eqs, t, vars, [pars; p]; name, systems)
+    return System(eqs, t, vars, [pars; p]; name, systems)
 end
 
 """
@@ -698,7 +698,7 @@ data input component.
     eqs = [
         output.u ~ get_sampled_data(t, buffer)
     ]
-    return ODESystem(eqs, t, vars, pars; name, systems)
+    return System(eqs, t, vars, pars; name, systems)
 end
 
 SampledData(x::SampledDataType.Option; kwargs...) = SampledData(Val(x); kwargs...)
@@ -765,7 +765,7 @@ function Interpolation(itp; name)
 
     eqs = [output.u ~ interpolator(input.u)]
 
-    ODESystem(
+    System(
         eqs, t, [], [interpolator]; name, systems = [input, output])
 end
 
@@ -860,7 +860,7 @@ function ParametrizedInterpolation(
 
     eqs = [output.u ~ interpolator(input.u)]
 
-    ODESystem(eqs, ModelingToolkit.t_nounits, [],
+    System(eqs, ModelingToolkit.t_nounits, [],
         [data, ts, interpolation_type, interpolator];
         parameter_dependencies = [
             interpolator ~ build_interpolation(data, ts, args)

src/Blocks/utils.jl

@@ -17,7 +17,7 @@
         ]
         u = collect(u)
     end
-    ODESystem(Equation[], t, [u;], []; name = name, guesses = [(u .=> guess);])
+    System(Equation[], t, [u;], []; name = name, guesses = [(u .=> guess);])
 end
 @doc """
     RealInput(;name, guess)
@@ -41,7 +41,7 @@ Connector with one input signal of type Real.
         input = true,
         description = "Inner variable in RealInputArray $name"
     ]
-    ODESystem(Equation[], t, [u], []; name = name, guesses = [u => guess])
+    System(Equation[], t, [u], []; name = name, guesses = [u => guess])
 end
 @doc """
     RealInputArray(;name, nin, guess)
@@ -75,7 +75,7 @@ Connector with an array of input signals of type Real.
         ]
         u = collect(u)
     end
-    ODESystem(Equation[], t, [u;], []; name = name, guesses = [(u .=> guess);])
+    System(Equation[], t, [u;], []; name = name, guesses = [(u .=> guess);])
 end
 @doc """
     RealOutput(;name, guess)
@@ -99,7 +99,7 @@ Connector with one output signal of type Real.
         output = true,
         description = "Inner variable in RealOutputArray $name"
     ]
-    ODESystem(Equation[], t, [u], []; name = name, guesses = [u => guess])
+    System(Equation[], t, [u], []; name = name, guesses = [u => guess])
 end
 @doc """
     RealOutputArray(;name, nout, guess)
@@ -165,5 +165,5 @@ Base class for a multiple input multiple output (MIMO) continuous system block.
         [u[i] ~ input.u[i] for i in 1:nin]...,
         [y[i] ~ output.u[i] for i in 1:nout]...
     ]
-    return ODESystem(eqs, t, vcat(u..., y...), []; name = name, systems = [input, output])
+    return System(eqs, t, vcat(u..., y...), []; name = name, systems = [input, output])
 end

src/Electrical/Digital/components.jl

@@ -33,7 +33,7 @@ Takes two bits as input, and outputs the sum and the carry
            y2.val ~ _and(x1.val, x2.val)
            sum ~ y1.val
            carry ~ y2.val]
-    ODESystem(eqs, t, [sum, carry], [], systems = [x1, x2, y1, y2], name = name)
+    System(eqs, t, [sum, carry], [], systems = [x1, x2, y1, y2], name = name)
 end
 
 """
@@ -71,7 +71,7 @@ Takes three bits as input, and outputs the sum and the carry
            y2.val ~ _or(_and(x3.val, _xor(x1.val, x2.val)), _and(x1.val, x2.val))
            sum ~ y1.val
            carry ~ y2.val]
-    ODESystem(eqs, t, [sum, carry], [], systems = [x1, x2, x3, y1, y2], name = name)
+    System(eqs, t, [sum, carry], [], systems = [x1, x2, x3, y1, y2], name = name)
 end
 
 # Multiplexers
@@ -126,7 +126,7 @@ of `i`.
 
     eqs = Equation[y.val ~ _or(nodes...)]
 
-    ODESystem(eqs, t, [], [], systems = [d..., s..., y], name = name)
+    System(eqs, t, [], [], systems = [d..., s..., y], name = name)
 end
 
 # This selects one of the `N` output ports (`y₀` to `yₙ₋₁`)
@@ -178,7 +178,7 @@ representation of `i`.
         push!(eqs, y[i].val ~ _and(statelist..., d.val))
     end
 
-    ODESystem(eqs, t, [], [], systems = [d, s..., y...], name = name)
+    System(eqs, t, [], [], systems = [d, s..., y...], name = name)
 end
 
 # Encoder-Decoder
@@ -236,7 +236,7 @@ If the `i`th input is `1`, then the output corresponds to the binary representat
         push!(eqs, y[i].val ~ _or(nodes[i]...))
     end
 
-    ODESystem(eqs, t, [], [], systems = [d..., y...], name = name)
+    System(eqs, t, [], [], systems = [d..., y...], name = name)
 end
 
 # Decodes `n` inputs to `N` outputs, where `N = 2^n`
@@ -281,5 +281,5 @@ the select lines correspond to the binary representation of `1`.
         push!(eqs, y[i].val ~ _and(nodes[i]...))
     end
 
-    ODESystem(eqs, t, [], [], systems = [d..., y...], name = name)
+    System(eqs, t, [], [], systems = [d..., y...], name = name)
 end

src/Electrical/Digital/gates.jl

@@ -18,7 +18,7 @@ function Not(; name)
 
     eqs = [x.i ~ y.i
            y.val ~ _not(x.val)]
-    ODESystem(eqs, t, [], [], systems = [x, y], name = name)
+    System(eqs, t, [], [], systems = [x, y], name = name)
 end
 
 """
@@ -44,7 +44,7 @@ function And(; name, N = 2)
     vals = [k.val for k in x]
     eqs = [y.val ~ _and(vals...)
            y.i ~ sum(k -> k.i, x)]
-    ODESystem(eqs, t, [], [], systems = [x..., y], name = name)
+    System(eqs, t, [], [], systems = [x..., y], name = name)
 end
 
 """
@@ -70,7 +70,7 @@ function Nand(; name, N = 2)
     vlist = [k.val for k in x]
     eqs = [y.val ~ _not(_and(vlist...))
            y.i ~ sum(k -> k.i, x)]
-    ODESystem(eqs, t, [], [], systems = [x..., y], name = name)
+    System(eqs, t, [], [], systems = [x..., y], name = name)
 end
 
 """
@@ -96,7 +96,7 @@ function Or(; name, N = 2)
     vals = [k.val for k in x]
     eqs = [y.val ~ _or(vals...)
            y.i ~ sum(k -> k.i, x)]
-    ODESystem(eqs, t, [], [], systems = [x..., y], name = name)
+    System(eqs, t, [], [], systems = [x..., y], name = name)
 end
 
 """
@@ -122,7 +122,7 @@ function Nor(; name, N = 2)
     vlist = [k.val for k in x]
     eqs = [y.val ~ _not(_or(vlist...))
            y.i ~ sum(k -> k.i, x)]
-    ODESystem(eqs, t, [], [], systems = [x..., y], name = name)
+    System(eqs, t, [], [], systems = [x..., y], name = name)
 end
 
 """
@@ -148,7 +148,7 @@ function Xor(; name, N = 2)
     vals = [k.val for k in x]
     eqs = [y.val ~ _xor(vals...)
            y.i ~ sum(k -> k.i, x)]
-    ODESystem(eqs, t, [], [], systems = [x..., y], name = name)
+    System(eqs, t, [], [], systems = [x..., y], name = name)
 end
 
 """
@@ -174,5 +174,5 @@ function Xnor(; name, N = 2)
     vlist = [k.val for k in x]
     eqs = [y.val ~ _not(_xor(vlist...))
            y.i ~ sum(k -> k.i, x)]
-    ODESystem(eqs, t, [], [], systems = [x..., y], name = name)
+    System(eqs, t, [], [], systems = [x..., y], name = name)
 end

src/Electrical/Digital/sources.jl

@@ -21,7 +21,7 @@ function PulseDiff(; name, Val = 1, dt = 0.1)
     eqs = [D(val) ~ Val
            val ~ d.val]
 
-    ODESystem(eqs, t, [val], [], systems = [d], defaults = Dict(Val => 0), name = name)
+    System(eqs, t, [val], [], systems = [d], defaults = Dict(Val => 0), name = name)
 end
 
 """
@@ -42,7 +42,7 @@ function Set(; name)
     eqs = [
         d.val ~ 1
     ]
-    ODESystem(eqs, t, [], [], systems = [d], name = name)
+    System(eqs, t, [], [], systems = [d], name = name)
 end
 
 """
@@ -63,7 +63,7 @@ function Reset(; name)
     eqs = [
         d.val ~ 0
     ]
-    ODESystem(eqs, t, [], [], systems = [d], name = name)
+    System(eqs, t, [], [], systems = [d], name = name)
 end
 
 """
@@ -84,5 +84,5 @@ function Pulse(; name, duty_cycle = 0.5, T = 1.0)
     eqs = [
         d.val ~ IfElse.ifelse(t % T > duty_cycle * T, 1, 0)
     ]
-    ODESystem(eqs, t, [], [], systems = [d], name = name)
+    System(eqs, t, [], [], systems = [d], name = name)
 end

src/Electrical/utils.jl

@@ -91,7 +91,7 @@ end
         val ~ IfElse.ifelse((0.0 <= v) & (v <= 0.8) | (2.0 <= v) & (v <= 5.0),
         IfElse.ifelse(v > 2.0, 1, 0), X)
     ]
-    ODESystem(Equation[], t, [val, v, i], [], guesses = Dict(val => 0, i => 0),
+    System(Equation[], t, [val, v, i], [], guesses = Dict(val => 0, i => 0),
         name = name)
 end
 @doc """