summaryrefslogtreecommitdiff
path: root/R/readData.R
diff options
context:
space:
mode:
authorSuraj Yerramilli2015-04-01 04:31:47 +0530
committerSuraj Yerramilli2015-04-01 04:31:47 +0530
commite6e47c3d998c6727f6b392d09517f5d4cdffc9c9 (patch)
tree57dffedf5294e7b707020b7e911b03235df3623a /R/readData.R
parent33ab6e0d72eea1be4385675953ad2ff6108b0cee (diff)
downloadSysID-R-code-e6e47c3d998c6727f6b392d09517f5d4cdffc9c9.tar.gz
SysID-R-code-e6e47c3d998c6727f6b392d09517f5d4cdffc9c9.tar.bz2
SysID-R-code-e6e47c3d998c6727f6b392d09517f5d4cdffc9c9.zip
updated documentation
Diffstat (limited to 'R/readData.R')
-rw-r--r--R/readData.R14
1 files changed, 11 insertions, 3 deletions
diff --git a/R/readData.R b/R/readData.R
index 3fc0fdf..149ae46 100644
--- a/R/readData.R
+++ b/R/readData.R
@@ -82,8 +82,8 @@ read.idframe <- function(data,freqData=FALSE,ninputs=1,
#'
#' data <- read.table.idframe("test.csv",ninputs=2,tUnit="min")
#'
-#' @export
#' @seealso \code{\link[utils]{read.table}}
+#' @export
read.table.idframe <- function(file,header=TRUE,sep=",",ninputs=1,
type=c("time","freq")[1],Ts = 1,freqData=FALSE,
tUnit="sec",...){
@@ -130,8 +130,16 @@ read.table.idframe <- function(file,header=TRUE,sep=",",ninputs=1,
#' the \pkg{xlsx} package).
#'
#' @return an idframe object
-#' @export
+#' @examples
+#' library(xlsx)
+#' dataMatrix <- data.frame(matrix(rnorm(1000),ncol=5))
+#' colnames(dataMatrix) <- c("u1","u2","y1","y2","y3")
+#' write.xlsx2(dataMatrix,file="test.xlsx",row.names=F)
+#'
+#' data <- read.xls.idframe("test.xlsx","Sheet1",ninputs=2,tUnit="min")
+#'
#' @seealso \code{\link[xlsx]{read.xlsx2}}
+#' @export
read.xls.idframe <- function(file,sheetName,header=TRUE,ninputs=1,
type=c("time","freq")[1],Ts = 1,freqData=FALSE,tUnit="time",
...){
@@ -142,7 +150,7 @@ read.xls.idframe <- function(file,sheetName,header=TRUE,ninputs=1,
dat <- read.xlsx2(file=file,sheetName=sheetName,header=header,...)
# read from dataframe and return idframe object
- out <- read.idframe(data,ninputs=ninputs,type=type,Ts = Ts,
+ out <- read.idframe(dat,ninputs=ninputs,type=type,Ts = Ts,
freqData=freqData,tUnit=tUnit)
return(out)
} \ No newline at end of file