X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=R%2FrTrait.R;h=12dc5bfa9d7713bfba2c629b4127f0e5946f17c1;hb=e9f75370481c37eb9d3d811ce7494f818b423136;hp=6731c5cf94526939a767158e9d2f5cebf3bf0174;hpb=4ef7ac2c31da7b7c70a31f1f95a1182d22c3a71a;p=ape.git diff --git a/R/rTrait.R b/R/rTrait.R index 6731c5c..12dc5bf 100644 --- a/R/rTrait.R +++ b/R/rTrait.R @@ -1,4 +1,4 @@ -## rTrait.R (2011-06-16) +## rTrait.R (2011-06-15) ## Trait Evolution @@ -82,7 +82,7 @@ rTraitDisc <- rTraitCont <- function(phy, model = "BM", sigma = 0.1, alpha = 1, theta = 0, - ancestor = FALSE, root.value = 0, linear = TRUE, ...) + ancestor = FALSE, root.value = 0, ...) { if (is.null(phy$edge.length)) stop("tree has no branch length") @@ -115,7 +115,6 @@ rTraitCont <- if (length(theta) == 1) theta <- rep(theta, N) else if (length(theta) != N) stop("'theta' must have one or Nedge(phy) elements") - if (!linear) model <- model + 1L } .C("rTraitCont", as.integer(model), as.integer(N), as.integer(anc - 1L), as.integer(des - 1L), el,