Use inherits() for class checking

This commit is contained in:
Elias Projahn 2021-12-13 09:50:45 +01:00
parent 207fc753a7
commit d98c70a205
4 changed files with 6 additions and 6 deletions

View file

@ -15,7 +15,7 @@
#' #'
#' @export #' @export
analyze <- function(preset, progress = NULL) { analyze <- function(preset, progress = NULL) {
if (class(preset) != "geposan_preset") { if (!inherits(preset, "geposan_preset")) {
stop("Preset is invalid. Use geposan::preset() to create one.") stop("Preset is invalid. Use geposan::preset() to create one.")
} }

View file

@ -18,7 +18,7 @@
#' #'
#' @export #' @export
compare <- function(ranking, comparison_gene_ids) { compare <- function(ranking, comparison_gene_ids) {
if (!"geposan_ranking" %chin% class(ranking)) { if (!inherits(ranking, "geposan_ranking")) {
stop("Invalid ranking. Use geposan::ranking().") stop("Invalid ranking. Use geposan::ranking().")
} }

View file

@ -13,9 +13,9 @@
#' #'
#' @export #' @export
ranking <- function(analysis, weights) { ranking <- function(analysis, weights) {
if ("geposan_analysis" %chin% class(analysis)) { if (inherits(analysis, "geposan_analysis")) {
ranking <- copy(analysis$ranking) ranking <- copy(analysis$ranking)
} else if ("geposan_results" %chin% class(analysis)) { } else if (inherits(analysis, "geposan_results")) {
ranking <- copy(analysis) ranking <- copy(analysis)
} else { } else {
stop("Invalid analyis. Use geposan::analyze().") stop("Invalid analyis. Use geposan::analyze().")
@ -60,7 +60,7 @@ ranking <- function(analysis, weights) {
#' @export #' @export
optimal_weights <- function(analysis, methods, reference_gene_ids, optimal_weights <- function(analysis, methods, reference_gene_ids,
target = "mean") { target = "mean") {
if (!any(c("geposan_analysis", "geposan_results") %chin% class(analysis))) { if (!inherits(analysis, c("geposan_analysis", "geposan_results"))) {
stop("Invalid analyis. Use geposan::analyze().") stop("Invalid analyis. Use geposan::analyze().")
} }

View file

@ -12,7 +12,7 @@
#' #'
#' @export #' @export
validate <- function(analysis, progress = NULL) { validate <- function(analysis, progress = NULL) {
if (class(analysis) != "geposan_analysis") { if (inherits(analysis, "geposan_analysis")) {
stop("Analysis is invalid. Use geposan::analyze().") stop("Analysis is invalid. Use geposan::analyze().")
} }