Fixed CRAN error; bump to 1.4.1

magnusdv · Feb 25, 2022 · 36aebc5 · 36aebc5
1 parent 753d7f2
commit 36aebc5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: forrel
 Title: Forensic Pedigree Analysis and Relatedness Inference
-Version: 1.4.0
+Version: 1.4.1
 Authors@R: c(
     person("Magnus Dehli", "Vigeland", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-9134-4962")),

diff --git a/R/familias2ped.R b/R/familias2ped.R
@@ -59,12 +59,12 @@
 Familias2ped = function(familiasped, datamatrix, loci, matchLoci = FALSE) {
 
   ### If first argument is a list of FamiliasPedigrees, convert one at a time.
-  if (is.list(familiasped) && class(familiasped[[1]]) == "FamiliasPedigree") {
+  if (is.list(familiasped) && inherits(familiasped[[1]], "FamiliasPedigree")) {
       res = lapply(familiasped, function(p)
         Familias2ped(p, datamatrix = datamatrix, loci = loci, matchLoci = matchLoci))
       return(res)
   }
-  else if(class(familiasped) != "FamiliasPedigree")
+  else if(!inherits(familiasped, "FamiliasPedigree"))
     stop2("The first argument must be a `FamiliasPedigree` or a list of such")
 
 
@@ -157,7 +157,7 @@ Familias2ped = function(familiasped, datamatrix, loci, matchLoci = FALSE) {
 readFamiliasLoci = function(loci) {
   if (is.null(loci))
     return(NULL)
-  if (class(loci) == "FamiliasLocus")
+  if (inherits(loci, "FamiliasLocus"))
     loci = list(loci)
 
   lapply(loci, function(a) {