Commit 1cc5ddd2 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v0.2.6.7 UPDATE: ShinyGR modified to avoid warnings due to the update of airGR...

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)
parent 98824fd9
No related merge requests found
Showing with 10 additions and 10 deletions
+10 -10
Package: airGRteaching Package: airGRteaching
Type: Package Type: Package
Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included) 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 Date: 2019-04-02
Authors@R: c( Authors@R: c(
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@irstea.fr"), person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@irstea.fr"),
......
...@@ -13,7 +13,7 @@ output: ...@@ -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 #### CRAN-compatibility updates
......
...@@ -142,15 +142,15 @@ shinyServer(function(input, output, session) { ...@@ -142,15 +142,15 @@ shinyServer(function(input, output, session) {
verbose = FALSE) verbose = FALSE)
## Criteria computation ## Criteria computation
CRIT_opt <- list(Crit = c(replicate(3, ErrorCrit_NSE), replicate(3, ErrorCrit_KGE)), CRIT_opt <- list(Crit = c(rep("ErrorCrit_NSE", 3), rep("ErrorCrit_KGE", 3)),
Transfo = as.list(rep(c("", "sqrt", "inv"), times = 2))) Transfo = rep(c("", "sqrt", "inv"), times = 2))
InputsCritMulti <- CreateInputsCrit(FUN_CRIT = CRIT_opt$Crit, InputsCritMulti <- CreateInputsCrit(FUN_CRIT = CRIT_opt$Crit,
InputsModel = getPrep()$PREP$InputsModel, InputsModel = getPrep()$PREP$InputsModel,
RunOptions = SIM$OptionsSimul, RunOptions = SIM$OptionsSimul,
obs = replicate(n = 6, expr = SIM$Qobs, simplify = FALSE), Obs = replicate(n = 6, expr = SIM$Qobs, simplify = FALSE),
varObs = as.list(rep("Q", times = 6)), VarObs = rep("Q", times = 6),
transfo = CRIT_opt$Transfo, transfo = CRIT_opt$Transfo,
weight = NULL) Weights = NULL)
iCRIT <- ErrorCrit(InputsCrit = InputsCritMulti, OutputsModel = SIM$OutputsModel, verbose = FALSE) 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 <- do.call("rbind", lapply(iCRIT, function(i) data.frame(CritName = i$CritName, CritValue = i$CritValue)))
CRIT$CritName <- gsub("\\[", " [", CRIT$CritName) CRIT$CritName <- gsub("\\[", " [", CRIT$CritName)
...@@ -240,10 +240,10 @@ shinyServer(function(input, output, session) { ...@@ -240,10 +240,10 @@ shinyServer(function(input, output, session) {
InputsCritMultiold <- CreateInputsCrit(FUN_CRIT = CRIT_opt$Crit, InputsCritMultiold <- CreateInputsCrit(FUN_CRIT = CRIT_opt$Crit,
InputsModel = OBSold$InputsModel, InputsModel = OBSold$InputsModel,
RunOptions = SIMold$OptionsSimul, RunOptions = SIMold$OptionsSimul,
obs = replicate(n = 6, expr = SIMold$Qobs, simplify = FALSE), Obs = replicate(n = 6, expr = SIMold$Qobs, simplify = FALSE),
varObs = as.list(rep("Q", times = 6)), VarObs = rep("Q", times = 6),
transfo = CRIT_opt$Transfo, transfo = CRIT_opt$Transfo,
weight = NULL) Weights = NULL)
iCRITold <- ErrorCrit(InputsCrit = InputsCritMultiold, OutputsModel = SIMold$OutputsModel, verbose = FALSE) 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 <- do.call("rbind", lapply(iCRITold, function(i) data.frame(CritName = i$CritName, CritValue = i$CritValue)))
CRITold$CritName <- gsub("\\[", " [", CRITold$CritName) CRITold$CritName <- gsub("\\[", " [", CRITold$CritName)
......
Supports Markdown
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