Complex additions and missing file

Author: mfalt

Diff for: src/types/SisoTfTypes/SisoRational.jl

@@ -95,26 +95,26 @@ function isapprox(f1::SisoRational, f2::SisoRational; rtol::Real=sqrt(eps()), at
 end
 
 +(f1::SisoRational, f2::SisoRational) = SisoRational(f1.num*f2.den + f2.num*f1.den, f1.den*f2.den)
-+(f::SisoRational, n::Real) = SisoRational(f.num + n*f.den, f.den)
-+(n::Real, f::SisoRational) = f + n
-#.+(f::SisoRational, n::Real) = t + n
-#.+(n::Real, f::SisoRational) = t + n
++(f::SisoRational, n::Number) = SisoRational(f.num + n*f.den, f.den)
++(n::Number, f::SisoRational) = f + n
+#.+(f::SisoRational, n::Number) = t + n
+#.+(n::Number, f::SisoRational) = t + n
 
 -(f1::SisoRational, f2::SisoRational) = SisoRational(f1.num*f2.den - f2.num*f1.den, f1.den*f2.den)
--(n::Real, f::SisoRational) = SisoRational(n*f.den - f.num, f.den)
--(f::SisoRational, n::Real) = +(f, -n)
-#.-(f::SisoRational, n::Real) = -(t, n)
-#.-(n::Real, f::SisoRational) = -(n, t)
+-(n::Number, f::SisoRational) = SisoRational(n*f.den - f.num, f.den)
+-(f::SisoRational, n::Number) = +(f, -n)
+#.-(f::SisoRational, n::Number) = -(t, n)
+#.-(n::Number, f::SisoRational) = -(n, t)
 
 -(f::SisoRational) = SisoRational(-f.num, f.den)
 
 *(f1::SisoRational, f2::SisoRational) = SisoRational(f1.num*f2.num, f1.den*f2.den)
-*(f::SisoRational, n::Real) = SisoRational(f.num*n, f.den)
-*(n::Real, f::SisoRational) = *(f, n)
+*(f::SisoRational, n::Number) = SisoRational(f.num*n, f.den)
+*(n::Number, f::SisoRational) = *(f, n)
 #.*(f1::SisoRational, f2::SisoRational) = *(f1, f2)
-#.*(f::SisoRational, n::Real) = *(f, n)
-#.*(n::Real, f::SisoRational) = *(f, n)
+#.*(f::SisoRational, n::Number) = *(f, n)
+#.*(n::Number, f::SisoRational) = *(f, n)
 
-/(n::Real, f::SisoRational) = SisoRational(n*f.den, f.num)
-/(f::SisoRational, n::Real) = f*(1/n)
+/(n::Number, f::SisoRational) = SisoRational(n*f.den, f.num)
+/(f::SisoRational, n::Number) = f*(1/n)
 /(f1::SisoRational, f2::SisoRational) = f1*(1/f2)

Diff for: src/types/SisoTfTypes/SisoZpk.jl

@@ -214,14 +214,14 @@ end
 
 +(f::SisoZpk, n::T) where {T<:Number} = f + SisoZpk{T,T}(T[],T[],n)
 +(n::Number, f::SisoZpk) = f + n
-#.+(t::SisoZpk, n::Real) = t + n
-#.+(n::Real, t::SisoZpk) = t + n
+#.+(t::SisoZpk, n::Number) = t + n
+#.+(n::Number, t::SisoZpk) = t + n
 
 -(t1::SisoZpk, t2::SisoZpk) = +(t1,-t2)
 -(n::T, f::SisoZpk) where {T<:Number} = SisoZpk{T,T}(T[],T[],n) - f
--(t::SisoZpk, n::Real) = +(t, -n)
-#.-(t::SisoZpk, n::Real) = -(t, n)
-#.-(n::Real, t::SisoZpk) = -(n, t)
+-(t::SisoZpk, n::Number) = +(t, -n)
+#.-(t::SisoZpk, n::Number) = -(t, n)
+#.-(n::Number, t::SisoZpk) = -(n, t)
 
 
 -(f::SisoZpk) = SisoZpk(f.z, f.p, -f.k)
@@ -231,8 +231,8 @@ end
 *(f::SisoZpk, n::Number) = SisoZpk(f.z, f.p, f.k*n)
 *(n::Number, f::SisoZpk) = *(f, n)
 #.*(f1::SisoZpk, f2::SisoZpk) = *(f1, f2)
-#.*(t::SisoZpk, n::Real) = *(t, n)
-#.*(n::Real, t::SisoZpk) = *(t, n)
+#.*(t::SisoZpk, n::Number) = *(t, n)
+#.*(n::Number, t::SisoZpk) = *(t, n)
 
 /(n::Number, f::SisoZpk) = SisoZpk(f.p, f.z, n/f.k)
 /(f::SisoZpk, n::Number) = SisoZpk(f.z, f.p, f.k/n)

Diff for: src/types/SisoTfTypes/polyprint.jl

@@ -0,0 +1,39 @@
+# Get show compatible function with var set
+printpolyfun(var) = (io, p, mimetype = MIME"text/plain"()) -> printpolydesc(io, p, var, mimetype)
+
+# Specialized function, copied and adapted from Polynomials.jl
+# Ignores var as set in Poly
+""" Prints polynomial in descending order, with variable `var`
+"""
+function printpolydesc(io::IO, p::Poly{T}, var, mimetype = MIME"text/plain"()) where {T}
+    printpoly2(io, p, var, mimetype)
+end
+
+
+# Specialized function, copied and adapted from Polynomials.jl
+# Ignores var as set in Poly
+function printpoly2(io::IO, p::Poly{T}, var, mimetype) where {T}
+    first = true
+    printed_anything = false
+    for i in reverse(eachindex(p))
+        printed = showterm2(io, p, i, first, var, mimetype)
+        first &= !printed
+        printed_anything |= printed
+    end
+    printed_anything || print(io, zero(T))
+    return nothing
+end
+
+#Specialized function, copied and adapted from Polynomials.jl
+# Ignores var as set in Poly
+function showterm2(io::IO, p::Poly{T}, j, first, var, mimetype) where {T}
+    pj = p[j]
+
+    pj == zero(T) && return false
+
+    pj = Polynomials.printsign(io, pj, j, first, mimetype)
+    Polynomials.printcoefficient(io, pj, j, mimetype)
+    Polynomials.printproductsign(io, pj, j, mimetype)
+    Polynomials.printexponent(io, var, j, mimetype)
+    true
+end