X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2FgetData.R;h=268c54aeba6e3b2c060e4b006eb78fea2160819f;hb=4f5204f064d37ba0ec2988ba16a7011d7f0a45cd;hp=b944dfb58dea49eb0a9b6830f56100e86c4a170a;hpb=72b9c50162bcdcf6c99fbb8b2ec6ea9ba98379cb;p=talweg.git

diff --git a/pkg/R/getData.R b/pkg/R/getData.R
index b944dfb..268c54a 100644
--- a/pkg/R/getData.R
+++ b/pkg/R/getData.R
@@ -71,12 +71,10 @@ getData = function(ts_data, exo_data, input_tz="GMT", date_format="%d/%m/%Y %H:%
 	{
 		time = c()
 		serie = c()
-		hat_serie = c()
 		repeat
 		{
 			{
 				time = c(time, ts_df[line,1])
-				hat_serie = c(serie, ts_df[line,3])
 				serie = c(serie, ts_df[line,2])
 				line = line + 1
 			};
@@ -87,10 +85,13 @@ getData = function(ts_data, exo_data, input_tz="GMT", date_format="%d/%m/%Y %H:%
 			}
 		}
 
-		hat_exo = as.data.frame( exo_df[i,(1+nb_exos+1):(1+2*nb_exos)] )
 		exo = as.data.frame( exo_df[i,2:(1+nb_exos)] )
-		data$appendHat(time, hat_serie, hat_exo)
-		data$append(serie, exo) #in realtime, this call comes hours later
+		exo_hat =
+			if (i < nrow(exo_df))
+				as.data.frame( exo_df[i+1,(1+nb_exos+1):(1+2*nb_exos)] )
+			else
+				NA #exogenous prediction for next day are useless on last day
+		data$append(time, serie, exo, exo_hat)
 		if (i >= limit)
 			break
 		i = i + 1