Commit 499715bf authored by Heraut Louis's avatar Heraut Louis
Browse files

debug inrae

parent 7e9c79ab
No related merge requests found
Showing with 16 additions and 16 deletions
+16 -16
...@@ -49,7 +49,6 @@ source('plotting/datasheet.R', encoding='UTF-8') ...@@ -49,7 +49,6 @@ source('plotting/datasheet.R', encoding='UTF-8')
source('plotting/map.R', encoding='UTF-8') source('plotting/map.R', encoding='UTF-8')
source('plotting/matrix.R', encoding='UTF-8') source('plotting/matrix.R', encoding='UTF-8')
source('plotting/break.R', encoding='UTF-8') source('plotting/break.R', encoding='UTF-8')
source('plotting/color_manager.R', encoding='UTF-8')
source('plotting/tools.R', encoding='UTF-8') source('plotting/tools.R', encoding='UTF-8')
......
...@@ -489,7 +489,9 @@ extract_data = function (computer_data_path, filedir, filename, ...@@ -489,7 +489,9 @@ extract_data = function (computer_data_path, filedir, filename,
df_data = tibble(Date=as.Date(as.character(df_data$Date), df_data = tibble(Date=as.Date(as.character(df_data$Date),
format="%Y%m%d"), format="%Y%m%d"),
Value=df_data$Qls * 1E-3, Value=df_data$Qls * 1E-3,
df_data[-1:-2], Qmmj=df_data$Qmmj,
val_H=as.character(df_data$val_H),
val_I=as.character(df_data$val_I),
code=code) code=code)
return (df_data) return (df_data)
......
...@@ -55,21 +55,21 @@ filedir = ...@@ -55,21 +55,21 @@ filedir =
# Name of the file that will be analysed from the BH directory # Name of the file that will be analysed from the BH directory
# (if 'all', all the file of the directory will be chosen) # (if 'all', all the file of the directory will be chosen)
filename = filename =
# "" ""
# "all" # "all"
c( # c(
# "S2235610_HYDRO_QJM.txt", # "S2235610_HYDRO_QJM.txt",
# "P1712910_HYDRO_QJM.txt", # "P1712910_HYDRO_QJM.txt",
# "P0885010_HYDRO_QJM.txt", # "P0885010_HYDRO_QJM.txt",
# "O5055010_HYDRO_QJM.txt", # "O5055010_HYDRO_QJM.txt",
# "O0384010_HYDRO_QJM.txt", # "O0384010_HYDRO_QJM.txt",
# "S4214010_HYDRO_QJM.txt", # "S4214010_HYDRO_QJM.txt",
"Q7002910_HYDRO_QJM.txt", # "Q7002910_HYDRO_QJM.txt",
"Q0214010_HYDRO_QJM.txt" # "Q0214010_HYDRO_QJM.txt"
# "O3035210_HYDRO_QJM.txt", # "O3035210_HYDRO_QJM.txt",
# "O0554010_HYDRO_QJM.txt", # "O0554010_HYDRO_QJM.txt",
# "O1584610_HYDRO_QJM.txt" # "O1584610_HYDRO_QJM.txt"
) # )
## AGENCE EAU ADOUR GARONNE SELECTION ## AGENCE EAU ADOUR GARONNE SELECTION
...@@ -79,8 +79,8 @@ AEAGlistdir = ...@@ -79,8 +79,8 @@ AEAGlistdir =
"" ""
AEAGlistname = AEAGlistname =
"" # ""
# "Liste-station_RRSE.docx" "Liste-station_RRSE.docx"
## NIVALE SELECTION ## NIVALE SELECTION
...@@ -91,9 +91,8 @@ INRAElistdir = ...@@ -91,9 +91,8 @@ INRAElistdir =
"" ""
INRAElistname = INRAElistname =
"" # ""
# "example.txt" "INRAE_selection.txt"
# "INRAE_selection.txt"
## TREND ANALYSIS ## TREND ANALYSIS
...@@ -133,7 +132,7 @@ source('processing/extract.R', encoding='UTF-8') ...@@ -133,7 +132,7 @@ source('processing/extract.R', encoding='UTF-8')
source('processing/format.R', encoding='UTF-8') source('processing/format.R', encoding='UTF-8')
source('processing/analyse.R', encoding='UTF-8') source('processing/analyse.R', encoding='UTF-8')
source('plotting/layout.R', encoding='UTF-8') source('plotting/layout.R', encoding='UTF-8')
source('processing/results_manager.R', encoding='UTF-8') source('processing/read_write.R', encoding='UTF-8')
# Result directory # Result directory
resdir = file.path(computer_work_path, 'results') resdir = file.path(computer_work_path, 'results')
...@@ -373,9 +372,9 @@ df_shapefile = ini_shapefile(resources_path, ...@@ -373,9 +372,9 @@ df_shapefile = ini_shapefile(resources_path,
### 5.2. Analysis layout _____________________________________________ ### 5.2. Analysis layout _____________________________________________
datasheet_layout(toplot=c( datasheet_layout(toplot=c(
'datasheet', 'datasheet'
'matrix', # 'matrix',
'map' # 'map'
), ),
df_meta=df_meta, df_meta=df_meta,
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment