Simplify plots: version OK with R6 classes

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

diff --git a/pkg/R/Data.R b/pkg/R/Data.R
index 35f8524..42e8c69 100644 (file)
--- a/pkg/R/Data.R
+++ b/pkg/R/Data.R
@@ -12,27 +12,31 @@
 #'   \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.}
-#' \item{\code{getCoupleDays(first,last)}}
-#'   {Get indices of no-NA series followed by no-NA, within [first,last] range.}}
+#' @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()
@@ -60,6 +64,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)
@@ -70,6 +77,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)
@@ -85,14 +95,5 @@ Data = R6::R6Class("Data",
                ,
                removeLast = function()
                        private$.data <- private$.data[1:(length(private$.data)-1)]
-               ,
-               getCoupleDays = function(first, last)
-               {
-                       (first:last)[ sapply(first:last, function(i) {
-                               !any(
-                                       is.na(private$.data$getCenteredSerie(i)) |
-                                       is.na(private$.data$getCenteredSerie(i+1)) )
-                       }) ]
-               }
        )
 )