Added some tests for conversions and promotion

Author: olof3

docs/src/man/creating_systems.md

@@ -91,7 +91,7 @@ ControlSystems._string_mat_with_headers(a::SizedArray) = ControlSystems._string_
 Notice the different matrix types used
 ```jldoctest HSS
 julia> sys = ss([-5 0; 0 -5],[2; 2],[3 3],[0])
-StateSpace{Continuous,Int64,Array{Int64,2}}
+StateSpace{Continuous,Int64}
 A =
  -5   0
   0  -5

src/types/DelayLtiSystem.jl

@@ -109,6 +109,13 @@ function /(anything, sys::DelayLtiSystem)
     /(anything, sys.P.P) # If all delays are zero, invert the inner system
 end
 
+
+# Test equality (of realizations)
+function ==(sys1::DelayLtiSystem, sys2::DelayLtiSystem)
+    all(getfield(sys1, f) == getfield(sys2, f) for f in fieldnames(DelayLtiSystem))
+end
+
+
 ninputs(sys::DelayLtiSystem) = size(sys.P.P, 2) - length(sys.Tau)
 noutputs(sys::DelayLtiSystem) = size(sys.P.P, 1) - length(sys.Tau)
 nstates(sys::DelayLtiSystem) = nstates(sys.P.P)

src/types/PartionedStateSpace.jl

@@ -220,3 +220,8 @@ end
 function Base.convert(::Type{<:PartionedStateSpace}, sys::T) where T<: StateSpace
     PartionedStateSpace(sys,sys.nu,sys.ny)
 end
+
+# Test equality (of realizations)
+function ==(sys1::PartionedStateSpace, sys2::PartionedStateSpace)
+    all(getfield(sys1, f) == getfield(sys2, f) for f in fieldnames(PartionedStateSpace))
+end

test/test_connections.jl

@@ -91,6 +91,9 @@ s = tf("s")
 @test [D_111; Dtf_212] == [D_111; ss(Dtf_212)]
 @test append(D_111, Dtf_211) == append(D_111, ss(Dtf_211))
 
+# Combination of DelayLtiSystem with TransferFunction and StateSpace
+@test [delay(1.0) tf(1, [1,2])] == [delay(1.0) ss(-2.0,1,1,0)]
+@test [delay(1.0) zpk([], [-2], 1)] == [delay(1.0) ss(-2.0,1,1,0)]
 
 # hcat and vcat for StateSpace and Matrix
 A = [-1.1 -1.2; -1.3 -1.4]

test/test_delayed_systems.jl

@@ -1,6 +1,8 @@
 using DelayDiffEq
 
 @testset "test_delay_system" begin
+
+# For simplicity, equality of DelayLtiSystems are tested over a finite set of frequencies
 ω = 0.0:8
 
 
@@ -50,6 +52,10 @@ P2_fr = (im*ω .+ 1) ./ (im*ω .+ 2)
 @test freqresp(delay(1) * P2, ω)[:] ≈ P2_fr .* exp.(-im*ω) rtol=1e-15
 
 
+# Equality
+@test P1 == deepcopy(P1)
+@test P1 != deepcopy(P2)
+
 # evalfr
 s_vec = [0, 1im, 1, 1 + 1im]
 @test [evalfr(delay(2), s)[1] for s in s_vec] ≈ [exp(-2*s) for s in s_vec] rtol=1e-16

test/test_partitioned_statespace.jl

@@ -21,7 +21,6 @@ sys1.D12 == matrix(6.0)
 sys1.D21 == matrix(8.0)
 sys1.D22 == matrix(9.0)
 
-
 ##
 sys2 = ControlSystems.PartionedStateSpace(ss(fill(1.0, 2, 2), fill(2.0, 2, 5), fill(3.0, 7, 2), fill(4.0, 7, 5)), 2, 3)
 
@@ -36,6 +35,10 @@ sys2 = ControlSystems.PartionedStateSpace(ss(fill(1.0, 2, 2), fill(2.0, 2, 5), f
 @test sys2.D22 == fill(4.0, 4, 3)
 
 
+
+@test sys1 == deepcopy(sys1)
+@test sys1 != deepcopy(sys2)
+
 # TODO: Add some tests for interconnections, implicitly tested through delay system implementations though
 @test (sys1 + sys1).P[1, 1] == (sys1.P[1,1] + sys1.P[1,1])
 

test/test_promotion.jl

@@ -35,6 +35,9 @@ TG2 = typeof(G2)
 @test promote_type(typeof(tf(1)), typeof(tf(1))) == typeof(tf(1))
 @test promote_type(typeof(ss(1)), typeof(ss(1))) == typeof(ss(1))
 
+
+@test promote(ss(1), 1.0) == (ss(1.), ss(1.))
+@test promote(ss(1), 1) == (ss(1.), ss(1.))
 @test promote(ss(1), ss(1.)) == (ss(1.), ss(1.))
 @test promote(ss(1), tf(1.)) == (ss(1.), ss(1.))
 @test promote(ss(1), zpk(1.)) == (ss(1.), ss(1.))
@@ -43,5 +46,7 @@ TG2 = typeof(G2)
 @test promote(zpk(1), tf(1)) == (zpk(1.), zpk(1.))
 @test promote(ss(1), ss([1 .*im])) == (ss([1+0*im]),ss([1 .*im]))
 @test promote(ss(1), tf([1 .*im])) == (ss([1+0*im]),ss([1 .*im]))
+@test promote(tf(1), 1) == (tf(1.), tf(1.))
+
 
 end