Merge pull request #82 from LunaSare/master

fix bug that was returning NA instead of data frame of congruified ages
phylotastic · May 31, 2023 · 4170b61 · 4170b61
2 parents 4cc7ce6 + ce6a37a
commit 4170b61
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: datelife
 Title: Scientific Data on Time of Lineage Divergence for Your Taxa
-Version: 0.6.7
+Version: 0.6.8
 Maintainer: Luna L. Sanchez Reyes <sanchez.reyes.luna@gmail.com>
 Authors@R: c(
   person("Brian", "O'Meara", email = "bomeara@gmail.com", role=c("aut")),

diff --git a/NEWS.md b/NEWS.md
@@ -3,6 +3,8 @@
 
 DONE:
 -->
+# datelife v0.6.8
+- fixed bug in function `extract_calibrations_phylo`
 
 # datelife v0.6.7
   - added vignette for bold data workflow

diff --git a/R/calibrations_extract.R b/R/calibrations_extract.R
@@ -92,7 +92,7 @@ extract_calibrations_phylo <- function(input = NULL,
     # 		Warning message:
     # In if (class(stock) == "phylo") { :
     # the condition has length > 1 and only the first element will be used
-    if (!inherits(local_df, "list")) {
+    if (!inherits(local_df, "data.frame")) {
       warning("Congruification failed")
       return(NA)
     }