Merge branch '45-replace-the-use-of-class-by-inherits-in-order-to-test-the-classes' into 'dev'

Resolve "Replace the use of 'class' by 'inherits' in order to test the classes of inputs"

Closes #45

See merge request !21

R/CalGR.R

@@ -5,14 +5,14 @@ CalGR <- function(PrepGR, CalCrit = c("NSE", "KGE", "KGE2", "RMSE"),
   CalCrit <- sprintf("ErrorCrit_%s", CalCrit)
   FUN_CRIT <- get(CalCrit)
 
-  if (! any(transfo %in% c("", "sqrt", "log", "inv", "sort"))) {
+  if (!any(transfo %in% c("", "sqrt", "log", "inv", "sort"))) {
     stop("Non convenient transformation \"transfo\"")
   } else {
     transfo <- transfo[1L]
   }
 
 
-  if (! any(class(PrepGR) %in% "PrepGR")) {
+  if (!inherits(PrepGR, "PrepGR")) {
     stop("Non convenient data for argument \"PrepGR\". Must be of class \"PrepGR\"")
   }
 

R/PrepGR.R

@@ -44,7 +44,7 @@ PrepGR <- function(ObsDF = NULL, DatesR = NULL, Precip = NULL, PotEvap = NULL, Q
                         TempMean = TempMean)
   }
 
-  if (! any(attributes(ObsDF$DatesR[1])$tzone %in%  "UTC")) {
+  if (!any(attributes(ObsDF$DatesR[1])$tzone %in%  "UTC")) {
     stop("Non convenient date format. Time zone must be defined as \"UTC\"")
   }
 

R/SimGR.R

@@ -5,14 +5,14 @@ SimGR <- function(PrepGR, CalGR = NULL, Param, EffCrit = c("NSE", "KGE", "KGE2",
   EffCrit <- sprintf("ErrorCrit_%s", EffCrit)
   FUN_CRIT <- get(EffCrit)
 
-  if (! any(transfo %in% c("", "sqrt", "log", "inv", "sort"))) {
+  if (!any(transfo %in% c("", "sqrt", "log", "inv", "sort"))) {
     stop("Non convenient transformation \"transfo\"")
   } else {
     transfo <- transfo[1L]
   }
 
 
-  if (! any(class(PrepGR) %in% "PrepGR")) {
+  if (!inherits(PrepGR, "PrepGR")) {
     stop("Non convenient data for argument \"PrepGR\". Must be of class \"PrepGR\"")
   }
 
@@ -23,7 +23,7 @@ SimGR <- function(PrepGR, CalGR = NULL, Param, EffCrit = c("NSE", "KGE", "KGE2",
   if (missing(Param)) {
     Param <- NULL
   }
-  if (! any(class(CalGR) %in% "CalGR") & !is.null(CalGR)) {
+  if (!inherits(CalGR, "CalGR") & !is.null(CalGR)) {
     stop("Non convenient data  for argument \"CalGR\". Must be of class \"CalGR\"")
   }
   if (is.null(CalGR) & is.null(Param)) {

R/Utils.R

@@ -81,7 +81,7 @@ if (getRversion() >= "2.15.1") {
   if (!is.list(x)) {
     x <- list(TypeModel = x)
   }
-  if (any(class(x) %in% c("PrepGR", "CalGR", "SimGR")) || names(x) %in% "TypeModel") {
+  if (inherits(x, c("PrepGR", "CalGR", "SimGR")) || names(x) %in% "TypeModel") {
     x <- x$TypeModel
   }
 

R/dyplot.CalGR.R

 dyplot.CalGR <- function(x, ...) {
 
-  if (! any(class(x) %in% "CalGR")) {
+  if (!inherits(x, "CalGR")) {
     stop("Non convenient data for x argument. Must be of class \"CalGR\"")
   }
 

R/dyplot.PrepGR.R

 dyplot.PrepGR <- function(x, ...) {
 
-  if (! any(class(x) %in% "PrepGR")) {
+  if (!inherits(x, "PrepGR")) {
     stop("Non convenient data for x argument. Must be of class \"PrepGR\"")
   }
 

R/dyplot.SimGR.R

 dyplot.SimGR <- function(x, ...) {
 
-  if (! any(class(x) %in% "SimGR")) {
+  if (!inherits(x, "SimGR")) {
     stop("Non convenient data for x argument. Must be of class \"SimGR\"")
   }
 

R/dyplot.default.R

@@ -7,7 +7,7 @@ dyplot.default <- function(x, Qsup = NULL, Qsup.name = "Qsup",
   # barChartPrecip <- scan(file = system.file("plugins/barChartPrecip.js", package = "airGRteaching"),
   #                        what = "character", quiet = TRUE)
 
-  if (! any(class(x) %in% c("PrepGR", "CalGR", "SimGR"))) {
+  if (!inherits(x, c("PrepGR", "CalGR", "SimGR"))) {
     stop("Non convenient data for x argument. Must be of class \"PrepGR\", \"CalGR\" or \"SimGR\"")
   }
 
@@ -34,7 +34,7 @@ dyplot.default <- function(x, Qsup = NULL, Qsup.name = "Qsup",
   }
 
 
-  if (any(class(x) %in% "PrepGR")) {
+  if (inherits(x, "PrepGR")) {
     data <- data.frame(DatesR = x$InputsModel$DatesR,
                        Precip = x$InputsModel$Precip,
                        Qobs   = x$Qobs,

R/plot.CalGR.R

 plot.CalGR <- function(x, xlab = NULL, ylab =  NULL, main = NULL, which = c("perf", "iter", "ts"), ...) {
 
-  if (! any(class(x) %in% "CalGR")) {
+  if (!inherits(x, "CalGR")) {
     stop("Non convenient data for x argument. Must be of class \"CalGR\"")
   }
-  if (! any(which %in% c("perf", "iter", "ts"))) {
+  if (!any(which %in% c("perf", "iter", "ts"))) {
     stop("Non convenient data for which argument. Must be of class \"perf\", \"iter\" or \"ts\"")
   }
 

R/plot.PrepGR.R

 plot.PrepGR <- function(x, type = "l", col.Precip = "royalblue", col.Q = "black", col.na = "grey",
                        xlab = NULL, ylab =  NULL, main = NULL, plot.na = TRUE, ...) {
 
-  if (! any(class(x) %in% "PrepGR")) {
+  if (!inherits(x, "PrepGR")) {
     stop("Non convenient data for x argument. Must be of class \"PrepGR\"")
   }
 

R/plot.SimGR.R

 plot.SimGR <- function(x, ...) {
 
-  if (! any(class(x) %in% "SimGR")) {
+  if (!inherits(x, "SimGR")) {
     stop("Non convenient data for x argument. Must be of class \"SimGR\"")
   }