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)

DESCRIPTION

 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"),

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

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)