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

diff --git a/pkg/R/utils.R b/pkg/R/utils.R
index 0918a32..64c3c0a 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,11 +37,17 @@ 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] )
 }
 
@@ -101,3 +108,19 @@ getSimilarDaysIndices = function(index, limit, same_season)
 #' @export
 getSerie = function(data, index)
 	data[[index]]$centered_serie + data[[index]]$level
+
+#' 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)) )
+	) ]
+}