v1.1.2.1 UPDATE: ErrorCrit_KGE compatible with new InputsCrit objects

DESCRIPTION

 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.1.2.0
+Version: 1.1.2.1
 Date: 2018-10-22
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

R/ErrorCrit_KGE.R

@@ -6,6 +6,10 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
       stop("InputsCrit must be of class 'InputsCrit' \n")
       return(NULL)
     }
+    if (inherits(InputsCrit, "Multi") | inherits(InputsCrit, "Compo")) {
+      stop("InputsCrit must be of class 'Single' \n")
+      return(NULL)
+    }
     if (!inherits(OutputsModel, "OutputsModel")) {
       stop("OutputsModel must be of class 'OutputsModel' \n")
       return(NULL)
@@ -36,7 +40,7 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
     
     
     ##Data_preparation_______________________________
-    VarObs <- InputsCrit$Qobs
+    VarObs <- InputsCrit$obs
     VarObs[!InputsCrit$BoolCrit] <- NA
     VarSim <- OutputsModel$Qsim
     VarSim[!InputsCrit$BoolCrit] <- NA
@@ -198,6 +202,7 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
                         Multiplier      = Multiplier,
                         Ind_notcomputed = Ind_TS_ignore
     )
+    # class(OutputsCrit) <- c("ErrorCrit", "KGE")
     return(OutputsCrit)
     
   }