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

diff --git a/pkg/R/utils.R b/pkg/R/utils.R
index f79c300..20f396b 100644
--- a/pkg/R/utils.R
+++ b/pkg/R/utils.R
@@ -65,7 +65,7 @@ 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
@@ -73,36 +73,36 @@ getSimilarDaysIndices = function(index, limit, same_season, data=NULL)
 		return ( rep(index,nb_days) - 7*seq_len(nb_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
+	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))
 }
 
+#TODO:
+#distinction lun-jeudi, puis ven, sam, dim
+#isSameDay = function(day, day_ref)
+#{
+#	if (day_ref == 
+
 #' getNoNA2
 #'
 #' Get indices in data of no-NA series followed by no-NA, within [first,last] range.