projects
/
talweg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
first tests for Neighbors2 after debug; TODO: some missing forecasts
[talweg.git]
/
pkg
/
R
/
utils.R
diff --git
a/pkg/R/utils.R
b/pkg/R/utils.R
index
3486ee9
..
f79c300
100644
(file)
--- a/
pkg/R/utils.R
+++ b/
pkg/R/utils.R
@@
-53,14
+53,15
@@
integerIndexToDate = function(index, data)
#' getSimilarDaysIndices
#'
#' 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 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?
+#' @param data Dataset is required for a search in same season
#'
#' @export
#'
#' @export
-getSimilarDaysIndices = function(index, limit, same_season)
+getSimilarDaysIndices = function(index, limit, same_season
, data=NULL
)
{
index = dateIndexToInteger(index)
{
index = dateIndexToInteger(index)
@@
-72,7
+73,9
@@
getSimilarDaysIndices = function(index, limit, same_season)
return ( rep(index,nb_days) - 7*seq_len(nb_days) )
}
return ( rep(index,nb_days) - 7*seq_len(nb_days) )
}
- #Look for similar days in similar season (+/- 30 days)
+
+ #TODO: use data... 12-12-1-2 CH, 3-4-9-10 EP et le reste NP
+ #Look for similar days in similar season
days = c()
i = index
while (i >= 1 && length(days) < limit)
days = c()
i = index
while (i >= 1 && length(days) < limit)
@@
-93,6
+96,8
@@
getSimilarDaysIndices = function(index, limit, same_season)
# TODO: exact computation instead of -364
# 364 = closest multiple of 7 to 365 - drift along the years... but not so many years so OK
i = i - 364
# TODO: exact computation instead of -364
# 364 = closest multiple of 7 to 365 - drift along the years... but not so many years so OK
i = i - 364
+
+
}
return ( days[1:min(limit,length(days))] )
}
return ( days[1:min(limit,length(days))] )