Commit 2e2e5384 authored by Delaigue Olivier's avatar Delaigue Olivier Committed by Dorchies David
Browse files

v1.4.8.5 fix: the fake zzz variable is now removed from th right object in...

v1.4.8.5 fix: the fake zzz variable is now removed from th right object in SerriesAggreg2.default #41
parent b09bcd3d
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")),
......
......@@ -4,7 +4,7 @@
### 1.4.8.4 Release Notes (2020-05-04)
### 1.4.8.5 Release Notes (2020-05-04)
#### New features
......
......@@ -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)
......
Markdown is supported
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