X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=pkg%2FR%2FgetData.R;h=8e44a52f3a095b7bc220a4db3de2db64e3fad0f3;hb=a3344f7591f6f4b3d337a69e4a568e9b16e33415;hp=f1f8861a53370ddb59bcf78220808fbfc827945b;hpb=af718fd5a9a330b13b331e78824a47407a3479ae;p=talweg.git

diff --git a/pkg/R/getData.R b/pkg/R/getData.R
index f1f8861..8e44a52 100644
--- a/pkg/R/getData.R
+++ b/pkg/R/getData.R
@@ -62,11 +62,14 @@ getData = function(ts_data, exo_data, date_format="%d/%m/%Y %H:%M", limit=Inf)
 	{
 		time = c()
 		serie = c()
+		level_hat = c()
 		repeat
 		{
 			{
 				time = c(time, ts_df[line,1])
 				serie = c(serie, ts_df[line,2])
+				level_hat = c(level_hat, #if data file is incomplete...
+					ifelse(ncol(ts_df) > 2, ts_df[line,3], mean(serie,na.rm=TRUE)))
 				line = line + 1
 			};
 			if (line >= nb_lines + 1
@@ -76,8 +79,7 @@ getData = function(ts_data, exo_data, date_format="%d/%m/%Y %H:%M", limit=Inf)
 			}
 		}
 
-		# TODO: 2 modes, "operational" and "testing"; would need PM10 predictions
-		data$append(time=time, value=serie, level_hat=mean(serie,na.rm=TRUE),
+		data$append(time=time, value=serie, level_hat=level_hat,
 			exo=exo_df[i,2:(1+nb_exos)], exo_hat=exo_df[i,(1+nb_exos+1):(1+2*nb_exos)])
 		if (i >= limit)
 			break