X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2FF_Neighbors.R;h=8eb1ddc240be802f50b52afeb63ac95a373676d1;hb=7c4b2952874de1d40a742e72efe51999b99050f5;hp=17fdd58d7a19b3e448e92f37e2e8d192a824e261;hpb=9b9bb2d490e356ff0393aec66b137cff0a64803d;p=talweg.git

diff --git a/pkg/R/F_Neighbors.R b/pkg/R/F_Neighbors.R
index 17fdd58..8eb1ddc 100644
--- 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)