diff options
| author | Suraj Yerramilli | 2016-02-10 13:38:21 +0530 |
|---|---|---|
| committer | Suraj Yerramilli | 2016-02-10 13:38:21 +0530 |
| commit | 1d7fd8999d18a70623af577dfc751a07300a5ef9 (patch) | |
| tree | 2d9351ba2fbddc01378a7db51d4f3ade56005339 | |
| parent | 1b061d75ced7c189eb9ffadf99c3973749a4e066 (diff) | |
| download | SysID-R-code-1d7fd8999d18a70623af577dfc751a07300a5ef9.tar.gz SysID-R-code-1d7fd8999d18a70623af577dfc751a07300a5ef9.tar.bz2 SysID-R-code-1d7fd8999d18a70623af577dfc751a07300a5ef9.zip | |
correcting vector -> matrix conversion errors
| -rw-r--r-- | R/estUtil.R | 4 | ||||
| -rw-r--r-- | R/estpoly.R | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/R/estUtil.R b/R/estUtil.R index dc0a00d..8844582 100644 --- a/R/estUtil.R +++ b/R/estUtil.R @@ -175,12 +175,12 @@ bjGrad <- function(theta,e,dots){ } else{ filt_ts <- signal::Arma(b=c(1,theta[nb+1:nc]), a=c(1,theta[nb+nc+1:nd])) - w <- signal::filter(filt_ts,e) + w <- matrix(signal::filter(filt_ts,e)) zeta <- y-w } zetaout <- matrix(c(rep(0,n),zeta[,])) wout <- matrix(c(rep(0,n),w[,])) - eout <- matrix(c(rep(0,n)),e[,]) + eout <- matrix(c(rep(0,n),e[,])) reg <- function(i) { if(nk==0) v <- i-0:(nb-1) else v <- i-nk:nb1 diff --git a/R/estpoly.R b/R/estpoly.R index dd422c4..77519f7 100644 --- a/R/estpoly.R +++ b/R/estpoly.R @@ -368,11 +368,11 @@ bj <- function(x,order=c(1,1,1,1,0),init_sys=NULL, # Initial Guess mod_oe <- oe(x,c(nb,nf,nk)) - v <- resid(mod_oe); zeta <- predict(mod_oe) + v <- resid(mod_oe); zeta <- matrix(predict(mod_oe)) mod_arma <- arima(v,order=c(nd,0,nc),include.mean = F) theta0 <- matrix(c(mod_oe$sys$B,coef(mod_arma)[nd+1:nc], coef(mod_arma)[1:nd],mod_oe$sys$F1[-1])) - eps <- resid(mod_arma) + eps <- matrix(resid(mod_arma)) leftPadZeros <- function(x,n) c(rep(0,n),x) uout <- apply(u,2,leftPadZeros,n=n) |