add constructors and tests

Author: baggepinnen

Project.toml

@@ -1,7 +1,7 @@
 name = "RobustAndOptimalControl"
 uuid = "21fd56a4-db03-40ee-82ee-a87907bee541"
 authors = ["Fredrik Bagge Carlson", "Marcus Greiff"]
-version = "0.2.4"
+version = "0.2.5"
 
 [deps]
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"

src/named_systems2.jl

@@ -140,6 +140,20 @@ function named_ss(sys::AbstractStateSpace{T};
     NamedStateSpace{T, typeof(sys)}(sys, x, u, y)
 end
 
+"""
+    named_ss(sys::AbstractStateSpace, name)
+
+If a single name is provided, the outputs, inputs and states will be automatically named
+`y,u,x` with `name` as prefix.
+"""
+function named_ss(sys::AbstractStateSpace, name)
+    named_ss(sys,
+        x = Symbol(string(name)*"x"),
+        y = Symbol(string(name)*"y"),
+        u = Symbol(string(name)*"u"),
+    )
+end
+
 ControlSystems.ss(sys::NamedStateSpace) = ss(sys.sys)
 
 iterable(s::Symbol) = [s]
@@ -510,12 +524,27 @@ function ExtendedStateSpace(P::NamedStateSpace; z=[], y=[], w=[], u=[])
         P.D[zi, wi], P.D[zi, ui], P.D[yi, wi], P.D[yi, ui], P.timeevol)
 end
 
-function named_ss(sys::ExtendedStateSpace{T};
-    x = [Symbol("x$i") for i in 1:sys.nx],
-    u = [Symbol("u$i") for i in 1:sys.nu],
-    y = [Symbol("y$i") for i in 1:sys.ny],
-    w = [Symbol("w$i") for i in 1:sys.nw],
-    z = [Symbol("z$i") for i in 1:sys.nz],
+"""
+    named_ss(sys::ExtendedStateSpace;       kwargs...)
+    named_ss(sys::ExtendedStateSpace, name; kwargs...)
+
+Assign names to an ExtendedStateSpace. If no specific names are provided for signals
+`z,y,w,u` and states`x`, names will be generated automatically.
+
+# Arguments:
+- `name`: Prefix to add to all automatically generated names.
+- `x`
+- `u`
+- `y`
+- `w`
+- `z`
+"""
+function named_ss(sys::ExtendedStateSpace{T}, name="";
+    x = Symbol(string(name)*"x"),
+    u = Symbol(string(name)*"u"),
+    y = Symbol(string(name)*"y"),
+    w = Symbol(string(name)*"w"),
+    z = Symbol(string(name)*"z"),
     ) where T
     x = expand_symbol(x, sys.nx)
     u = expand_symbol(u, sys.nu)

test/test_extendedstatespace.jl

@@ -31,3 +31,8 @@ Ge = convert(ExtendedStateSpace{Continuous, Float64}, G)
 @test system_mapping(Ge) == G
 @test size(performance_mapping(Ge)) == (0,0)
 @test ss(Ge) == G
+
+Ge2, G2 = promote(Ge, G)
+@test Ge2 == Ge
+@test G2 == partition(G, 0, 0) # Promoted to ess with empty performance model.
+

test/test_named_systems2.jl

@@ -9,6 +9,11 @@ s1 = named_ss(G1, x = [:x], u = :u, y=:y) # test providing only symbol
 s2 = named_ss(G2, x = [:z], u = [:u], y=[:y])
 @show s1
 
+s_autoname = named_ss(G1, :G)
+@test s_autoname.x == [:Gx]
+@test s_autoname.y == [:Gy]
+@test s_autoname.u == [:Gu]
+
 @test s1[:y, :u] == s1
 @test s1[[:y], [:u]] == s1