From 04f713320ba8255023dc3ed58c918df58c842c80 Mon Sep 17 00:00:00 2001
From: Fredrik Bagge Carlsson <cont-frb@ulund.org>
Date: Fri, 4 Sep 2015 10:52:28 +0200
Subject: [PATCH] Introduce typealiases Polynom*
---
src/SystemIdentification.jl | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/SystemIdentification.jl b/src/SystemIdentification.jl
index 4aeb5c3..6282c6e 100644
--- a/src/SystemIdentification.jl
+++ b/src/SystemIdentification.jl
@@ -1,8 +1,9 @@
module SystemIdentification
if !isdefined(:DEBUG); DEBUG = false; end
export
-Model,
+Model,LinearModel,NonLinearModel,
Network,
+Polynom,PolynomMatrix,
AR,
ARX,
RBFARX,
@@ -21,6 +22,9 @@ abstract Model
abstract LinearModel <: Model
abstract NonLinearModel <: Model
abstract Network <: NonLinearModel
+typealias Polynom Union(Real, Array{Real,1})
+typealias PolynomMatrix Union(Array{Polynom,1},Polynom)
+
"""
`a::Vector{Float64}`: The polynomial coeffs A(z) (not including the first 1)\n
@@ -29,7 +33,7 @@ abstract Network <: NonLinearModel
`λ::Float64`\n
"""
type AR <: Model
- a::Vector{Float64}
+ a::Polynom
na::Int
bias::Bool
λ::Float64
@@ -44,8 +48,8 @@ end
`λ::Float64`\n
"""
type ARX <: Model
- a::Vector{Float64}
- b::VecOrMat{Float64}
+ a::Polynom
+ b::PolynomMatrix
na::Int
nb::Vector{Int}
bias::Bool
@@ -71,6 +75,7 @@ type FitResult
error::VecOrMat{Float64}
fit::FitStatistics
method::Symbol
+ FitResult(error::VecOrMat{Float64},method::Symbol) = new(error, FitStatistics(error),method)
end
type IdData
--
GitLab