X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=R%2Fcompar.ou.R;h=ada36d72cc0ffed14934ae9677666ae12ddd2c75;hb=3ad385892d75db5c646c92f0f631ae9c5e3da4f6;hp=6512e63d24042e8ab728414c5a1123c9115a4481;hpb=507aa18c4e3f9312efcb07b90766df1158a39402;p=ape.git

diff --git a/R/compar.ou.R b/R/compar.ou.R
index 6512e63..ada36d7 100644
--- a/R/compar.ou.R
+++ b/R/compar.ou.R
@@ -40,7 +40,9 @@ compar.ou <- function(x, phy, node = NULL, alpha = NULL)
     }
     W <- cophenetic.phylo(phy)
     dev <- function(p) {
-        M <- rowSums(exp(-p[1] * Wstart) - exp(-p[1] * Wend) * p[-(1:2)])
+        ##M <- rowSums(exp(-p[1] * Wstart) - exp(-p[1] * Wend) * p[-(1:2)])
+        ##M <- -rowSums(exp(-p[1] * Wstart) - exp(-p[1] * Wend) * p[-(1:2)])
+        M <- rowSums((exp(-p[1] * Wend) - exp(-p[1] * Wstart)) * p[-(1:2)])
         V <- exp(-p[1]*W) * (1 - exp(-2*p[1]*(Tmax - W/2)))
         nb.tip*log(2*pi*p[2]) + log(det(V)) +
           (t(x - M) %*% chol2inv(V) %*% (x - M)) / p[2]