From f917951c1f3c9f1ddd51e3e554babaa2963a65fe Mon Sep 17 00:00:00 2001
From: "louis.heraut" <louis.heraut@inrae.fr>
Date: Mon, 22 Nov 2021 11:11:26 +0100
Subject: [PATCH] Minor change for test of encoding
---
plotting/panel.R | 19 -------------------
processing/analyse.R | 4 ----
processing/extractBH.R | 1 +
processing/extractNV.R | 2 ++
processing/format.R | 2 ++
5 files changed, 5 insertions(+), 23 deletions(-)
diff --git a/plotting/panel.R b/plotting/panel.R
index bf79c79..34232e5 100644
--- a/plotting/panel.R
+++ b/plotting/panel.R
@@ -111,14 +111,6 @@ panel = function (df_data, df_meta, figdir, filedir_opt='', filename_opt='', var
missRect = list_df2plot[[i]]$missRect
type = list_df2plot[[i]]$type
- # print(list_df2plot)
-
- # print(df_data)
- # print(df_trend)
- # print(p_threshold)
- # print(unit2day)
- # print(missRect)
-
p = time_panel(code, df_data, df_trend, missRect,
p_threshold, unit2day, type)
@@ -135,10 +127,6 @@ panel = function (df_data, df_meta, figdir, filedir_opt='', filename_opt='', var
rep(2/((nbg-2)*2+2), nbg-2)),
ncol=1, nrow=nbg)
- # plot = grid.arrange(gtext, P[[1]], void, void, void,
- # heights=c(1/7, 3/7, 1/7, 1/7, 1/7),
- # ncol=1, nrow=5)
-
# Saving
ggsave(plot=plot,
path=outdirTmp,
@@ -269,13 +257,6 @@ text_panel = function(code, df_meta) {
}
-
-
-
-
-
-
-
void = ggplot() + geom_blank(aes(1,1)) +
theme(
plot.background = element_blank(),
diff --git a/processing/analyse.R b/processing/analyse.R
index 30d0d40..417719a 100644
--- a/processing/analyse.R
+++ b/processing/analyse.R
@@ -139,8 +139,6 @@ get_QMNAtrend = function (df_data, period) {
pos.datetime=1,
na.rm=TRUE)
- print(df_QMNAEx)
-
### /!\ NOM DE COLONNE PAS CONSERVER ###
df_QMNAlist = reprepare(df_QMNAEx, df_QMNAlist, colnamegroup=c('code'))
@@ -151,8 +149,6 @@ get_QMNAtrend = function (df_data, period) {
pos.datetime=1,
na.rm=TRUE)
- print(df_QMNAEx)
-
df_QMNAtrend = Estimate.stats(data.extract=df_QMNAEx)
res_QMNAtrend = clean(df_QMNAtrend, df_QMNAEx, df_QMNAlist)
diff --git a/processing/extractBH.R b/processing/extractBH.R
index a55d9f8..d274cc4 100644
--- a/processing/extractBH.R
+++ b/processing/extractBH.R
@@ -70,6 +70,7 @@ get_selection = function (computer_data_path, listdir, listname,
df_selec = df_selec[-1,]
+ # Change the columns name
names(df_selec) = cnames
for (c in c_num) {
diff --git a/processing/extractNV.R b/processing/extractNV.R
index 3f9ffe9..f478ce4 100644
--- a/processing/extractNV.R
+++ b/processing/extractNV.R
@@ -39,6 +39,8 @@ extractNVlist_meta = function (computer_data_path, filedir, listdir, listname, v
exist = df_meta$CODE %in% codelist
missing = codelist[!(codelist %in% df_meta$CODE)]
+
+ # Display stations for which it misses metadata
print(paste('missing station meta for :', missing))
df_meta = df_meta[exist,]
diff --git a/processing/format.R b/processing/format.R
index 78f1616..b5b79b0 100644
--- a/processing/format.R
+++ b/processing/format.R
@@ -1,5 +1,7 @@
+# Usefull library
library(dplyr)
+
join = function (df_data_BH, df_data_NV, df_meta_BH, df_meta_NV) {
if (!is.null(df_data_NV) & !is.null(df_data_BH)) {
--
GitLab