X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2FgetData.R;h=8d1a6faa9c29bcae9cb27fc9fbc20158a240abb6;hb=99f83c9af27492f6fb9b10f51fb8704ed588f5c1;hp=205ee5d516a89099b2a99aaf969d4d4c0e2d6754;hpb=6d97bfecf7310ed6682eecce1b7aa2f8185d4742;p=talweg.git

diff --git a/pkg/R/getData.R b/pkg/R/getData.R
index 205ee5d..8d1a6fa 100644
--- a/pkg/R/getData.R
+++ b/pkg/R/getData.R
@@ -17,6 +17,10 @@
 #'
 #' @return An object of class Data
 #'
+#' @examples
+#' ts_data = read.csv(system.file("extdata","pm10_mesures_H_loc.csv",package="talweg"))
+#' exo_data = read.csv(system.file("extdata","meteo_extra_noNAs.csv",package="talweg"))
+#' getData(ts_data, exo_data, input_tz="Europe/Paris", working_tz="Europe/Paris", limit=150)
 #' @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 +32,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)) )
-		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))
@@ -41,29 +45,15 @@ getData = function(ts_data, exo_data, input_tz="GMT", date_format="%d/%m/%Y %H:%
 	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
-		}
 	exo_df =
-		if (is.character(exo_data)) {
+		if (is.character(exo_data))
 			read.csv(exo_data)
-		} else {
+		else
 			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)