From 1cc5ddd2e981b18378ef049d24398b9abae67701 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Tue, 2 Apr 2019 08:43:14 +0200
Subject: [PATCH] v0.2.6.7 UPDATE: ShinyGR modified to avoid warnings due to
the update of airGR (obs, varObs and weights renamed in Obs, VarObs and
Weights into CreateInputsCrit)
---
DESCRIPTION | 2 +-
NEWS.Rmd | 2 +-
inst/ShinyGR/server.R | 16 ++++++++--------
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 5091b4e..9a8415e 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: airGRteaching
Type: Package
Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included)
-Version: 0.2.6.6
+Version: 0.2.6.7
Date: 2019-04-02
Authors@R: c(
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@irstea.fr"),
diff --git a/NEWS.Rmd b/NEWS.Rmd
index 03dd1af..dcb6344 100644
--- a/NEWS.Rmd
+++ b/NEWS.Rmd
@@ -13,7 +13,7 @@ output:
-### 0.2.6.6 Release Notes (2019-04-02)
+### 0.2.6.7 Release Notes (2019-04-02)
#### CRAN-compatibility updates
diff --git a/inst/ShinyGR/server.R b/inst/ShinyGR/server.R
index 5236ee3..dc65e5f 100644
--- a/inst/ShinyGR/server.R
+++ b/inst/ShinyGR/server.R
@@ -142,15 +142,15 @@ shinyServer(function(input, output, session) {
verbose = FALSE)
## Criteria computation
- CRIT_opt <- list(Crit = c(replicate(3, ErrorCrit_NSE), replicate(3, ErrorCrit_KGE)),
- Transfo = as.list(rep(c("", "sqrt", "inv"), times = 2)))
+ CRIT_opt <- list(Crit = c(rep("ErrorCrit_NSE", 3), rep("ErrorCrit_KGE", 3)),
+ Transfo = rep(c("", "sqrt", "inv"), times = 2))
InputsCritMulti <- CreateInputsCrit(FUN_CRIT = CRIT_opt$Crit,
InputsModel = getPrep()$PREP$InputsModel,
RunOptions = SIM$OptionsSimul,
- obs = replicate(n = 6, expr = SIM$Qobs, simplify = FALSE),
- varObs = as.list(rep("Q", times = 6)),
+ Obs = replicate(n = 6, expr = SIM$Qobs, simplify = FALSE),
+ VarObs = rep("Q", times = 6),
transfo = CRIT_opt$Transfo,
- weight = NULL)
+ Weights = NULL)
iCRIT <- ErrorCrit(InputsCrit = InputsCritMulti, OutputsModel = SIM$OutputsModel, verbose = FALSE)
CRIT <- do.call("rbind", lapply(iCRIT, function(i) data.frame(CritName = i$CritName, CritValue = i$CritValue)))
CRIT$CritName <- gsub("\\[", " [", CRIT$CritName)
@@ -240,10 +240,10 @@ shinyServer(function(input, output, session) {
InputsCritMultiold <- CreateInputsCrit(FUN_CRIT = CRIT_opt$Crit,
InputsModel = OBSold$InputsModel,
RunOptions = SIMold$OptionsSimul,
- obs = replicate(n = 6, expr = SIMold$Qobs, simplify = FALSE),
- varObs = as.list(rep("Q", times = 6)),
+ Obs = replicate(n = 6, expr = SIMold$Qobs, simplify = FALSE),
+ VarObs = rep("Q", times = 6),
transfo = CRIT_opt$Transfo,
- weight = NULL)
+ Weights = NULL)
iCRITold <- ErrorCrit(InputsCrit = InputsCritMultiold, OutputsModel = SIMold$OutputsModel, verbose = FALSE)
CRITold <- do.call("rbind", lapply(iCRITold, function(i) data.frame(CritName = i$CritName, CritValue = i$CritValue)))
CRITold$CritName <- gsub("\\[", " [", CRITold$CritName)
--
GitLab