From 2e2e5384693c4934d4a96b3b9e1aaa5510fb9c3f Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Mon, 4 May 2020 14:36:45 +0200
Subject: [PATCH] v1.4.8.5 fix: the fake zzz variable is now removed from th
right object in SerriesAggreg2.default #41
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/SeriesAggreg2.default.R | 6 ++++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 5d7afda9..5fe7580b 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.8.4
+Version: 1.4.8.5
Date: 2020-05-04
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 32b79c5a..03fe8048 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,7 +4,7 @@
-### 1.4.8.4 Release Notes (2020-05-04)
+### 1.4.8.5 Release Notes (2020-05-04)
#### New features
diff --git a/R/SeriesAggreg2.default.R b/R/SeriesAggreg2.default.R
index fb2c61ef..a68bbc5f 100644
--- a/R/SeriesAggreg2.default.R
+++ b/R/SeriesAggreg2.default.R
@@ -49,6 +49,7 @@ SeriesAggreg2.default <- function(TabSeries,
})
}
+
TabSeries2 <- TabSeries[1:which(names(TabSeries) %in% lastCol)]
TabSeries2 <- as.data.frame.list(TabSeries2)
NewTabSeries <- SeriesAggreg2(TabSeries = TabSeries2,
@@ -57,7 +58,7 @@ SeriesAggreg2.default <- function(TabSeries,
ConvertFun = .AggregConvertFun(colnames(TabSeries2)[-1L]),
YearFirstMonth = YearFirstMonth, TimeLag = TimeLag,
verbose = verbose)
- TabSeries$zzz <- NULL
+ NewTabSeries$zzz <- NULL
if (simplify) {
@@ -66,6 +67,7 @@ SeriesAggreg2.default <- function(TabSeries,
} else {
+ res <- list()
ClassFormat <- switch(substr(Format, start = nchar(Format), stop = nchar(Format)),
h = "hourly",
d = "daily",
@@ -79,7 +81,7 @@ SeriesAggreg2.default <- function(TabSeries,
if (inherits(TabSeries, "CemaNeige")) {
res$CemaNeigeLayers <- CemaNeigeLayersAggreg
}
-
+
class(res) <- gsub("hourly|daily|monthly|yearly", ClassFormat, class(TabSeries))
return(res)
--
GitLab