From 2efc91574bd79dac67760a9bb6114de85b096e0e Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Thu, 9 Apr 2020 20:32:27 +0200
Subject: [PATCH] v1.4.4.17 UPDATE: variable names changed into SeriesAggreg2
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/SeriesAggreg2.R | 16 ++++++++--------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index d4f51c89..4a872754 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.4.4.16
+Version: 1.4.4.17
Date: 2020-04-09
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.md b/NEWS.md
index 0c32f827..be47c5d5 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@
-### 1.4.4.16 Release Notes (2020-04-09)
+### 1.4.4.17 Release Notes (2020-04-09)
#### New features
diff --git a/R/SeriesAggreg2.R b/R/SeriesAggreg2.R
index 24f624ff..46e2e690 100644
--- a/R/SeriesAggreg2.R
+++ b/R/SeriesAggreg2.R
@@ -80,27 +80,27 @@ SeriesAggreg2 <- function(TabSeries, Format, ConvertFun,
TabSeries2$Selec2 <- format(TabSeries2$DatesR, Format)
if (nchar(Format) > 2 | Format == "%Y") {
- TabSeries2$sp <- !duplicated(TabSeries2$Selec2)
- if (all(TabSeries2$sp)) {
+ TabSeries2$Selec <- !duplicated(TabSeries2$Selec2)
+ if (all(TabSeries2$Selec)) {
warning("the requested time 'Format' is the same as the one in 'TabSeries'. No time-step conversion was performed")
return(TabSeries)
}
if (Format == "%Y") {
- sp <- sprintf("%02.f", YearFirstMonth)
+ yfm <- sprintf("%02.f", YearFirstMonth)
spF1 <- "%m"
spF2 <- "%Y-%m"
TabSeries2$Selec1 <- format(TabSeries2$DatesR, spF1)
TabSeries2$Selec2 <- format(TabSeries2$DatesR, spF2)
- TabSeries2$sp <- !duplicated(TabSeries2$Selec2) & TabSeries2$Selec1 == sp
+ TabSeries2$Selec <- !duplicated(TabSeries2$Selec2) & TabSeries2$Selec1 == yfm
}
- TabSeries2$Fac2 <- cumsum(TabSeries2$sp)
+ TabSeries2$Fac2 <- cumsum(TabSeries2$Selec)
} else {
if (Format == "%d") {
spF2 <- "%m-%d"
TabSeries2$Selec2 <- format(TabSeries2$DatesR, spF2)
}
TabSeries2$Fac2 <- TabSeries2$Selec2
- TabSeries2$sp <- !duplicated(TabSeries2$Selec2)
+ TabSeries2$Selec <- !duplicated(TabSeries2$Selec2)
}
if ("mean" %in% ConvertFun) {
@@ -117,8 +117,8 @@ SeriesAggreg2 <- function(TabSeries, Format, ConvertFun,
}
tsAggreg <- cbind(tsAggregMean[, -1, drop = FALSE], tsAggregSum)
- tsAggreg <- merge(tsAggreg, TabSeries2[, c("Fac2", "DatesR", "DatesRini", "sp")], by = "Fac2", all.x = TRUE, all.y = FALSE)
- tsAggreg <- tsAggreg[tsAggreg$sp & tsAggreg$DatesRini, ]
+ tsAggreg <- merge(tsAggreg, TabSeries2[, c("Fac2", "DatesR", "DatesRini", "Selec")], by = "Fac2", all.x = TRUE, all.y = FALSE)
+ tsAggreg <- tsAggreg[tsAggreg$Selec & tsAggreg$DatesRini, ]
tsAggreg <- tsAggreg[, colnames(TabSeries0)]
return(tsAggreg)
--
GitLab