X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2Futils.R;h=b3e66e18d109f9bd56ece2618f204422f2bd63a0;hb=ee8b1b4e3c13f8dcf13a2c8da6a3bef1520c8252;hp=64c3c0a1b5c586e009cc8ae44ff271a0c1a7f2b1;hpb=98e958cab563866f8e00886b54336018a2e8bc97;p=talweg.git

diff --git a/pkg/R/utils.R b/pkg/R/utils.R
index 64c3c0a..b3e66e1 100644
--- a/pkg/R/utils.R
+++ b/pkg/R/utils.R
@@ -53,61 +53,68 @@ 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 data Reference dataset, object output of \code{getData}
 #' @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?
 #'
 #' @export
-getSimilarDaysIndices = function(index, limit, same_season)
+getSimilarDaysIndices = function(index, data, limit, same_season)
 {
-	index = dateIndexToInteger(index)
+	index = dateIndexToInteger(index, data)
 
-	#TODO: mardi similaire à lundi mercredi jeudi aussi ...etc
-	if (!same_season)
-	{
-		#take all similar days in recent past
-		nb_days = min( (index-1) %/% 7, limit)
-		return ( rep(index,nb_days) - 7*seq_len(nb_days) )
-	}
-
-	#Look for similar days in similar season (+/- 30 days)
+	# Look for similar days (optionally in same season)
+	i = index - 1
 	days = c()
-	i = index
+	dt_ref = as.POSIXlt(data$getTime(index)[1]) #first date-time of current day
+	day_ref = dt_ref$wday #1=monday, ..., 6=saturday, 0=sunday
+	month_ref = as.POSIXlt(data$getTime(index)[1])$mon+1 #month in 1...12
 	while (i >= 1 && length(days) < limit)
 	{
-		if (i < index)
+		dt = as.POSIXlt(data$getTime(i)[1])
+		if (.isSameDay(dt$wday, day_ref))
 		{
-			days = c(days, i)
-			#look in the "future of the past"
-			for (j in 1:4)
-				days = c(days, i+7*j)
+			if (!same_season || .isSameSeason(dt$mon+1, month_ref))
+				days = c(days, i)
 		}
-		#...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 - 1
 	}
+	return ( days )
+}
 
-	return ( days[1:min(limit,length(days))] )
+# isSameSeason
+#
+# Check if two months fall in the same "season" (defined by estimated pollution rate)
+#
+# @param month month index to test
+# @param month_ref month to compare to
+#
+.isSameSeason = function(month, month_ref)
+{
+	if (month_ref %in% c(11,12,1,2)) #~= mid-polluted
+		return (month %in% c(11,12,1,2))
+	if (month_ref %in% c(3,4,9,10)) #~= high-polluted
+		return (month %in% c(3,4,9,10))
+	return (month %in% c(5,6,7,8)) #~= non polluted
 }
 
-#' 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
+# isSameDay
+#
+# Monday=Tuesday=Wednesday=Thursday ; Friday, Saturday, Sunday: specials
+#
+# @param day day index to test
+# @param day_ref day index to compare to
+#
+.isSameDay = function(day, day_ref)
+{
+	if (day_ref == 0)
+		return (day==0)
+	if (day_ref <= 4)
+		return (day <= 4)
+	return (day == day_ref)
+}
 
 #' getNoNA2
 #'