From 1108f50ab77bc71f118022f305ef99abff9749c9 Mon Sep 17 00:00:00 2001 From: Suraj Yerramilli Date: Tue, 9 Jun 2015 13:09:16 +0530 Subject: Minor Corrections --- R/sim.R | 16 ++++++++++++---- man/plot.idframe.Rd | 2 +- man/sim.arx.Rd | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/R/sim.R b/R/sim.R index c6565a5..d11b430 100644 --- a/R/sim.R +++ b/R/sim.R @@ -11,7 +11,7 @@ sim.default <- function(model,input,sigma=0,seed=NULL){ #' Simulate the response of an ARX system, given the input #' #' @param model an object of class \code{arx} containing the coefficients -#' @param input a vector/matrix containing the input +#' @param input a vector/matrix/idframe containing the input #' @param sigma standard deviation of the innovations (Default= \code{0}) #' @param seed integer indicating the seed value of the random number generator #' @@ -33,12 +33,20 @@ sim.default <- function(model,input,sigma=0,seed=NULL){ #' @export sim.arx <- function(model,input,sigma=0,seed=NULL){ na <- length(model$A) - 1; nk <- model$ioDelay; - nb <- length(model$B) - nk; nb1 <- nb+nk + nb <- length(model$B) - 1; nb1 <- nb+nk n <- max(na,nb1) - coef <- matrix(c(model$A[-1],model$B),nrow=na+nb1) + coef <- matrix(c(model$A[-1],model$B),nrow=na+nb1) + + if(class(input)=="idframe"){ + uk <- input$input[,1] + } else if(class(input) %in% c("matrix","data.frame")){ + uk <- input[,1] + } else if(is.numeric(input)){ + uk <- input + } y <- rep(0,length(input)+n) - u <- c(rep(0,n),input$input[,1]) + u <- c(rep(0,n),uk) if(!is.null(seed)) set.seed(seed) diff --git a/man/plot.idframe.Rd b/man/plot.idframe.Rd index 7c820cf..6454e98 100644 --- a/man/plot.idframe.Rd +++ b/man/plot.idframe.Rd @@ -4,7 +4,7 @@ \alias{plot.idframe} \title{Plotting idframe objects} \usage{ -\method{plot}{idframe}(object, par = list(mar = c(3, 4, 3, 2)), +\method{plot}{idframe}(object, par = list(mar = c(3, 4, 2, 2)), col = "steelblue", ...) } \arguments{ diff --git a/man/sim.arx.Rd b/man/sim.arx.Rd index 9707729..0f23d7d 100644 --- a/man/sim.arx.Rd +++ b/man/sim.arx.Rd @@ -9,7 +9,7 @@ \arguments{ \item{model}{an object of class \code{arx} containing the coefficients} -\item{input}{a vector/matrix containing the input} +\item{input}{a vector/matrix/idframe containing the input} \item{sigma}{standard deviation of the innovations (Default= \code{0})} -- cgit