diff --git a/DESCRIPTION b/DESCRIPTION index 6f0c4bf5c119d13bc35c966cd66b638efaaea066..d44bc3fa547c4fc14d38a8f082c2c605a227d0f6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.6.3.21 -Date: 2020-10-16 +Version: 1.6.3.22 +Date: 2020-10-26 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"), diff --git a/NEWS.md b/NEWS.md index 685c81d8cc866fb0190c2d904a5f01f11fdaff79..4c1e636340520d6c789978106914fd0db8c38e0c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 1.6.3.21 Release Notes (2020-10-16) +### 1.6.3.22 Release Notes (2020-10-26) #### New features diff --git a/R/plot.OutputsModel.R b/R/plot.OutputsModel.R index 85d2418e740c4b762e2119dcd5ebcfefb9cfa10a..8a52f9d30e7913c60c21805a5917115edddc1a74 100644 --- a/R/plot.OutputsModel.R +++ b/R/plot.OutputsModel.R @@ -149,12 +149,12 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea = } if (BOOL_Dates) { - MyRollMean1 <- function(x, n) { - return(filter(x, rep(1 / n, n), sides = 2)) - } - MyRollMean2 <- function(x, n) { - return(filter(c(tail(x, n %/% 2), x, x[1:(n %/% 2)]), rep(1 / n, n), sides = 2)[(n %/% 2 + 1):(length(x) + n %/% 2)]) - } + # MyRollMean1 <- function(x, n) { + # return(filter(x, rep(1 / n, n), sides = 2)) + # } + # MyRollMean2 <- function(x, n) { + # return(filter(c(tail(x, n %/% 2), x, x[1:(n %/% 2)]), rep(1 / n, n), sides = 2)[(n %/% 2 + 1):(length(x) + n %/% 2)]) + # } MyRollMean3 <- function(x, n) { return(filter(x, filter = rep(1 / n, n), sides = 2, circular = TRUE)) }