diff --git a/src/SystemIdentification.jl b/src/SystemIdentification.jl index 0374b498313f580126f379be9c24c8fada9d281e..364e1ed7e4cee4d3ac12a4a39dbf4a8b5a2ebbbd 100644 --- a/src/SystemIdentification.jl +++ b/src/SystemIdentification.jl @@ -37,6 +37,13 @@ type AR <: LinearModel a::Polynom na::Int end +function Base.show(m::AR) + print("A(z) = 1") + for i = 1:length(m.a) + print(m.a[i], " + z^-$i") + end + print("\n") +end """ `a::Vector{Float64}`: The polynomial coeffs A(z) (not including the first 1)\n diff --git a/src/armax.jl b/src/armax.jl index 36477a72dd6ae235ee962e1582b9aab9ebe8ab4f..a5f921ccacbe5f54043e09448f5ff930396f43dc 100644 --- a/src/armax.jl +++ b/src/armax.jl @@ -27,7 +27,6 @@ function arx(y::Vector{Float64}, u::VecOrMat{Float64}, na, nb; λ = 0, doplot=fa prediction = A*w error = y_train - prediction - si = na+1 b = Polynom[w[si:si+nb[1]-1]] si += nb[1] diff --git a/test/tests.jl b/test/tests.jl index 323ed664abf2cfbe7fb9fdfeb3a7991f813efe9d..addb00c418806d59987a754cd7b776704918f378 100644 --- a/test/tests.jl +++ b/test/tests.jl @@ -83,6 +83,7 @@ function run_tests() model, result = arx(collect(1:5.0),collect(1:5.0),1,1,λ = 1) @tassert result.method == :LS_reg @tassert result.λ == 1 + model, result = arx(collect(1:5.0),[collect(2:6.0) ones(5)],2,[2,1]) end end