Skip to content

Commit 0529c94

Browse files
committed
handle equality between different system types
1 parent 5fe8d3b commit 0529c94

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

lib/ControlSystemsBase/src/types/TransferFunction.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ isrational(::TransferFunction) = true
105105
#####################################################################
106106

107107
## EQUALITY ##
108-
function ==(G1::TransferFunction, G2::TransferFunction)
108+
function ==(G1::T, G2::T) where T<:TransferFunction
109109
fields = (:timeevol, :ny, :nu, :matrix)
110110
for field in fields
111111
if getproperty(G1, field) != getproperty(G2, field)
@@ -115,6 +115,8 @@ function ==(G1::TransferFunction, G2::TransferFunction)
115115
return true
116116
end
117117

118+
==(G1::TransferFunction, G2::TransferFunction) = ==(promote(G1,G2)...)
119+
118120
## Approximate ##
119121
function isapprox(G1::TransferFunction, G2::TransferFunction; kwargs...)
120122
G1, G2 = promote(G1, G2)

lib/ControlSystemsBase/test/test_zpk.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ k = 0.3
153153
@test eltype(fill(zpk(1,0.005)/zpk(2, 0.005),2)) <: TransferFunction
154154
@test eltype(fill(zpk(1)+1,2)) <: TransferFunction
155155

156-
@test eltype([tf(1,1), zpk(1,1)]) <: TransferFunction
156+
@test eltype([tf(1,1), zpk(1,1)]) <: LTISystem
157157

158158
zpk(tf([1 2; 3 4])) == zpk([1 2; 3 4])
159159

0 commit comments

Comments
 (0)