prepare last changes

[talweg.git] / pkg / R / F_Neighbors.R

diff --git a/pkg/R/F_Neighbors.R b/pkg/R/F_Neighbors.R
index 17fdd58..8eb1ddc 100644 (file)
--- a/pkg/R/F_Neighbors.R
+++ b/pkg/R/F_Neighbors.R
@@ -57,8 +57,8 @@ NeighborsForecaster = R6::R6Class("NeighborsForecaster",
                        if (!opera)
                                tdays = setdiff(tdays, today) #always exclude current day
 
-                       # Shortcut if window is known or local==TRUE && simtype==none
-                       if (hasArg("window") || (local && simtype=="none"))
+                       # Shortcut if window is known #TODO: cross-validation for number of days, on similar (yerste)days
+                       if (hasArg("window"))
                        {
                                return ( private$.predictShapeAux(data, tdays, today, predict_from, horizon,
                                        local, list(...)$window, simtype, opera, TRUE) )
@@ -140,7 +140,7 @@ NeighborsForecaster = R6::R6Class("NeighborsForecaster",
                                        }
                                        return ( data$getSerie(tdays[1])[predict_from:horizon] )
                                }
-                               max_neighbs = 10 #TODO: 10 or 12 or... ?
+                               max_neighbs = 12 #TODO: 10 or 12 or... ?
                                if (length(tdays) > max_neighbs)
                                {
                                        distances2 <- .computeDistsEndo(data, today, tdays, predict_from)