X-Git-Url: https://git.auder.net/?p=talweg.git;a=blobdiff_plain;f=pkg%2FR%2FgetData.R;h=4f9e179a56378a858c148a76d95a0631484658dd;hp=5139a4da18dfda81105ce0e2b57e2ff1839a8090;hb=dea7ff860b42b3e246c8fa7ce2fb514561b8bc43;hpb=469529710f56c790ae932b45d13fed2e34bcabf2

diff --git a/pkg/R/getData.R b/pkg/R/getData.R
index 5139a4d..4f9e179 100644
--- a/pkg/R/getData.R
+++ b/pkg/R/getData.R
@@ -73,16 +73,18 @@ getData = function(ts_data, exo_data,
 				break
 		}
 
+##TODO: fix note comment ! --> triche: exo contient les mesures du jour, pas forcément toutes available
 		# NOTE: if predict_at does not cut days at midnight,
 		# for the exogenous to be synchronized they need to be shifted
 		if (predict_at > 0)
 		{
 			exo_hat = as.data.frame(exo_df[max(1,i-1),(1+nb_exos+1):(1+2*nb_exos)])
-			exo_Dm1 = if (i>=3) as.data.frame(exo_df[i-1,2:(1+nb_exos)]) else NA
-		} else
+			exo = as.data.frame(exo_df[max(1,i-1),2:(1+nb_exos)])
+		}
+		else
 		{
 			exo_hat = as.data.frame(exo_df[i,(1+nb_exos+1):(1+2*nb_exos)])
-			exo_Dm1 = if (i>=2) as.data.frame(exo_df[i-1,2:(1+nb_exos)]) else NA
+			exo = as.data.frame(exo_df[i,2:(1+nb_exos)])
 		}
 		i = i + 1
 		#center data
@@ -90,7 +92,7 @@ getData = function(ts_data, exo_data,
 		centered_serie = serie - level
 #		data$append(time, centered_serie, level, exo_hat, exo_Jm1) #TODO: slow: why ?
 		data[[length(data)+1]] = list("time"=time, "serie"=centered_serie, "level"=level,
-			"exo_hat"=exo_hat, "exo_Dm1"=exo_Dm1)
+			"exo_hat"=exo_hat, "exo"=exo)
 	}
 	new("Data",data=data)
 }