projects
/
talweg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
all set-up to prepare ultimate test before last reports
[talweg.git]
/
pkg
/
R
/
getData.R
diff --git
a/pkg/R/getData.R
b/pkg/R/getData.R
index
205ee5d
..
574522b
100644
(file)
--- a/
pkg/R/getData.R
+++ b/
pkg/R/getData.R
@@
-17,6
+17,11
@@
#'
#' @return An object of class Data
#'
#'
#' @return An object of class Data
#'
+#' @example
+#' ts_data = read.csv(system.file("extdata",ts_data,package="talweg",mustWork=TRUE))
+#' exo_data = read.csv(system.file("extdata",exo_data,package="talweg",mustWork=TRUE))
+#' getData(ts_data, exo_data, ...)
+#'
#' @export
getData = function(ts_data, exo_data, input_tz="GMT", date_format="%d/%m/%Y %H:%M",
working_tz="GMT", predict_at=0, limit=Inf)
#' @export
getData = function(ts_data, exo_data, input_tz="GMT", date_format="%d/%m/%Y %H:%M",
working_tz="GMT", predict_at=0, limit=Inf)
@@
-28,7
+33,7
@@
getData = function(ts_data, exo_data, input_tz="GMT", date_format="%d/%m/%Y %H:%
working_tz = working_tz[1]
if ( (!is.data.frame(ts_data) && !is.character(ts_data)) ||
(!is.data.frame(exo_data) && !is.character(exo_data)) )
working_tz = working_tz[1]
if ( (!is.data.frame(ts_data) && !is.character(ts_data)) ||
(!is.data.frame(exo_data) && !is.character(exo_data)) )
- stop("Bad time-series / exogenous input (data
[frame]
or CSV file)")
+ stop("Bad time-series / exogenous input (data
frame
or CSV file)")
if (is.character(ts_data))
ts_data = ts_data[1]
if (is.character(exo_data))
if (is.character(ts_data))
ts_data = ts_data[1]
if (is.character(exo_data))
@@
-41,29
+46,15
@@
getData = function(ts_data, exo_data, input_tz="GMT", date_format="%d/%m/%Y %H:%
date_format = date_format[1]
ts_df =
date_format = date_format[1]
ts_df =
- if (is.character(ts_data)) {
- if (ts_data %in% data(package="talweg")$results[,"Item"])
- ts_data =
-
-
-
-
- ############CONTINUE: http://r-pkgs.had.co.nz/data.html
-
-
-
-
-
- read.csv(ts_data)
- } else {
+ if (is.character(ts_data))
+ read.csv(ts_data)
+ else
ts_data
ts_data
- }
exo_df =
exo_df =
- if (is.character(exo_data))
{
+ if (is.character(exo_data))
read.csv(exo_data)
read.csv(exo_data)
- } else {
+ else
exo_data
exo_data
- }
# Convert to the desired timezone (usually "GMT" or "Europe/Paris")
formatted_dates_POSIXlt = strptime(as.character(ts_df[,1]), date_format, tz=input_tz)
ts_df[,1] = format(as.POSIXct(formatted_dates_POSIXlt), tz=working_tz, usetz=TRUE)
# Convert to the desired timezone (usually "GMT" or "Europe/Paris")
formatted_dates_POSIXlt = strptime(as.character(ts_df[,1]), date_format, tz=input_tz)
ts_df[,1] = format(as.POSIXct(formatted_dates_POSIXlt), tz=working_tz, usetz=TRUE)