'update'

[talweg.git] / pkg / R / getData.R

diff --git a/pkg/R/getData.R b/pkg/R/getData.R
index df94895..a4e1e17 100644 (file)
--- a/pkg/R/getData.R
+++ b/pkg/R/getData.R
@@ -15,14 +15,7 @@
 #' @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 A list where data[[i]] contains
-#'   \itemize{
-#'     \item time: vector of times
-#'     \item centered_serie: centered serie
-#'     \item level: corresponding level
-#'     \item exo: exogenous variables
-#'     \item exo_hat: predicted exogenous variables
-#'   }
+#' @return An object of class Data
 #'
 #' @examples
 #' ts_data = read.csv(system.file("extdata","pm10_mesures_H_loc.csv",package="talweg"))
@@ -68,7 +61,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()
+       data = Data$new()
        i = 1 #index of a cell in data
        while (line <= nb_lines)
        {
@@ -89,22 +82,17 @@ getData = function(ts_data, exo_data, input_tz="GMT", date_format="%d/%m/%Y %H:%
                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[[i]] = list("time"=time, "centered_serie"=centered_serie, "level"=level,
-                       "exo"=exo, "exo_hat"=exo_hat)
+               data$append(time, centered_serie, level, exo, exo_hat)
                if (i >= limit)
                        break
                i = i + 1
        }
-       start = 1
-       end = length(data)
-       if (length(data[[1]]$centered_serie) < length(data[[2]]$centered_serie))
-               start = 2
-       if (length(data[[length(data)]]$centered_serie) <
-               length(data[[length(data)-1]]$centered_serie))
+       if (length(data$getCenteredSerie(1)) < length(data$getCenteredSerie(2)))
+               data$removeFirst()
+       if (length(data$getCenteredSerie(data$getSize()))
+               < length(data$getCenteredSerie(data$getSize()-1)))
        {
-               end = end-1
+               data$removeLast()
        }
-       if (start>1 || end<length(data))
-               data = data[start:end]
        data
 }