correcting a bug in write.tree + error in MPR examples

git-svn-id: https://svn.mpl.ird.fr/ape/dev/ape@131 6e262413-ae40-0410-9e79-b911bd7a66b7

diff --git a/R/write.tree.R b/R/write.tree.R
index 934cda663f5686318f232c371cf81e22de99e219..20e74ad9237cce9705e72c687f5c5da0a7ca2d81 100644 (file)
--- a/R/write.tree.R
+++ b/R/write.tree.R
@@ -68,7 +68,7 @@ write.tree <-
             if (j != desc[length(desc)]) cp(",")
         }
         cp(")")
-        if (nodelab) cp(phy$node.label[ind[i] - n])
+        if (nodelab && ind[i] > n) cp(phy$node.label[ind[i] - n])
         if (brl) {
             cp(":")
             cp(sprintf(f.d, phy$edge.length[ind[i]]))

diff --git a/man/MPR.Rd b/man/MPR.Rd
index 98b5a0ceb188af809ca8b48966effba0faa1f78f..cf4e69a7bcce246fd5bc937f13ea89e20d0f9edf 100644 (file)
--- a/man/MPR.Rd
+++ b/man/MPR.Rd
@@ -60,7 +60,7 @@ names(x) <- letters[6:12]
 (o <- MPR(x, tr, "f"))
 plot(tr)
 nodelabels(paste("[", o[, 1], ",", o[, 2], "]", sep = ""))
-tiplabels(rev(x), adj = -2)
+tiplabels(x[tr$tip.label], adj = -2)
 ## some random data:
 x <- rpois(30, 1)
 tr <- rtree(30, rooted = FALSE)