refactor: Blocks/continuous.jl

Author: ven-k

src/Blocks/continuous.jl

@@ -1,5 +1,5 @@
 """
-    Integrator(;name, k=1, x_start=0.0)
+    Integrator(;name, k = 1, x = 0.0)
 
 Outputs `y = ∫k*u dt`, corresponding to the transfer function `1/s`.
 
@@ -11,20 +11,23 @@ Outputs `y = ∫k*u dt`, corresponding to the transfer function `1/s`.
 # Parameters:
 
   - `k`: Gain of integrator
-  - `x_start`: Initial value of integrator
+  - `x`: Initial value of integrator
 """
-@component function Integrator(; name, k = 1, x_start = 0.0)
-    @named siso = SISO()
-    @unpack u, y = siso
-    sts = @variables x(t)=x_start [description = "State of Integrator $name"]
-    pars = @parameters k=k [description = "Gain of Integrator $name"]
-    eqs = [D(x) ~ k * u
-        y ~ x]
-    extend(ODESystem(eqs, t, sts, pars; name = name), siso)
+@mtkmodel Integrator begin
+    @extend u, y = siso = SISO()
+    @variables begin
+        x(t) = 0.0, [description = "State of Integrator"]
+    end
+    @parameters begin
+        k = 1, [description = "Gain of Integrator"]
+    end
+    @equations begin
+        D(x) ~ k * u
+        y ~ x
+    end
 end
-
 """
-    Derivative(; name, k=1, T, x_start=0.0)
+    Derivative(; name, k = 1, T, x = 0.0)
 
 Outputs an approximate derivative of the input. The transfer function of this block is
 
@@ -44,28 +47,36 @@ A smaller `T` leads to a more ideal approximation of the derivative.
 
   - `k`: Gain
   - `T`: [s] Time constants (T>0 required; T=0 is ideal derivative block)
-  - `x_start`: Initial value of state
+  - `x`: Initial value of state
 
 # Connectors:
 
   - `input`
   - `output`
 """
-@component function Derivative(; name, k = 1, T, x_start = 0.0)
-    @symcheck T > 0 || throw(ArgumentError("Time constant `T` has to be strictly positive"))
-    @named siso = SISO()
-    @unpack u, y = siso
-    sts = @variables x(t)=x_start [description = "State of Derivative $name"]
-    pars = @parameters T=T [description = "Time constant of Derivative $name"] k=k [
-        description = "Gain of Derivative $name",
-    ]
-    eqs = [D(x) ~ (u - x) / T
-        y ~ (k / T) * (u - x)]
-    extend(ODESystem(eqs, t, sts, pars; name = name), siso)
+@mtkmodel Derivative begin
+    begin
+        @symcheck T > 0 || throw(ArgumentError("Time constant `T` has to be strictly positive"))
+    end
+    @extend u, y = siso = SISO()
+    @variables begin
+        x(t) = 0.0, [description = "State of Derivative $name"]
+    end
+    @parameters begin
+        T=T, [description = "Time constant of Derivative $name"]
+        k = 1, [description = "Gain of Derivative $name"]
+    end
+    begin
+        @symcheck T > 0 || throw(ArgumentError("Time constant `T` has to be strictly positive"))
+    end
+    @equations begin
+        D(x) ~ (u - x) / T
+        y ~ (k / T) * (u - x)
+    end
 end
 
 """
-    FirstOrder(; name, k=1, T, x_start=0.0, lowpass=true)
+    FirstOrder(; name, k=1, T, x = 0.0, lowpass=true)
 
 A first-order filter with a single real pole in `s = -T` and gain `k`. If `lowpass=true` (default), the transfer function
 is given by `Y(s)/U(s) = `
@@ -88,7 +99,7 @@ sT + 1 - k
 
   - `k`: Gain
   - `T`: [s] Time constants (T>0 required)
-  - `x_start`: Initial value of state
+  - `x`: Initial value of state
 
 # Connectors:
 
@@ -97,21 +108,27 @@ sT + 1 - k
 
 See also [`SecondOrder`](@ref)
 """
-@component function FirstOrder(; name, k = 1, T, x_start = 0.0, lowpass = true)
-    @symcheck T > 0 || throw(ArgumentError("Time constant `T` has to be strictly positive"))
-    @named siso = SISO()
-    @unpack u, y = siso
-    sts = @variables x(t)=x_start [description = "State of FirstOrder filter $name"]
-    pars = @parameters T=T [description = "Time constant of FirstOrder filter $name"] k=k [
-        description = "Gain of FirstOrder $name",
-    ]
-    eqs = [D(x) ~ (k * u - x) / T
-        lowpass ? y ~ x : y ~ k * u - x]
-    extend(ODESystem(eqs, t, sts, pars; name = name), siso)
+@mtkmodel FirstOrder begin
+    @extend u, y = siso = SISO()
+    @variables begin
+        x(t) = 0.0, [description = "State of FirstOrder filter $name"]
+    end
+    @parameters begin
+        lowpass = true
+        T = T, [description = "Time constant of FirstOrder filter $name"]
+        k = 1, [description = "Gain of FirstOrder $name"]
+    end
+    begin
+        @symcheck T > 0 || throw(ArgumentError("Time constant `T` has to be strictly positive"))
+    end
+    @equations begin
+        D(x) ~ (k * u - x) / T
+        getdefault(lowpass) ? y ~ x : y ~ k * u - x
+    end
 end
 
 """
-    SecondOrder(; name, k=1, w, d, x_start=0.0, xd_start=0.0)
+    SecondOrder(; name, k = 1, w, d, x = 0.0, xd = 0.0)
 
 A second-order filter with gain `k`, a bandwidth of `w` rad/s and relative damping `d`. The transfer function
 is given by `Y(s)/U(s) = `
@@ -130,38 +147,42 @@ Critical damping corresponds to `d=1`, which yields the fastest step response wi
   - `k`: Gain
   - `w`: [`rad/s`] Angular frequency
   - `d`: Damping
-  - `x_start`: Initial value of state (output)
-  - `xd_start`: Initial value of derivative of state (output)
+  - `x`: Initial value of state (output)
+  - `xd`: Initial value of derivative of state (output)
 
 # Connectors:
 
   - `input`
   - `output`
 """
-@component function SecondOrder(; name, k = 1, w, d, x_start = 0.0, xd_start = 0.0)
-    @named siso = SISO()
-    @unpack u, y = siso
-    @variables x(t)=x_start [description = "State of SecondOrder filter $name"]
-    @variables xd(t)=xd_start [description = "Derivative state of SecondOrder filter $name"]
-    @parameters k=k [description = "Gain of SecondOrder $name"]
-    @parameters w=w [description = "Bandwidth of SecondOrder $name"]
-    @parameters d=d [description = "Relative damping of SecondOrder $name"]
-    eqs = [D(x) ~ xd
+@mtkmodel SecondOrder begin
+    @extend u, y = siso = SISO()
+    @variables begin
+        x(t) = 0.0, [description = "State of SecondOrder filter"]
+        xd(t) = 0.0, [description = "Derivative state of SecondOrder filter"]
+    end
+    @parameters begin
+        k = 1, [description = "Gain of SecondOrder"]
+        w, [description = "Bandwidth of SecondOrder"]
+        d, [description = "Relative damping of SecondOrder"]
+    end
+    @equations begin
+        D(x) ~ xd
         D(xd) ~ w * (w * (k * u - x) - 2 * d * xd)
-        y ~ x]
-    extend(ODESystem(eqs, t; name = name), siso)
+        y ~ x
+    end
 end
 
 """
-    PI(;name, k=1, T, x_start=0.0)
+    PI(;name, gainPI.k = 1, T, int.x = 0.0)
 
 Textbook version of a PI-controller without actuator saturation and anti-windup measure.
 
 # Parameters:
 
   - `k`: Gain
   - `T`: [s] Integrator time constant (T>0 required)
-  - `x_start`: Initial value for the integrator
+  - `x`: Initial value for the integrator
 
 # Connectors:
 
@@ -170,22 +191,27 @@ Textbook version of a PI-controller without actuator saturation and anti-windup
 
 See also [`LimPI`](@ref)
 """
-@component function PI(; name, k = 1, T, x_start = 0.0)
-    @symcheck T > 0 || throw(ArgumentError("Time constant `T` has to be strictly positive"))
-    @named err_input = RealInput() # control error
-    @named ctr_output = RealOutput() # control signal
-    @named gainPI = Gain(k)
-    @named addPI = Add()
-    @named int = Integrator(k = 1 / T, x_start = x_start)
-    sys = [err_input, ctr_output, gainPI, addPI, int]
-    eqs = [
-        connect(err_input, addPI.input1),
-        connect(addPI.output, gainPI.input),
-        connect(gainPI.output, ctr_output),
-        connect(err_input, int.input),
-        connect(int.output, addPI.input2),
-    ]
-    ODESystem(eqs, t, [], []; name = name, systems = sys)
+@mtkmodel PI begin
+    @parameters begin
+        T
+    end
+    begin
+        @symcheck T > 0 || throw(ArgumentError("Time constant `T` has to be strictly positive"))
+    end
+    @components begin
+        err_input = RealInput() # control error
+        ctr_output = RealOutput() # control signal
+        gainPI = Gain(; k = 1.0)
+        addPI = Add()
+        int = Integrator(k = 1 / T, x = 0.0)
+    end
+    @equations begin
+        connect(err_input, addPI.input1)
+        connect(addPI.output, gainPI.input)
+        connect(gainPI.output, ctr_output)
+        connect(err_input, int.input)
+        connect(int.output, addPI.input2)
+    end
 end
 
 """
@@ -224,12 +250,12 @@ See also [`LimPID`](@ref)
     @named gainPID = Gain(k)
     @named addPID = Add3()
     if with_I
-        @named int = Integrator(k = 1 / Ti, x_start = xi_start)
+        @named int = Integrator(k = 1 / Ti, x = xi_start)
     else
         @named Izero = Constant(k = 0)
     end
     if with_D
-        @named der = Derivative(k = Td, T = 1 / Nd, x_start = xd_start)
+        @named der = Derivative(k = Td, T = 1 / Nd, x = xd_start)
     else
         @named Dzero = Constant(k = 0)
     end
@@ -274,42 +300,51 @@ Text-book version of a PI-controller with actuator saturation and anti-windup me
   - `k`: Gain
   - `T`: [s] Integrator time constant (T>0 required)
   - `Ta`: [s] Tracking time constant (Ta>0 required)
-  - `x_start`: Initial value for the integrator
+  - `x`: Initial value for the integrator
 
 # Connectors:
 
   - `err_input`
   - `ctr_output`
 """
-@component function LimPI(; name, k = 1, T, u_max, u_min = -u_max, Ta, x_start = 0.0)
-    @symcheck Ta > 0 ||
-              throw(ArgumentError("Time constant `Ta` has to be strictly positive"))
-    @symcheck T > 0 || throw(ArgumentError("Time constant `T` has to be strictly positive"))
-    @symcheck u_max ≥ u_min || throw(ArgumentError("u_min must be smaller than u_max"))
-    @named err_input = RealInput() # control error
-    @named ctr_output = RealOutput() # control signal
-    @named gainPI = Gain(k)
-    @named addPI = Add()
-    @named addTrack = Add()
-    @named int = Integrator(k = 1 / T, x_start = x_start)
-    @named limiter = Limiter(y_max = u_max, y_min = u_min)
-    @named addSat = Add(k1 = 1, k2 = -1)
-    @named gainTrack = Gain(1 / Ta)
-    sys = [err_input, ctr_output, gainPI, addPI, int, addTrack, limiter, addSat, gainTrack]
-    eqs = [
-        connect(err_input, addPI.input1),
-        connect(addPI.output, gainPI.input),
-        connect(gainPI.output, limiter.input),
-        connect(limiter.output, ctr_output),
-        connect(limiter.input, addSat.input2),
-        connect(limiter.output, addSat.input1),
-        connect(addSat.output, gainTrack.input),
-        connect(err_input, addTrack.input1),
-        connect(gainTrack.output, addTrack.input2),
-        connect(addTrack.output, int.input),
-        connect(int.output, addPI.input2),
-    ]
-    ODESystem(eqs, t, [], []; name = name, systems = sys)
+@mtkmodel LimPI begin
+    @parameters begin
+        T
+        u_max
+        u_min = -u_max
+        Ta
+        x = 0.0
+    end
+    begin
+        @symcheck Ta > 0 ||
+                  throw(ArgumentError("Time constant `Ta` has to be strictly positive"))
+        @symcheck T > 0 || throw(ArgumentError("Time constant `T` has to be strictly positive"))
+        @symcheck u_max ≥ u_min || throw(ArgumentError("u_min must be smaller than u_max"))
+    end
+    @components begin
+        err_input = RealInput() # control error
+        ctr_output = RealOutput() # control signal
+        gainPI = Gain(k = 1)
+        addPI = Add()
+        addTrack = Add()
+        int = Integrator(k = 1 / T, x = x)
+        limiter = Limiter(y_max = u_max, y_min = u_min)
+        addSat = Add(k1 = 1, k2 = -1)
+        gainTrack = Gain(k = 1 / Ta)
+    end
+    @equations begin
+        connect(err_input, addPI.input1)
+        connect(addPI.output, gainPI.input)
+        connect(gainPI.output, limiter.input)
+        connect(limiter.output, ctr_output)
+        connect(limiter.input, addSat.input2)
+        connect(limiter.output, addSat.input1)
+        connect(addSat.output, gainTrack.input)
+        connect(err_input, addTrack.input1)
+        connect(gainTrack.output, addTrack.input2)
+        connect(addTrack.output, int.input)
+        connect(int.output, addPI.input2)
+    end
 end
 
 """
@@ -376,7 +411,7 @@ where the transfer function for the derivative includes additional filtering, se
     @named measurement = RealInput()
     @named ctr_output = RealOutput() # control signal
     @named addP = Add(k1 = wp, k2 = -1)
-    @named gainPID = Gain(k)
+    @named gainPID = Gain(; k)
     @named addPID = Add3()
     @named limiter = Limiter(y_max = u_max, y_min = u_min)
     if with_I
@@ -387,12 +422,12 @@ where the transfer function for the derivative includes additional filtering, se
         else
             @named addI = Add(k1 = 1, k2 = -1)
         end
-        @named int = Integrator(k = 1 / Ti, x_start = xi_start)
+        @named int = Integrator(k = 1 / Ti, x = xi_start)
     else
         @named Izero = Constant(k = 0)
     end
     if with_D
-        @named der = Derivative(k = Td, T = 1 / Nd, x_start = xd_start)
+        @named der = Derivative(k = Td, T = 1 / Nd, x = xd_start)
         @named addD = Add(k1 = wd, k2 = -1)
     else
         @named Dzero = Constant(k = 0)