diff options
author | Suraj Yerramilli | 2015-08-22 14:57:28 +0530 |
---|---|---|
committer | Suraj Yerramilli | 2015-08-22 14:57:28 +0530 |
commit | 558f3da63f981823a211c9354406db90a3db4c6c (patch) | |
tree | 61ec54aab9ac3a3fa36d79a6ac928b3d1c29a774 /R | |
parent | 1c81852f35e524b2a964d1117ebd7f443732e3fb (diff) | |
download | SysID-R-code-558f3da63f981823a211c9354406db90a3db4c6c.tar.gz SysID-R-code-558f3da63f981823a211c9354406db90a3db4c6c.tar.bz2 SysID-R-code-558f3da63f981823a211c9354406db90a3db4c6c.zip |
Fixed bugs and updated documentation
Diffstat (limited to 'R')
-rw-r--r-- | R/preprocess.R | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/R/preprocess.R b/R/preprocess.R index cb7a7ee..698e016 100644 --- a/R/preprocess.R +++ b/R/preprocess.R @@ -64,7 +64,7 @@ detrend <- function(x,type=c("constant","linear")[1]){ end=tail(reg,n=1),deltat=deltat(x)) } - est <- list(fitted.values=data_detrend,output_trend = output_trend, + est <- list(fitted.values=Z,output_trend = output_trend, input_trend = input_trend) class(est) <- "detrend" @@ -75,7 +75,7 @@ detrend <- function(x,type=c("constant","linear")[1]){ #' #' Returns detrended \code{idframe} object based on linear trend fit #' -#' @param object an object of class \code{idframe} +#' @param model an object of class \code{detrend} #' @param newdata An optional idframe object in which to look for variables with #' which to predict. If ommited, the original detrended idframe object is used #' @@ -99,15 +99,19 @@ predict.detrend <- function(model,newdata=NULL,...){ # checking if the original data has outputs if(!is.null(model$output_trend)){ - y <- ts(sapply(output_trend,predict,newdata=data.frame(reg=reg)), + y <- ts(sapply(model$output_trend,predict, + newdata=data.frame(reg=reg)), start=reg[1],end=tail(reg,n=1),deltat = deltat(x)) outputData(x) <- outputData(x) - y + outputNames(x) <- outputNames(newdata) } if(!is.null(model$input_trend)){ - y <- ts(sapply(in_trend,predict,newdata=data.frame(reg=reg)), + y <- ts(sapply(model$input_trend,predict, + newdata=data.frame(reg=reg)), start=reg[1],end=tail(reg,n=1),deltat = deltat(x)) inputData(x) <- inputData(x) - y + inputNames(x) <- inputNames(newdata) } } return(x) |