projects
/
talweg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
on the way back without realtime
[talweg.git]
/
pkg
/
R
/
getData.R
diff --git
a/pkg/R/getData.R
b/pkg/R/getData.R
index
b944dfb
..
b095d01
100644
(file)
--- 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()
{
time = c()
serie = c()
- hat_serie = c()
repeat
{
{
time = c(time, ts_df[line,1])
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
};
serie = c(serie, ts_df[line,2])
line = line + 1
};
@@
-89,7
+87,7
@@
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)] )
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$appendHat(time, hat_exo)
data$append(serie, exo) #in realtime, this call comes hours later
if (i >= limit)
break
data$append(serie, exo) #in realtime, this call comes hours later
if (i >= limit)
break