X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=pkg%2FR%2Futils.R;h=712a4f8d37f461be977f57a0c03f0b48d33d01e4;hp=de8e861cb5c02ab5e0e2c1bc2f26f527b1c34589;hb=4e25de2cf40b946ac6e8c2abc824637a249941d1;hpb=44a9990b6d608ffcd2e99d5193fa8b9e6cbdb436

diff --git a/pkg/R/utils.R b/pkg/R/utils.R
index de8e861..712a4f8 100644
--- a/pkg/R/utils.R
+++ b/pkg/R/utils.R
@@ -1,6 +1,6 @@
-#' @title dateIndexToInteger
+#' dateIndexToInteger
 #'
-#' @description Transform a (potential) date index into an integer (relative to data)
+#' Transform a (potential) date index into an integer (relative to data)
 #'
 #' @param index Date (or integer) index
 #' @param data Object of class \code{Data}
@@ -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"))
@@ -20,26 +21,15 @@ dateIndexToInteger = function(index, data)
 		integerIndex <- round( as.numeric(
 			difftime(indexAsDate, as.Date(data$getTime(1)[1])) ) ) + 1
 		if (integerIndex >= 1 && integerIndex <= data$getSize())
-		{
-			#WARNING: if index>=2 && series start at date >0h, result must be shifted
-			#Convention: if first date asked, return first matching index (i.e.: 1)
-			shift = 0
-			if (integerIndex >= 2)
-			{
-				date1 = as.POSIXlt(data$getTime(1)[1])
-				date2 = as.POSIXlt(data$getTime(2)[1])
-				shift = (date1$year==date2$year && date1$mon==date2$mon && date1$mday==date2$mday)
-			}
-			return (integerIndex + shift)
-		}
+			return (integerIndex)
 		stop("Date outside data range")
 	}
 	stop("Unrecognized index format")
 }
 
-#' @title integerIndexToDate
+#' integerIndexToDate
 #'
-#' @description Transform an integer index to date index (relative to data)
+#' Transform an integer index to date index (relative to data)
 #'
 #' @param index Date (or integer) index
 #' @param data Object of class \code{Data}
@@ -47,21 +37,27 @@ 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] )
 }
 
-#' @title getSimilarDaysIndices
+#' getSimilarDaysIndices
 #'
-#' @description 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?
 #'
 #' @export
 getSimilarDaysIndices = function(index, limit, same_season)
@@ -101,3 +97,19 @@ getSimilarDaysIndices = function(index, limit, same_season)
 
 	return ( days[1:min(limit,length(days))] )
 }
+
+#' getNoNA2
+#'
+#' Get indices in data of no-NA series followed by no-NA, within [first,last] range.
+#'
+#' @param data Object of class Data
+#' @param first First index (included)
+#' @param last Last index (included)
+#'
+#' @export
+getNoNA2 = function(data, first, last)
+{
+	(first:last)[ sapply(first:last, function(i)
+		!any( is.na(data$getCenteredSerie(i)) | is.na(data$getCenteredSerie(i+1)) )
+	) ]
+}