Skip to content
GitLab
Commit e6a53d09 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.1.2.28 CLEAN: SeriesAggreg syntax cleaned

parent 8e57ee51
dev 115-add-pcict-date-format-managment 118-plot-outputsmodel-remove-case-sensitivity-to-the-which-argument 136-decreased-performance-of-calibration-execution-time 60-migrate-transfoparam-functions-and-createcaliboptions-to-s3-methods 96-parallelize-the-grid-screening-step-during-calibration airGRplus cleanAirGRplus master CRAN_v1.7.0 CRAN_v1.6.12 CRAN_v1.6.11 CRAN_v1.6.10.4 CRAN_v1.6.9.27 CRAN_v1.6.9.24 CRAN_v1.6.9.23 CRAN_v1.6.9.21 CRAN_v1.4.3.65 CRAN_v1.4.3.60 CRAN_v1.4.3.52 CRAN_v1.3.2.42 CRAN_v1.3.2.41 CRAN_v1.3.2.40 CRAN_v1.3.2.39 CRAN_v1.3.2.23 CRAN_v1.3.2.17 CRAN_v1.2.13.16 CRAN_v1.2.13.13
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 215 additions and 88 deletions
+215 -88
DESCRIPTION
+ 1
− 1
View file @ e6a53d09
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.1.2.27
Version: 1.1.2.28
Date: 2019-01-18
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
NEWS.rmd
+ 1
− 1
View file @ e6a53d09
......@@ -13,7 +13,7 @@ output:
### 1.1.2.27 Release Notes (2019-01-18)
### 1.1.2.28 Release Notes (2019-01-18)
......
R/SeriesAggreg.R
+ 213
− 86
View file @ e6a53d09
SeriesAggreg <- function(TabSeries, TimeFormat, NewTimeFormat, ConvertFun, YearFirstMonth = 1, TimeLag = 0, verbose = TRUE){
SeriesAggreg <- function(TabSeries,
TimeFormat, NewTimeFormat,
ConvertFun,
YearFirstMonth = 1, TimeLag = 0,
verbose = TRUE) {
##_Arguments_check
##check_TabSeries
if(is.null(TabSeries) ){ stop("TabSeries must be a dataframe containing the dates and data to be converted \n"); return(NULL); }
if(!is.data.frame(TabSeries)){ stop("TabSeries must be a dataframe containing the dates and data to be converted \n"); return(NULL); }
if(ncol(TabSeries)<2){ stop("TabSeries must contain at least two columns (including the coulmn of dates \n"); return(NULL); }
if (is.null(TabSeries) ) {
stop("TabSeries must be a dataframe containing the dates and data to be converted \n")
return(NULL)
}
if (!is.data.frame(TabSeries)) {
stop("TabSeries must be a dataframe containing the dates and data to be converted \n")
return(NULL)
}
if (ncol(TabSeries) < 2) {
stop("TabSeries must contain at least two columns (including the coulmn of dates \n")
return(NULL)
}
##check_TimeFormat
if(!any(class(TabSeries[,1]) %in% "POSIXt")) {
if (!any(class(TabSeries[, 1]) %in% "POSIXt")) {
stop("TabSeries first column must be a vector of class POSIXlt or POSIXct \n")
return(NULL)
}
if(any(class(TabSeries[,1]) %in% "POSIXlt")) {
TabSeries[,1] <- as.POSIXct(TabSeries[,1])
if (any(class(TabSeries[, 1]) %in% "POSIXlt")) {
TabSeries[, 1] <- as.POSIXct(TabSeries[, 1])
}
for (iCol in 2:ncol(TabSeries)) {
if (!is.numeric(TabSeries[,iCol])) {
stop("TabSeries columns (other than the first one) be of numeric class \n")
return(NULL)
}
}
if (is.null(TimeFormat)) {
stop("TimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n")
return(NULL)
}
if (!is.vector(TimeFormat)) {
stop("TimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n")
return(NULL)
}
if (!is.character(TimeFormat)) {
stop("TimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n")
return(NULL)
}
if (length(TimeFormat) != 1) {
stop("TimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n")
return(NULL)
}
if (! TimeFormat %in% c("hourly", "daily", "monthly", "yearly")) {
stop("TimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n")
return(NULL)
}
for(iCol in 2:ncol(TabSeries)){
if(!is.numeric(TabSeries[,iCol])){ stop("TabSeries columns (other than the first one) be of numeric class \n"); return(NULL); } }
if(is.null( TimeFormat)){ stop("TimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n"); return(NULL); }
if(!is.vector( TimeFormat)){ stop("TimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n"); return(NULL); }
if(!is.character(TimeFormat)){ stop("TimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n"); return(NULL); }
if(length(TimeFormat)!=1 ){ stop("TimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n"); return(NULL); }
if(TimeFormat %in% c("hourly","daily","monthly","yearly")==FALSE){
stop("TimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n"); return(NULL); }
##check_NewTimeFormat
if(is.null( NewTimeFormat)){ stop("NewTimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n"); return(NULL); }
if(!is.vector( NewTimeFormat)){ stop("NewTimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n"); return(NULL); }
if(!is.character(NewTimeFormat)){ stop("NewTimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n"); return(NULL); }
if(length(NewTimeFormat)!=1 ){ stop("NewTimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n"); return(NULL); }
if(NewTimeFormat %in% c("hourly","daily","monthly","yearly")==FALSE){
stop("NewTimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n"); return(NULL); }
if (is.null(NewTimeFormat)) {
stop("NewTimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n")
return(NULL)
}
if (!is.vector(NewTimeFormat)) {
stop("NewTimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n")
return(NULL)
}
if (!is.character(NewTimeFormat)) {
stop("NewTimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n")
return(NULL)
}
if (length(NewTimeFormat) != 1) {
stop("NewTimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n")
return(NULL)
}
if (! NewTimeFormat %in% c("hourly", "daily", "monthly", "yearly")) {
stop("NewTimeFormat must be 'hourly', 'daily', 'monthly' or 'yearly' \n")
return(NULL)
}
##check_ConvertFun
if(is.null( ConvertFun)){ stop("ConvertFun must be a vector of character \n"); return(NULL); }
if(!is.vector( ConvertFun)){ stop("ConvertFun must be a vector of character \n"); return(NULL); }
if(!is.character(ConvertFun)){ stop("ConvertFun must be a vector of character \n"); return(NULL); }
if(length(ConvertFun)!=(ncol(TabSeries)-1)){ stop(paste("ConvertFun must be of length ",ncol(TabSeries)-1," (length=ncol(TabSeries)-1) \n",sep="")); return(NULL); }
if(sum(ConvertFun %in% c("sum","mean")==FALSE)!=0){ stop("ConvertFun elements must be either 'sum' or 'mean' \n"); return(NULL); }
if (is.null(ConvertFun)) {
stop("ConvertFun must be a vector of character \n")
return(NULL)
}
if (!is.vector(ConvertFun)) {
stop("ConvertFun must be a vector of character \n")
return(NULL)
}
if (!is.character(ConvertFun)) {
stop("ConvertFun must be a vector of character \n")
return(NULL)
}
if (length(ConvertFun) != (ncol(TabSeries) - 1)) {
stop(
paste("ConvertFun must be of length", ncol(TabSeries) - 1, "(length=ncol(TabSeries)-1) \n")
)
return(NULL)
}
if (sum(ConvertFun %in% c("sum", "mean") == FALSE) != 0) {
stop("ConvertFun elements must be either 'sum' or 'mean' \n")
return(NULL)
}
##check_YearFirstMonth
if(is.null( YearFirstMonth)){ stop("YearFirstMonth must be an integer between 1 and 12 \n"); return(NULL); }
if(!is.vector( YearFirstMonth)){ stop("YearFirstMonth must be an integer between 1 and 12 \n"); return(NULL); }
if(!is.numeric(YearFirstMonth)){ stop("YearFirstMonth must be an integer between 1 and 12 \n"); return(NULL); }
YearFirstMonth <- as.integer(YearFirstMonth);
if(length(YearFirstMonth)!=1){ stop(paste("YearFirstMonth must be only one integer between 1 and 12 \n",sep="")); return(NULL); }
if(YearFirstMonth %in% (1:12) == FALSE){ stop(paste("YearFirstMonth must be only one integer between 1 and 12 \n",sep="")); return(NULL); }
if (is.null(YearFirstMonth)) {
stop("YearFirstMonth must be an integer between 1 and 12 \n")
return(NULL)
}
if (!is.vector(YearFirstMonth)) {
stop("YearFirstMonth must be an integer between 1 and 12 \n")
return(NULL)
}
if (!is.numeric(YearFirstMonth)) {
stop("YearFirstMonth must be an integer between 1 and 12 \n")
return(NULL)
}
YearFirstMonth <- as.integer(YearFirstMonth)
if (length(YearFirstMonth) != 1) {
stop("YearFirstMonth must be only one integer between 1 and 12 \n")
return(NULL)
}
if (YearFirstMonth %in% (1:12) == FALSE) {
stop("YearFirstMonth must be only one integer between 1 and 12 \n")
return(NULL)
}
##check_DatesR_integrity
if(TimeFormat=="hourly" ){ by <- "hours" ; }
if(TimeFormat=="daily" ){ by <- "days" ; }
if(TimeFormat=="monthly"){ by <- "months"; }
if(TimeFormat=="yearly" ){ by <- "years" ; }
TmpDatesR <- seq(from=TabSeries[1,1],to=tail(TabSeries[,1],1),by=by)
if(!identical(TabSeries[,1],TmpDatesR)){ stop("Problem detected in TabSeries dates vector (in comparison with seq(from=TabSeries[1,1],to=tail(TabSeries[,1],1))) \n"); return(NULL); }
if (TimeFormat == "hourly") {
by <- "hours"
}
if (TimeFormat == "daily") {
by <- "days"
}
if (TimeFormat == "monthly") {
by <- "months"
}
if (TimeFormat == "yearly") {
by <- "years"
}
TmpDatesR <- seq(from = TabSeries[1, 1], to = tail(TabSeries[, 1], 1), by = by)
if (!identical(TabSeries[, 1], TmpDatesR)) {
stop("Problem detected in TabSeries dates vector (in comparison with seq(from=TabSeries[1,1],to=tail(TabSeries[,1],1))) \n")
return(NULL)
}
##check_conversion_direction
if((TimeFormat == "daily" & NewTimeFormat %in% c("hourly") ) |
(TimeFormat == "monthly" & NewTimeFormat %in% c("hourly","daily") ) |
(TimeFormat == "yearly" & NewTimeFormat %in% c("hourly","daily","monthly"))){
stop("only time aggregation can be performed \n"); return(NULL); }
if ((TimeFormat == "daily" & NewTimeFormat %in% c("hourly") ) |
(TimeFormat == "monthly" & NewTimeFormat %in% c("hourly","daily") ) |
(TimeFormat == "yearly" & NewTimeFormat %in% c("hourly","daily","monthly"))) {
stop("only time aggregation can be performed \n")
return(NULL)
}
##check_if_conversion_not_needed
if((TimeFormat == "hourly" & NewTimeFormat=="hourly" ) |
(TimeFormat == "daily" & NewTimeFormat=="daily" ) |
(TimeFormat == "monthly" & NewTimeFormat=="monthly") |
(TimeFormat == "yearly" & NewTimeFormat=="yearly" )){
if(verbose){ warning("\t The old and new format are identical \n\t -> no time-step conversion was performed \n"); return(TabSeries); } }
if ((TimeFormat == "hourly" & NewTimeFormat == "hourly" ) |
(TimeFormat == "daily" & NewTimeFormat == "daily" ) |
(TimeFormat == "monthly" & NewTimeFormat == "monthly") |
(TimeFormat == "yearly" & NewTimeFormat == "yearly" )) {
if (verbose) {
warning("\t The old and new format are identical \n\t -> no time-step conversion was performed \n")
return(TabSeries)
}
}
##_Time_step_conversion
##_Handle_conventional_difference_between_hourly_series_and_others
TmpDatesR <- TabSeries[,1];
#if(TimeFormat=="hourly"){ TmpDatesR <- TmpDatesR - 60*60; }
TmpDatesR <- TabSeries[, 1]
#if (TimeFormat=="hourly") { TmpDatesR <- TmpDatesR - 60*60; }
TmpDatesR <- TmpDatesR + TimeLag
Hmax <- "00"; if(TimeFormat=="hourly"){ Hmax <- "23" }
Hmax <- "00"
if (TimeFormat == "hourly") {
Hmax <- "23"
}
##_Identify_the_part_of_the_series_to_be_aggregated
NDaysInMonth <- list("31",c("28","29"),"31","30","31","30","31","31","30","31","30","31")
YearLastMonth <- YearFirstMonth+11; if(YearLastMonth>12){ YearLastMonth <- YearLastMonth-12; }
YearFirstMonthTxt <- formatC(YearFirstMonth,format="d",width=2,flag="0")
YearLastMonthTxt <- formatC(YearLastMonth,format="d",width=2,flag="0")
if(NewTimeFormat=="daily" ){ Ind1 <- which(format(TmpDatesR, "%H")=="00");
Ind2 <- which(format(TmpDatesR, "%H")==Hmax);
if(Ind2[1]<Ind1[1]){ Ind2 <- Ind2[2:length(Ind2)]; }
if(tail(Ind1,1)>tail(Ind2,1)){ Ind1 <- Ind1[1:(length(Ind1)-1)]; }
### Aggr <- NULL; iii <- 0; for(kkk in 1:length(Ind1)){
### iii <- iii+1; Aggr <- c(Aggr,rep(iii,length(Ind1[kkk]:Ind2[kkk]))); }
Aggr <- as.numeric(format(TmpDatesR[min(Ind1):max(Ind2)],"%Y%m%d")); ### more efficient
NewDatesR <- data.frame(seq(from=TmpDatesR[min(Ind1)],to=TmpDatesR[max(Ind2)],by="days"))
}
if(NewTimeFormat=="monthly"){ Ind1 <- which(format(TmpDatesR, "%d%H")=="0100");
Ind2 <- which(format(TmpDatesR,"%m%d%H") %in% paste(c("0131","0228","0229","0331","0430","0531","0630","0731","0831","0930","1031","1130","1231"),Hmax,sep=""));
Ind2[1:(length(Ind2)-1)][diff(Ind2)==1] <- NA; Ind2 <- Ind2[!is.na(Ind2)]; ### to keep only feb 29 if both feb 28 and feb 29 exists
if(Ind2[1]<Ind1[1]){ Ind2 <- Ind2[2:length(Ind2)]; }
if(tail(Ind1,1)>tail(Ind2,1)){ Ind1 <- Ind1[1:(length(Ind1)-1)]; }
### Aggr <- NULL; iii <- 0; for(kkk in 1:length(Ind1)){
### iii <- iii+1; Aggr <- c(Aggr,rep(iii,length(Ind1[kkk]:Ind2[kkk]))); }
Aggr <- as.numeric(format(TmpDatesR[min(Ind1):max(Ind2)],"%Y%m")); ### more efficient
NewDatesR <- data.frame(seq(from=TmpDatesR[min(Ind1)],to=TmpDatesR[max(Ind2)],by="months"))
}
if(NewTimeFormat=="yearly" ){ Ind1 <- which(format(TmpDatesR,"%m%d%H") %in% paste(YearFirstMonthTxt,"0100",sep=""));
Ind2 <- which(format(TmpDatesR,"%m%d%H") %in% paste(YearLastMonthTxt,NDaysInMonth[[YearLastMonth]],Hmax,sep=""));
Ind2[1:(length(Ind2)-1)][diff(Ind2)==1] <- NA; Ind2 <- Ind2[!is.na(Ind2)]; ### to keep only feb 29 if both feb 28 and feb 29 exists
if(Ind2[1]<Ind1[1]){ Ind2 <- Ind2[2:length(Ind2)]; }
if(tail(Ind1,1)>tail(Ind2,1)){ Ind1 <- Ind1[1:(length(Ind1)-1)]; }
Aggr <- NULL; iii <- 0; for(kkk in 1:length(Ind1)){
iii <- iii+1; Aggr <- c(Aggr,rep(iii,length(Ind1[kkk]:Ind2[kkk]))); }
### Aggr <- as.numeric(format(TmpDatesR[min(Ind1):max(Ind2)],"%Y")); ### not working if YearFirstMonth != 01
NewDatesR <- data.frame(seq(from=TmpDatesR[min(Ind1)],to=TmpDatesR[max(Ind2)],by="years"))
NDaysInMonth <- list("31", c("28", "29"), "31", "30", "31", "30", "31", "31", "30", "31", "30", "31")
YearLastMonth <- YearFirstMonth + 11
if (YearLastMonth > 12) {
YearLastMonth <- YearLastMonth - 12
}
YearFirstMonthTxt <- formatC(YearFirstMonth, format = "d", width = 2, flag = "0")
YearLastMonthTxt <- formatC(YearLastMonth , format = "d", width = 2, flag = "0")
if (NewTimeFormat == "daily") {
Ind1 <- which(format(TmpDatesR, "%H") == "00")
Ind2 <- which(format(TmpDatesR, "%H") == Hmax)
if (Ind2[1] < Ind1[1]) {
Ind2 <- Ind2[2:length(Ind2)]
}
if (tail(Ind1, 1) > tail(Ind2, 1)) {
Ind1 <- Ind1[1:(length(Ind1) - 1)]
}
### Aggr <- NULL; iii <- 0; for(kkk in 1:length(Ind1)) {
### iii <- iii+1; Aggr <- c(Aggr,rep(iii,length(Ind1[kkk]:Ind2[kkk]))); }
Aggr <- as.numeric(format(TmpDatesR[min(Ind1):max(Ind2)], "%Y%m%d"))
### more efficient
NewDatesR <- data.frame(seq(from = TmpDatesR[min(Ind1)], to = TmpDatesR[max(Ind2)], by = "days"))
}
if (NewTimeFormat=="monthly") {
Ind1 <- which(format(TmpDatesR, "%d%H")=="0100")
Ind2 <- which(format(TmpDatesR,"%m%d%H") %in% paste0(c("0131", "0228", "0229", "0331", "0430", "0531", "0630", "0731", "0831", "0930", "1031", "1130", "1231"), Hmax))
Ind2[1:(length(Ind2) - 1)][diff(Ind2) == 1] <- NA
Ind2 <- Ind2[!is.na(Ind2)] ### to keep only feb 29 if both feb 28 and feb 29 exists
if (Ind2[1] < Ind1[1]) {
Ind2 <- Ind2[2:length(Ind2)]
}
if (tail(Ind1, 1) > tail(Ind2, 1)) {
Ind1 <- Ind1[1:(length(Ind1) - 1)]
}
### Aggr <- NULL; iii <- 0; for(kkk in 1:length(Ind1)) {
### iii <- iii+1; Aggr <- c(Aggr,rep(iii,length(Ind1[kkk]:Ind2[kkk]))); }
Aggr <- as.numeric(format(TmpDatesR[min(Ind1):max(Ind2)],"%Y%m")); ### more efficient
NewDatesR <- data.frame(seq(from=TmpDatesR[min(Ind1)],to=TmpDatesR[max(Ind2)],by="months"))
}
if (NewTimeFormat == "yearly") {
Ind1 <- which(format(TmpDatesR, "%m%d%H") %in% paste0(YearFirstMonthTxt, "0100"))
Ind2 <- which(format(TmpDatesR, "%m%d%H") %in% paste0(YearLastMonthTxt, NDaysInMonth[[YearLastMonth]], Hmax))
Ind2[1:(length(Ind2) - 1)][diff(Ind2) == 1] <- NA
Ind2 <- Ind2[!is.na(Ind2)]
### to keep only feb 29 if both feb 28 and feb 29 exists
if (Ind2[1] < Ind1[1]) {
Ind2 <- Ind2[2:length(Ind2)]
}
if (tail(Ind1, 1) > tail(Ind2, 1)) {
Ind1 <- Ind1[1:(length(Ind1) - 1)]
}
Aggr <- NULL
iii <- 0
for (kkk in 1:length(Ind1)) {
iii <- iii + 1
Aggr <- c(Aggr, rep(iii, length(Ind1[kkk]:Ind2[kkk])))
}
### Aggr <- as.numeric(format(TmpDatesR[min(Ind1):max(Ind2)],"%Y")); ### not working if YearFirstMonth != 01
NewDatesR <- data.frame(seq(from = TmpDatesR[min(Ind1)], to = TmpDatesR[max(Ind2)], by = "years"))
}
##_Aggreation_and_export
NewTabSeries <- data.frame(NewDatesR)
for(iCol in 2:ncol(TabSeries)){
AggregData <- aggregate(TabSeries[min(Ind1):max(Ind2),iCol],by=list(Aggr),FUN=ConvertFun[iCol-1],na.rm=F)[,2]
NewTabSeries <- data.frame(NewTabSeries,AggregData)
for (iCol in 2:ncol(TabSeries)) {
AggregData <- aggregate(TabSeries[min(Ind1):max(Ind2), iCol],
by = list(Aggr),
FUN = ConvertFun[iCol - 1], na.rm = FALSE)[, 2]
NewTabSeries <- data.frame(NewTabSeries, AggregData)
}
names(NewTabSeries) <- names(TabSeries)
return(NewTabSeries);
return(NewTabSeries)
}
\ No newline at end of file
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