written my understanding of Neighbors2; TODO: sameSeasonSimilarIndices

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

diff --git a/pkg/R/utils.R b/pkg/R/utils.R
index 64c3c0a..f79c300 100644 (file)
--- a/pkg/R/utils.R
+++ b/pkg/R/utils.R
@@ -53,14 +53,15 @@ integerIndexToDate = function(index, data)
 
 #' getSimilarDaysIndices
 #'
-#' Find similar days indices in the past
+#' Find similar days indices in the past.
 #'
 #' @param index Day index (numeric or date)
 #' @param limit Maximum number of indices to return
-#' @param same_seaon Should the indices correspond to day in same season?
+#' @param same_season Should the indices correspond to day in same season?
+#' @param data Dataset is required for a search in same season
 #'
 #' @export
-getSimilarDaysIndices = function(index, limit, same_season)
+getSimilarDaysIndices = function(index, limit, same_season, data=NULL)
 {
        index = dateIndexToInteger(index)
 
@@ -72,7 +73,9 @@ getSimilarDaysIndices = function(index, limit, same_season)
                return ( rep(index,nb_days) - 7*seq_len(nb_days) )
        }
 
-       #Look for similar days in similar season (+/- 30 days)
+
+       #TODO: use data... 12-12-1-2 CH, 3-4-9-10 EP et le reste NP
+       #Look for similar days in similar season
        days = c()
        i = index
        while (i >= 1 && length(days) < limit)
@@ -93,22 +96,13 @@ getSimilarDaysIndices = function(index, limit, same_season)
                # TODO: exact computation instead of -364
                # 364 = closest multiple of 7 to 365 - drift along the years... but not so many years so OK
                i = i - 364
+
+
        }
 
        return ( days[1:min(limit,length(days))] )
 }
 
-#' getSerie
-#'
-#' Return a time-serie from its centered version + level
-#'
-#' @param data A list as returned by \code{getData}
-#' @param index The index to return
-#'
-#' @export
-getSerie = function(data, index)
-       data[[index]]$centered_serie + data[[index]]$level
-
 #' getNoNA2
 #'
 #' Get indices in data of no-NA series followed by no-NA, within [first,last] range.