Use methods::is instead of class() & comparison

asardaes · Sep 24, 2022 · 3768776 · 3768776
1 parent 3078a23
commit 3768776
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -105,6 +105,7 @@ importFrom(graphics,plot)
 importFrom(methods,S3Part)
 importFrom(methods,callNextMethod)
 importFrom(methods,initialize)
+importFrom(methods,is)
 importFrom(methods,new)
 importFrom(methods,setClass)
 importFrom(methods,setGeneric)

diff --git a/R/S4-Distmat.R b/R/S4-Distmat.R
@@ -6,6 +6,7 @@
 #'
 #' Reference class that is used internally for cross-distance matrices.
 #'
+#' @importFrom methods is
 #' @importFrom methods setRefClass
 #'
 #' @field distmat A distance matrix.
@@ -37,7 +38,7 @@ Distmat <- methods::setRefClass("Distmat",
                                                          trace = FALSE,
                                                          diff_lengths = different_lengths(series),
                                                          silent = FALSE)
-                                       if (class(control) != "PtCtrl")
+                                       if (!methods::is(control, "PtCtrl"))
                                            stop("Invalid control provided.") # nocov
                                    }
                                    # need another dist closure, otherwise it would be recursive

diff --git a/cran-comments.md b/cran-comments.md
@@ -9,7 +9,7 @@ Specify minimum Matrix version as suggested by their maintainers, and documentat
 * GitHub CI
   + Linux: devel and release
   + OSX: release
-  + Windows: release (x32 and x64)
+  + Windows: release
 
 ## R CMD check results
 * There were no ERRORs or WARNINGs