X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2Futils.R;h=bb769967b328edba87f583b74eabb2e4df54a916;hb=638f27f4296727aff62b56643beb9f42aa5b57ef;hp=3124881faabcedf1f0a30581195056c54c2b7f9f;hpb=102bcfda4afbb5cfee885cbee0f55545624168fd;p=talweg.git

diff --git a/pkg/R/utils.R b/pkg/R/utils.R
index 3124881..bb76996 100644
--- a/pkg/R/utils.R
+++ b/pkg/R/utils.R
@@ -63,25 +63,41 @@ integerIndexToDate = function(index, data)
 #' @param days_in Optional set to intersect with results (NULL to discard)
 #'
 #' @export
-getSimilarDaysIndices = function(index, data, limit, same_season, days_in=NULL)
+getSimilarDaysIndices = function(index, data, limit, same_season,
+	days_in=NULL, operational=TRUE)
 {
 	index = dateIndexToInteger(index, data)
 
 	# Look for similar days (optionally in same season)
-	i = index - 1
 	days = c()
 	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)
+	i = index - 1
+	if (!operational)
+		j = index + 1
+	while (length(days) < min( limit, ifelse(is.null(days_in),Inf,length(days_in)) ))
 	{
-		dt = as.POSIXlt(data$getTime(i)[1])
-		if ((is.null(days_in) || i %in% days_in) && .isSameDay(dt$wday, day_ref))
+		if (i >= 1)
+		{
+			dt = as.POSIXlt(data$getTime(i)[1])
+			if ((is.null(days_in) || i %in% days_in) && .isSameDay(dt$wday, day_ref))
+			{
+				if (!same_season || .isSameSeason(dt$mon+1, month_ref))
+					days = c(days, i)
+			}
+			i = i - 1
+		}
+		if (!operational && j <= data$getSize())
 		{
-			if (!same_season || .isSameSeason(dt$mon+1, month_ref))
-				days = c(days, i)
+			dt = as.POSIXlt(data$getTime(j)[1])
+			if ((is.null(days_in) || j %in% days_in) && .isSameDay(dt$wday, day_ref))
+			{
+				if (!same_season || .isSameSeason(dt$mon+1, month_ref))
+					days = c(days, j)
+			}
+			j = j + 1
 		}
-		i = i - 1
 	}
 	return ( days )
 }
@@ -111,25 +127,22 @@ getSimilarDaysIndices = function(index, data, limit, same_season, days_in=NULL)
 #
 .isSameDay = function(day, day_ref)
 {
-	if (day_ref == 0)
-		return (day==0)
-	if (day_ref <= 4)
-		return (day <= 4)
+	if (day_ref %in% 1:4)
+		return (day %in% 1:4)
 	return (day == day_ref)
 }
 
-#' getNoNA2
-#'
-#' Get indices in data of no-NA series followed by no-NA, within [first,last] range.
-#'
-#' @inheritParams dateIndexToInteger
-#' @param first First index (included)
-#' @param last Last index (included)
-#'
-#' @export
-getNoNA2 = function(data, first, last)
+# getNoNA2
+#
+# Get indices in data of no-NA series preceded by no-NA, within [first,last] range.
+#
+# @inheritParams dateIndexToInteger
+# @param first First index (included)
+# @param last Last index (included)
+#
+.getNoNA2 = function(data, first, last)
 {
 	(first:last)[ sapply(first:last, function(i)
-		!any( is.na(data$getCenteredSerie(i)) | is.na(data$getCenteredSerie(i+1)) )
+		!any( is.na(data$getSerie(i-1)) | is.na(data$getSerie(i)) )
 	) ]
 }