diff --git a/processing/format.R b/processing/format.R
index 7b173950e335711b610157128688f5f076bc632b..c0a5de02aa873d96a79d68142185d1bcacab00b2 100644
--- a/processing/format.R
+++ b/processing/format.R
@@ -112,40 +112,64 @@ reprepare = function(df_XEx, df_Xlist, colnamegroup=NULL) {
prepare_date = function(df_XEx, df_Xlist) {
- dateMD = substr(df_Xlist$data$Date, 6, 10)
- idYearList = which(dateMD == "01-01")
- YearList = df_Xlist$data$Date[idYearList]
- groupList = df_Xlist$data$group[idYearList]
-
- Group = levels(factor(df_XEx$group1))
- for (group in Group) {
+ # dateMD = substr(df_Xlist$data$Date, 6, 10)
+ # idYearList = which(dateMD == "01-01")
+ # YearList = df_Xlist$data$Date[idYearList]
+ # groupList = df_Xlist$data$group[idYearList]
+
+ # Group = levels(factor(df_XEx$group1))
+ # for (group in Group) {
- Year = YearList[groupList == group]
+ # Year = YearList[groupList == group]
- for (idyear in 1:length(Year)) {
- year = Year[idyear]
+ # for (idyear in 1:length(Year)) {
+ # year = Year[idyear]
- idShift = which(df_Xlist$data$group == group
- & df_Xlist$data$Date == year)
+ # idShift = which(df_Xlist$data$group == group
+ # & df_Xlist$data$Date == year)
- okEx = df_XEx$group1 == group & df_XEx$datetime == substr(year, 1, 4)
+ # okEx = df_XEx$group1 == group & df_XEx$datetime == substr(year, 1, 4)
- df_XEx$values[okEx] = df_XEx$values[okEx] + idShift
- }
- }
+ # df_XEx$values[okEx] = df_XEx$values[okEx] + idShift
+ # }
+ # }
- idDate = df_XEx$values
- dateEx = as.Date(df_Xlist$data$Date[idDate])
- origin = as.Date(paste(format(dateEx, "%Y"), '-01-01', sep=''))
- ndate = length(origin)
+ # idDate = df_XEx$values
+ # dateEx = as.Date(df_Xlist$data$Date[idDate])
+ # origin = as.Date(paste(format(dateEx, "%Y"), '-01-01', sep=''))
+ # ndate = length(origin)
- dateExJul = rep(0, times=ndate)
- for (i in 1:ndate) {
- dateExJul[i] = julian(dateEx[i], origin=origin[i])
- }
+ # dateExJul = rep(0, times=ndate)
+ # for (i in 1:ndate) {
+ # dateExJul[i] = julian(dateEx[i], origin=origin[i])
+ # }
- df_XEx$values = dateExJul
+ # df_XEx$values = dateExJul
+ dateStart_group = summarise(group_by(df_Xlist$data, group),
+ Date = min(Date))
+ # filter(group_by(df_Xlist$data, group), Date == min(Date))
+
+ dateStart_group$Date_julian = NA
+ date = as.Date(dateStart_group$Date)
+ origin = as.Date(paste(format(dateStart_group$Date, "%Y"),
+ '-01-01', sep=''))
+
+ for (i in 1:nrow(dateStart_group)) {
+ dateJultmp = julian(date[i], origin=origin[i])
+ dateStart_group$Date_julian[i] = dateJultmp
+ }
+
+ dateStart_group$Year = format(dateStart_group$Date, "%Y")
+
+ for (group in dateStart_group$group) {
+ OkdateStart_group = dateStart_group$group == group
+ Shift = dateStart_group$Date_julian[OkdateStart_group]
+ year = dateStart_group$Year[OkdateStart_group]
+ OkXEx = df_XEx$group1 == group & df_XEx$datetime == year
+ df_XEx$values[OkXEx] = df_XEx$values[OkXEx] + Shift
+ }
+
return (df_XEx)
}
diff --git a/script.R b/script.R
index 9b171a937e7668c220760ad4e63000c3c487362d..2152345974e7bedc50e542bc991a976dbb1e86a0 100644
--- a/script.R
+++ b/script.R
@@ -55,7 +55,7 @@ filedir =
# Name of the file that will be analysed from the BH directory
# (if 'all', all the file of the directory will be chosen)
filename =
- ""
+ # ""
# c(
# "S2235610_HYDRO_QJM.txt",
@@ -65,12 +65,11 @@ filename =
# "O0384010_HYDRO_QJM.txt"
# )
- # c(
- # "S4214010_HYDRO_QJM.txt",
- # "O0384010_HYDRO_QJM.txt",
- # "Q7002910_HYDRO_QJM.txt",
- # "O3006710_HYDRO_QJM.txt"
- # )
+ c(
+ "S4214010_HYDRO_QJM.txt",
+ "O0384010_HYDRO_QJM.txt",
+ "Q7002910_HYDRO_QJM.txt"
+ )
@@ -81,8 +80,8 @@ AGlistdir =
""
AGlistname =
- # ""
- "Liste-station_RRSE.docx"
+ ""
+ # "Liste-station_RRSE.docx"
## NIVALE SELECTION
@@ -245,9 +244,9 @@ res_VCN10trend = get_VCN10trend(df_data, df_meta,
p_thresold=p_thresold)
# VCN10 date trend
-# res_dateVCN10trend = get_dateVCN10trend(df_data, df_meta,
- # period=trend_period,
- # p_thresold=p_thresold)
+res_dateVCN10trend = get_dateVCN10trend(df_data, df_meta,
+ period=trend_period,
+ p_thresold=p_thresold)
### 3.3. Break analysis
# df_break = get_break(res_QAtrend$data, df_meta)
@@ -263,7 +262,11 @@ res_VCN10trend = get_VCN10trend(df_data, df_meta,
## 4. PLOTTING
# Shapefile importation in order to it only once time
-df_shapefile = ini_shapefile(computer_data_path, fr_shpdir, fr_shpname, bs_shpdir, bs_shpname, sbs_shpdir, sbs_shpname, rv_shpdir, rv_shpname, riv=FALSE)
+df_shapefile = ini_shapefile(computer_data_path,
+ fr_shpdir, fr_shpname,
+ bs_shpdir, bs_shpname,
+ sbs_shpdir, sbs_shpname,
+ rv_shpdir, rv_shpname, riv=FALSE)
### 4.1. Simple time panel to criticize station data
# Plot time panel of debit by stations
@@ -280,22 +283,22 @@ df_shapefile = ini_shapefile(computer_data_path, fr_shpdir, fr_shpname, bs_shpdi
### 4.2. Analysis layout
datasheet_layout(isplot=c(
- # 'datasheet'
+ 'datasheet'
# 'matrix',
- 'map'
+ # 'map'
),
df_meta=df_meta,
df_data=list(res_QAtrend$data,
res_QMNAtrend$data,
- res_VCN10trend$data),
- # res_dateVCN10trend$data),
+ res_VCN10trend$data,
+ res_dateVCN10trend$data),
df_trend=list(res_QAtrend$trend,
res_QMNAtrend$trend,
- res_VCN10trend$trend),
- # res_dateVCN10trend$trend),
- type=list('QA', 'QMNA', 'VCN10'),#, 'VCN10 date'),
+ res_VCN10trend$trend,
+ res_dateVCN10trend$trend),
+ type=list('QA', 'QMNA', 'VCN10', 'VCN10 date'),
- layout_matrix=matrix(c(1, 2, 3, 4, NA, NA), ncol=2),
+ layout_matrix=matrix(c(1, 2, 3, 4), ncol=1),
missRect=list(TRUE, TRUE, TRUE, TRUE),
trend_period=trend_period,