From be0efdf261bda00f125f6d2c8b28c5c3a5a1696d Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Thu, 30 Apr 2020 18:55:07 +0200
Subject: [PATCH] v1.4.4.28 fix: SeriesAggreg2 now runs when there is only 1
variable in the input and ConvertFun = mean #41
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/SeriesAggreg2.R | 7 ++++---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index baffe254..532073eb 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.27
+Version: 1.4.4.28
Date: 2020-04-30
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 59b12c2a..1b94c97b 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@
-### 1.4.4.27 Release Notes (2020-04-30)
+### 1.4.4.28 Release Notes (2020-04-30)
#### New features
diff --git a/R/SeriesAggreg2.R b/R/SeriesAggreg2.R
index 80ea4610..2f7c4e92 100644
--- a/R/SeriesAggreg2.R
+++ b/R/SeriesAggreg2.R
@@ -141,13 +141,14 @@ SeriesAggreg2.data.frame <- function(TabSeries, Format, TimeFormat, NewTimeForma
tsAggregMean <- data.frame(a = NA, b = NA)
}
if ("sum" %in% ConvertFun) {
- colTsAggregSum <- c("Fac2", colnames(TabSeries)[-1L][ConvertFun == "sum" ])
- tsAggregSum <- aggregate(. ~ Fac2, data = TabSeries2[, colTsAggregSum ], FUN = sum, na.action = na.pass)
+ colTsAggregSum <- c("Fac2", colnames(TabSeries)[-1L][ConvertFun == "sum"])
+ tsAggregSum <- aggregate(. ~ Fac2, data = TabSeries2[, colTsAggregSum], FUN = sum, na.action = na.pass)
} else {
tsAggregSum <- data.frame(a = NA, b = NA)
}
- tsAggreg <- cbind(tsAggregMean[, -1, drop = FALSE], tsAggregSum)
+ tsAggreg <- cbind(tsAggregMean, tsAggregSum)
+ tsAggreg <- tsAggreg[, !duplicated(colnames(tsAggreg))]
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)]
--
GitLab