final commit for ape 3.0-8

[ape.git] / R / ace.R

diff --git a/R/ace.R b/R/ace.R
index b751c697d63e116b24a972517b294715dbd4fb65..5227e1cae84ca37882e379954a2e37b418f0c02b 100644 (file)
--- a/R/ace.R
+++ b/R/ace.R
@@ -193,7 +193,11 @@ ace <-
         liks[cbind(TIPS, x)] <- 1
         phy <- reorder(phy, "pruningwise")
 
-        E <- if (use.expm) expm::expm else ape::matexpo
+        ## E <- if (use.expm) expm::expm else ape::matexpo
+        E <- if (use.expm) {
+            library(expm)
+            get("expm", "package:expm")
+        } else ape::matexpo
 
         Q <- matrix(0, nl, nl)
         dev <- function(p, output.liks = FALSE) {