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

diff --git a/pkg/R/utils.R b/pkg/R/utils.R
index 0918a32..712a4f8 100644
--- a/pkg/R/utils.R
+++ b/pkg/R/utils.R
@@ -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"))
@@ -36,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] )
 }
 
 #' getSimilarDaysIndices
 #'
-#' 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)
@@ -91,13 +98,18 @@ getSimilarDaysIndices = function(index, limit, same_season)
 	return ( days[1:min(limit,length(days))] )
 }
 
-#' getSerie
+#' getNoNA2
 #'
-#' Return a time-serie from its centered version + level
+#' Get indices in data of no-NA series followed by no-NA, within [first,last] range.
 #'
-#' @param data A list as returned by \code{getData}
-#' @param index The index to return
+#' @param data Object of class Data
+#' @param first First index (included)
+#' @param last Last index (included)
 #'
 #' @export
-getSerie = function(data, index)
-	data[[index]]$centered_serie + data[[index]]$level
+getNoNA2 = function(data, first, last)
+{
+	(first:last)[ sapply(first:last, function(i)
+		!any( is.na(data$getCenteredSerie(i)) | is.na(data$getCenteredSerie(i+1)) )
+	) ]
+}