X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2Futils.R;h=f79c30083ec1c1ddcb4334976f6589efcf9fcc5e;hb=9db234c56c330bb3f652718c5ee1eb16bc1f6fc7;hp=80a7e5df1e2774fbd54217044ef862ccc0d09c07;hpb=a66a84b56467194852f2faee15f4725759b24158;p=talweg.git

diff --git a/pkg/R/utils.R b/pkg/R/utils.R
index 80a7e5d..f79c300 100644
--- a/pkg/R/utils.R
+++ b/pkg/R/utils.R
@@ -8,10 +8,12 @@
 #' @export
 dateIndexToInteger = function(index, data)
 {
+	#works on integers too: trust input
 	if (is.numeric(index))
 		index = as.integer(index)
 	if (is.integer(index))
-		return (index) #works on integers too: trust input
+		return (index)
+
 	if (inherits(index, "Date") || is.character(index))
 	{
 		tryCatch(indexAsDate <- as.Date(index), error=function(e) stop("Unrecognized index format"))
@@ -35,8 +37,12 @@ dateIndexToInteger = function(index, data)
 #' @export
 integerIndexToDate = function(index, data)
 {
+	#works on dates too: trust input
+	if (is.character(index))
+		index = as.Date(index)
 	if (is(index,"Date"))
-		return (index) #works on dates too: trust input
+		return (index)
+
 	index = index[1]
 	if (is.numeric(index))
 		index = as.integer(index)
@@ -47,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)
 
@@ -66,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)
@@ -87,18 +96,25 @@ 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
+#' getNoNA2
 #'
-#' Return a time-serie from its centered version + level
+#' Get indices in data of no-NA series followed by no-NA, within [first,last] range.
 #'
-#' @param data A list as returned by \code{getData}
-#' @param index The index to return
+#' @param data Object of class Data
+#' @param first First index (included)
+#' @param last Last index (included)
 #'
 #' @export
-getSerie = function(data, index)
-	data[[index]]$centered_serie + data[[index]]$level
+getNoNA2 = function(data, first, last)
+{
+	(first:last)[ sapply(first:last, function(i)
+		!any( is.na(data$getCenteredSerie(i)) | is.na(data$getCenteredSerie(i+1)) )
+	) ]
+}