X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2FData.R;h=697da05f459f7cf4442e4f631e89b62942ee2ded;hb=546b0cb65870355a2a2c3705c91418570499d3a6;hp=677d9067fa363251ede495d7be8abcfc83837117;hpb=a66a84b56467194852f2faee15f4725759b24158;p=talweg.git

diff --git a/pkg/R/Data.R b/pkg/R/Data.R
index 677d906..697da05 100644
--- a/pkg/R/Data.R
+++ b/pkg/R/Data.R
@@ -12,25 +12,32 @@
 #'   \item exo: exogenous variables
 #'   \item exo_hat: predicted exogenous variables}
 #'
-#' @section Methods: \describe{
-#' \item{\code{getSize()}}
-#'   {Return number of series in dataset.}
-#' \item{\code{getStdHorizon()}}
-#'   {Return number of time steps from serie[1] until midnight}
-#' \item{\code{append(new_time, new_centered_serie, new_level, new_exo, new_exo_hat)}}
-#'   {Acquire a new vector of lists (time, centered_serie, level, exo, exo_hat).}
-#' \item{\code{getTime(index)}}
-#'   {Get times at specified index.}
-#' \item{\code{getCenteredSerie(index)}}
-#'   {Get centered serie at specified index.}
-#' \item{\code{getLevel(index)}}
-#'   {Get level at specified index.}
-#' \item{\code{getSerie(index)}}
-#'   {Get serie (centered+level) at specified index.}
-#' \item{\code{getExo(index)}}
-#'   {Get exogenous variables at specified index.}
-#' \item{\code{getExoHat(index)}}
-#'   {Get estimated exogenous variables at specified index.} }
+#' @section Methods:
+#' \describe{
+#' \item{\code{getSize()}}{
+#'   Return number of series in dataset.}
+#' \item{\code{getStdHorizon()}}{
+#'   Return number of time steps from serie[1] until midnight}
+#' \item{\code{append(new_time, new_centered_serie, new_level, new_exo, new_exo_hat)}}{
+#'   Acquire a new vector of lists (time, centered_serie, level, exo, exo_hat).}
+#' \item{\code{getTime(index)}}{
+#'   Get times at specified index.}
+#' \item{\code{getCenteredSerie(index)}}{
+#'   Get centered serie at specified index.}
+#' \item{\code{getCenteredSeries(indices)}}{
+#'   Get centered series at specified indices (in columns).}
+#' \item{\code{getLevel(index)}}{
+#'   Get level at specified index.}
+#' \item{\code{getSerie(index)}}{
+#'   Get serie (centered+level) at specified index.}
+#' \item{\code{getSeries(indices)}}{
+#'   Get series at specified indices (in columns).}
+#' \item{\code{getExo(index)}}{
+#'   Get exogenous variables at specified index.}
+#' \item{\code{getExoHat(index)}}{
+#'   Get estimated exogenous variables at specified index.}
+#' }
+#'
 Data = R6::R6Class("Data",
 	private = list(
 		.data = list()
@@ -42,7 +49,7 @@ Data = R6::R6Class("Data",
 		getStdHorizon = function()
 			24 - as.POSIXlt( private$.data[[1]]$time[1] )$hour + 1
 		,
-		append = function(
+		append = function(new_time, new_centered_serie, new_level, new_exo, new_exo_hat)
 		{
 			private$.data[[length(private$.data)+1]] <- list(
 				"time"=new_time, "centered_serie"=new_centered_serie, "level"=new_level,
@@ -58,6 +65,9 @@ Data = R6::R6Class("Data",
 			index = dateIndexToInteger(index, self)
 			private$.data[[index]]$centered_serie
 		},
+		getCenteredSeries = function(indices)
+			sapply(indices, function(i) self$getCenteredSerie(i))
+		,
 		getLevel = function(index)
 		{
 			index = dateIndexToInteger(index, self)
@@ -68,6 +78,9 @@ Data = R6::R6Class("Data",
 			index = dateIndexToInteger(index, self)
 			private$.data[[index]]$centered_serie + private$.data[[index]]$level
 		},
+		getSeries = function(indices)
+			sapply(indices, function(i) self$getSerie(i))
+		,
 		getExo = function(index)
 		{
 			index = dateIndexToInteger(index, self)