abstract type definition update with apropriate requirement of compat.jl

JuliaSystems · Jun 27, 2017 · 9ff11e8 · 9ff11e8
1 parent b53eeda
commit 9ff11e8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 32 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -3,6 +3,6 @@ Polynomials 0.1.0
 Optim 0.6.0
 LossFunctions 0.0.3
 SystemsBase
-Compat 0.9.0
+Compat 0.26.0
 ToeplitzMatrices 0.1.1
 GeneralizedSchurAlgorithm 0.0.2
diff --git a/src/types/idinfo.jl b/src/types/idinfo.jl
@@ -1,4 +1,4 @@
-abstract IdInfo{S}
+@compat abstract type IdInfo{S} end
 
 immutable IterativeIdInfo{S} <: IdInfo{S} #{T<:IterativeIdMethod}
   mse::Vector{Float64}

diff --git a/src/types/idmethods.jl b/src/types/idmethods.jl
@@ -1,8 +1,8 @@
-abstract AbstractIdMethod
+@compat abstract type AbstractIdMethod end
 
-abstract IterativeIdMethod <: AbstractIdMethod
+@compat abstract type IterativeIdMethod <: AbstractIdMethod end
 
-abstract OneStepIdMethod <: AbstractIdMethod
+@compat abstract type OneStepIdMethod <: AbstractIdMethod end
 
 function fval{T1<:Real, V1<:AbstractVector, V2<:AbstractVector, T2<:Real}(
     method::IterativeIdMethod, data::IdDataObject{T1,V1,V2}, n::Vector{Int}, x::Vector{T2},

diff --git a/src/types/idmodels.jl b/src/types/idmodels.jl
@@ -1,4 +1,4 @@
-abstract AbstractModelOrder
+@compat abstract type AbstractModelOrder end
 
 immutable FullPolyOrder{S} <: AbstractModelOrder
   na::Int
@@ -54,7 +54,7 @@ getindex{S}(p::FullPolyOrder{S}, ::Colon, ::Colon)  = p
 getindex{S}(p::FullPolyOrder{S}, ::Colon, idx::Int) = p[1,idx]
 getindex{S}(p::FullPolyOrder{S}, idx::Int, ::Colon) = p
 
-abstract IdModel{S}
+@compat abstract type IdModel{S} end
 
 immutable SSModel{S} <: IdModel{S}
   order::Int
@@ -66,7 +66,7 @@ immutable SSModel{S} <: IdModel{S}
   end
 end
 
-abstract PolyType
+@compat abstract type PolyType end
 
 immutable FIR     <: PolyType end
 immutable AR      <: PolyType end

diff --git a/src/types/idstatespace.jl b/src/types/idstatespace.jl
@@ -1,4 +1,4 @@
-immutable IdStateSpace{T,S,M,I<:IdInfo} <: SystemsBase.LtiSystem
+immutable IdStateSpace{T,S,M,I} <: SystemsBase.LtiSystem{T,S}
   A::M
   B::M
   C::M
@@ -35,26 +35,6 @@ ss(s::IdStateSpace{Val{:mimo},Val{:disc}}) = ss(s.A, s.B, s.C, s.D, s.Ts)
 samplingtime(s::IdStateSpace) = s.Ts
 isdiscrete(s::IdStateSpace)   = true
 
-summary(s::IdStateSpace) = string("ss(nx=", s.nx, ",nu=", s.nu, ",ny=", s.ny, ",Ts=",
-  s.Ts, ")")
-
-showcompact(io::IO, s::IdStateSpace) = print(io, summary(s))
-
-function show(io::IO, s::IdStateSpace)
-  println(io, "Discrete time state space model")
-  println(io, "\tx[k+1] = Ax[k] + Bu[k]")
-  println(io, "\ty[k]   = Cx[k] + Du[k]")
-  print(io, "with nx=", s.nx, ", nu=", s.nu, ", ny=", s.ny, ", Ts=", s.Ts, ".")
-end
-
-function showall(io::IO, s::IdStateSpace)
-  show(io, s)
-  println(io, "System matrix (A):")
-  println(io, s.A)
-  println(io, "Input matrix (B):")
-  println(io, s.B)
-  println(io, "Output matrix (C):")
-  println(io, s.C)
-  println(io, "Feedforward matrix (D):")
-  print(io, s.D)
-end
+numstates(s::IdStateSpace)    = s.nx
+numinputs(s::IdStateSpace)    = s.nu
+numoutputs(s::IdStateSpace)   = s.ny