X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=pkg%2FR%2FgetData.R;h=da4b4594bd30f2b761e55c37917be346cb0cb2a9;hp=8d1a6faa9c29bcae9cb27fc9fbc20158a240abb6;hb=f17665c7d3da672163779da686d9f4d1ebad31f9;hpb=42916467fa0d13aba2f345682d877adc11e1a77b

diff --git a/pkg/R/getData.R b/pkg/R/getData.R
index 8d1a6fa..da4b459 100644
--- a/pkg/R/getData.R
+++ b/pkg/R/getData.R
@@ -14,6 +14,7 @@
 #'   see \code{strptime})
 #' @param working_tz Timezone to work with ("GMT" or e.g. "Europe/Paris")
 #' @param predict_at When does the prediction take place ? Integer, in hours. Default: 0
+#' @param limit Number of days to extract (default: Inf, for "all")
 #'
 #' @return An object of class Data
 #'
@@ -61,7 +62,7 @@ getData = function(ts_data, exo_data, input_tz="GMT", date_format="%d/%m/%Y %H:%
 	line = 1 #index in PM10 file (24 lines for 1 cell)
 	nb_lines = nrow(ts_df)
 	nb_exos = ( ncol(exo_df) - 1 ) / 2
-	data = list() #new("Data")
+	data = Data$new()
 	i = 1 #index of a cell in data
 	while (line <= nb_lines)
 	{
@@ -78,18 +79,22 @@ getData = function(ts_data, exo_data, input_tz="GMT", date_format="%d/%m/%Y %H:%
 				break
 		}
 
-		# NOTE: if predict_at does not cut days at midnight, exogenous vars need to be shifted
-		exo_hat = as.data.frame( exo_df[
-			ifelse(predict_at>0,max(1,i-1),i) , (1+nb_exos+1):(1+2*nb_exos) ] )
-		exo = as.data.frame( exo_df[ ifelse(predict_at>0,max(1,i-1),i) , 2:(1+nb_exos) ] )
+		exo = as.data.frame( exo_df[i,2:(1+nb_exos)] )
+		exo_hat = as.data.frame( exo_df[i,(1+nb_exos+1):(1+2*nb_exos)] )
 		level = mean(serie, na.rm=TRUE)
 		centered_serie = serie - level
-		#data$append(time, centered_serie, level, exo_hat, exo_Jm1) #too slow; TODO: use R6 class
-		data[[length(data)+1]] = list("time"=time, "serie"=centered_serie, "level"=level,
-			"exo_hat"=exo_hat, "exo"=exo)
+		data$append(time, centered_serie, level, exo, exo_hat)
 		if (i >= limit)
 			break
 		i = i + 1
 	}
-	new("Data",data=data)
+	if (length(data$getCenteredSerie(1)) < length(data$getCenteredSerie(1)))
+		data$removeFirst()
+	if (length(data$getCenteredSerie( data$getSize() )) <
+		length(data$getCenteredSerie( data$getSize()-1 )))
+	{
+		data$removeLast()
+	}
+
+	data
 }