more minor fixes and work towards tests

Author: mfalt

REQUIRE

@@ -1,4 +1,4 @@
-julia 0.6.0
+julia 0.6.0 0.7.0
 Plots 0.7.4
 Polynomials 0.3.0
 LaTeXStrings

src/ControlSystems.jl

@@ -79,7 +79,7 @@ abstract type AbstractSystem end
 
 include("types/Lti.jl")
 
-abstract type SisoTf{T<:Number} end
+include("types/SisoTf.jl")
 
 # Transfer functions and tranfer function elemements
 include("types/TransferFunction.jl")

src/load.jl

@@ -0,0 +1,7 @@
+abstract type SisoTf{T<:Number} end
+
++(f1::SisoTf, f2::SisoTf) = +(promote(f1,f2)...)
+-(f1::SisoTf, f2::SisoTf) = -(promote(f1,f2)...)
+
+*(f1::SisoTf, f2::SisoTf) = *(promote(f1,f2)...)
+/(f1::SisoTf, f2::SisoTf) = /(promote(f1,f2)...)

src/types/SisoTf.jl

@@ -148,9 +148,9 @@ function evalfr(f::SisoZpk{T1,TR}, s::T2) where {T1<:Number, TR<:Number, T2<:Num
 end
 
 
-function poly_factors2string(poly_factors, var)
+function poly_factors2string(poly_factors::AbstractArray{<:Poly{T}}, var) where T
     if length(poly_factors) == 0
-        str = "1.0"
+        str = sprint(printpolyfun(var), Poly{T}(one(T)))
     elseif length(poly_factors) == 1
         str = sprint(printpolyfun(var), poly_factors[1])
     else
@@ -162,9 +162,11 @@ end
     for systems on zpk form. Should at least handle the following types
     Measurment, Dual, Sym. """
 function _printcoefficient(nbr::Number)
-    nbr_string = string(nbr)
+    # Print type information as in 1.0f0 for Float32
+    # showcompact might be better, but is not consistent with polynomials
+    nbr_string = sprint(show,nbr)
     if contains(nbr_string, " + ") || contains(nbr_string, " - ") || contains(nbr_string, " ± ")
-        return "($nbr_string)"
+        return "(" * nbr_string * ")" # Add parens
     else
         return nbr_string
     end
@@ -203,7 +205,7 @@ end
 
 
 
-==(f1::SisoZpk, f2::SisoZpk) = (f1-f2).k == 0.0
+==(f1::SisoZpk, f2::SisoZpk) = (f1-f2).k == 0
 function isapprox(f1::SisoZpk, f2::SisoZpk; rtol::Real=sqrt(eps()), atol::Real=sqrt(eps()))
     fdiff = f1 - f2
     isapprox(fdiff.k, 0, atol=atol, rtol=rtol)

src/types/SisoTfTypes/SisoZpk.jl

@@ -88,6 +88,21 @@ z2 = [-4.5-sqrt(4.5^2-17), -4.5+sqrt(4.5^2-17)]
 
 # Test that number of poles matter
 @test !(zpk(Int64[],[1,1],1) == zpk(Int64[],[1],1))
+
+# Test SispZpk and SisoTf operations
+C_212_tf = tf(C_212)
+C_111_tf = tf(C_111)
+# Add
+@test C_212_tf + C_212 ≈ 2*C_212
+@test C_212 + C_212_tf ≈ 2*C_212
+# Approx
+@test C_212_tf + C_212 ≈ 2*C_212_tf
+# Minus
+@test 2*C_212_tf - C_212 ≈ C_212
+# Multiply
+@test C_212_tf*C_111 ≈ C_212*C_111
+@test C_212_tf*C_111 ≈ C_212_tf*C_111_tf
+
 # TODO test printing when it is implemented better
 
 # Tests of minreal

test/test_zpk.jl

@@ -272,13 +272,47 @@ all_fuctions_types = [
 
 
 ss1matrix(T) = (T[-1 1; 0 1], T[1 0;0 1], T[1 0], fill(T(0),1,2))
-args = [
-    (Float32, Dict(
-        "statespace" => StateSpace{Float32, Matrix{Float32}}(ss1matrix(Float32)..., 0),
-        "tf" => ,
-        "zpk" =>,
-        )
+ss2matrix(T) = (T[-3 1; 0 1], T[1 0;0 1], T[1 0], fill(T(0),1,2))
+
+tf1matrix(T) = [SisoRational{T}([1,-1],[1,0,-1]) SisoRational{T}([1,],[1,0,-1])]
+tf2matrix(T) = [SisoRational{T}([1,-1],[1,2,-3]) SisoRational{T}([1,],[1,2,-3])]
+
+zpk1matrix(T) = [SisoZpk{T,Complex{T}}([-1,],[1, -1],1) SisoZpk{T,Complex{T}}([],[1,-1],1)]
+zpk2matrix(T) = [SisoZpk{T,Complex{T}}([-1,],[-3, 1],1) SisoZpk{T,Complex{T}}([],[-3,1],1)]
 
+systemsdict(T) = Dict(
+    "statespace1" => StateSpace{T, Matrix{T}}(ss1matrix(T)..., 0),
+    "statespace2" => StateSpace{T, Matrix{T}}(ss2matrix(T)..., 0),
+    "tf1" => TransferFunction{SisoRational{T}}(tf1matrix(T), 0),
+    "tf2" => TransferFunction{SisoRational{T}}(tf2matrix(T), 0),
+    "zpk1" => TransferFunction{SisoZpk{T,Complex{T}}}(zpk1matrix(T), 0),
+    "zpk1" => TransferFunction{SisoZpk{T,Complex{T}}}(zpk2matrix(T), 0),
+    )
+
+# (ss1 +0im, ss2 +im*ss1,
+#  tf1 +0im, tf2 +im*tf2,
+#  zpk1+0im, zpk1+im*zpk2 )
+systemsdict_complex(T) = Dict(
+        "statespace1" => StateSpace{Complex{T}, Matrix{Complex{T}}}(
+            (ss1matrix(T) .+ 0 .* im.*ss1matrix(T))..., 0),
+        "statespace2" => StateSpace{Complex{T}, Matrix{Complex{T}}}(
+            (ss2matrix(T) .+ 1 .* im.*ss1matrix(T))..., 0),
+        "tf1" => TransferFunction{SisoRational{Complex{T}}}(
+            (tf1matrix(T) .+ 0 .* im.*tf1matrix(T)), 0),
+        "tf2" => TransferFunction{SisoRational{Complex{T}}}(
+            (tf2matrix(T) .+ 1 .* im.*tf1matrix(T)), 0),
+        # "zpk1" => TransferFunction{SisoZpk{T,Complex{T}}}(
+        #     (zpk1matrix(T) .+ 0 .* im.*zpk1matrix(T))..., 0),
+        # "zpk1" => TransferFunction{SisoZpk{T,Complex{T}}}(
+        #     (zpk2matrix(T) .+ 1 .* im.*zpk1matrix(T))..., 0),
+    )
+
+args = [
+    (Float32, systemsdict(Float32)),
+    (Float64, systemsdict(Float64)),
+    (Int, systemsdict(Int)),
+    (Complex{Float32}, systemsdict_complex(Float32)),
+    (Complex{Float64}, systemsdict_complex(Float64)),
 ]
 # NOTE
 # Test isleaftype(Base.code_typed(f, typeof(args))[1][2])