improvements, updated report

[talweg.git] / R / J_Persistence.R

diff --git a/R/J_Persistence.R b/R/J_Persistence.R
index 744b42a..8ac597c 100644 (file)
--- a/R/J_Persistence.R
+++ b/R/J_Persistence.R
@@ -6,16 +6,17 @@ getPersistenceJumpPredict = function(data, today, memory, horizon, params, ...)
 {
        #return gap between end of similar day curve and first day of tomorrow (in the past)
        first_day = max(1, today-memory)
-       index = today-7
+       same_day = ifelse(hasArg("same_day"), list(...)$same_day, TRUE)
+       index = today - ifelse(same_day,7,1)
        repeat
        {
                {
-                       last_similar_serie_end = tail( data$getCenteredSerie(index), 1)
-                       last_similar_tomorrow_begin = data$getCenteredSerie(index+1)[1]
-                       index = index - 7
+                       last_serie_end = tail( data$getSerie(index), 1)
+                       last_tomorrow_begin = data$getSerie(index+1)[1]
+                       index = index - ifelse(same_day,7,1)
                };
-               if (!is.na(last_similar_serie_end) && !is.na(last_similar_tomorrow_begin))
-                       return (last_similar_tomorrow_begin - last_similar_serie_end);
+               if (!is.na(last_serie_end) && !is.na(last_tomorrow_begin))
+                       return (last_tomorrow_begin - last_serie_end);
                if (index < first_day)
                        return (NA)
        }