X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2Futils.R;h=20f396b6caed027042ff917a396fd87880ee51c0;hb=a866acb3c0ae138b22df9dae9ec576b866794417;hp=0918a3257d892bc9853602aa055a923e3285e1f0;hpb=25b75559e2d9bf84e2de35b851d93fefdae36e17;p=talweg.git

diff --git a/pkg/R/utils.R b/pkg/R/utils.R
index 0918a32..20f396b 100644
--- a/pkg/R/utils.R
+++ b/pkg/R/utils.R
@@ -8,11 +8,12 @@
 #' @export
 dateIndexToInteger = function(index, data)
 {
-	index = index[1]
+	#works on integers too: trust input
 	if (is.numeric(index))
 		index = as.integer(index)
 	if (is.integer(index))
 		return (index)
+
 	if (inherits(index, "Date") || is.character(index))
 	{
 		tryCatch(indexAsDate <- as.Date(index), error=function(e) stop("Unrecognized index format"))
@@ -36,28 +37,35 @@ 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)
+
 	index = index[1]
 	if (is.numeric(index))
 		index = as.integer(index)
 	if (!is.integer(index))
-		stop("'index' should be an integer")
+		stop("'index' should be a date or integer")
 	as.Date( data$getTime(index)[1] )
 }
 
 #' 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)
 
-	#TODO: mardi similaire à lundi mercredi jeudi aussi ...etc
+	#TODO: mardi similaire à lundi mercredi jeudi aussi ...etc ==> "isSimilarDay()..."
 	if (!same_season)
 	{
 		#take all similar days in recent past
@@ -65,39 +73,48 @@ 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)
+	#Look for similar days in similar season
+	nb_days = min( (index-1) %/% 7, limit)
+	i = index - 7
 	days = c()
-	i = index
+	month_ref = as.POSIXlt(data$getTime(index)[1])$mon + 1
 	while (i >= 1 && length(days) < limit)
 	{
-		if (i < index)
-		{
+		if (isSameSeason(as.POSIXlt(data$getTime(i)[1])$mon + 1, month_ref))
 			days = c(days, i)
-			#look in the "future of the past"
-			for (j in 1:4)
-				days = c(days, i+7*j)
-		}
-		#...and in the "past of the past"
-		for (j in 1:4)
-		{
-			if (i - 7*j >= 1)
-				days = c(days, i-7*j)
-		}
-		# 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
+		i = i-7
 	}
+	return ( days )
+}
 
-	return ( days[1:min(limit,length(days))] )
+#TODO: use data... 12-12-1-2 CH, 3-4-9-10 EP et le reste NP
+isSameSeason = function(month, month_ref)
+{
+	if (month_ref %in% c(11,12,1,2))
+		return (month %in% c(11,12,1,2))
+	if (month_ref %in% c(3,4,9,10))
+		return (month %in% c(3,4,9,10))
+	return (month %in% c(5,6,7,8))
 }
 
-#' getSerie
+#TODO:
+#distinction lun-jeudi, puis ven, sam, dim
+#isSameDay = function(day, day_ref)
+#{
+#	if (day_ref == 
+
+#' 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)) )
+	) ]
+}