X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2Futils.R;h=a4efd615bd6dd2e1ca41583129114dd94d06a462;hb=cf3bb00128ac8cb930996455faf7c99a3fc102fb;hp=5ba72f05684ae4b61f9785f161461e3659bd2901;hpb=3ddf1c12af0c167fe7d3bb59e63258550270cfc5;p=talweg.git

diff --git a/pkg/R/utils.R b/pkg/R/utils.R
index 5ba72f0..a4efd61 100644
--- a/pkg/R/utils.R
+++ b/pkg/R/utils.R
@@ -68,11 +68,11 @@ getSimilarDaysIndices = function(index, data, limit, same_season, days_in=NULL)
 	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
+	i = index - 1
 	while (i >= 1 && length(days) < limit)
 	{
 		dt = as.POSIXlt(data$getTime(i)[1])
@@ -111,9 +111,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 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$getSerie(i-1)) | is.na(data$getSerie(i)) )
+	) ]
+}