fixed prop.part()

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

diff --git a/Changes b/Changes
index cfea531b4ca2f06db23fe32d276382022a4c896a..2fe5b8d492ef56e7adbaa934e1a44a729492b162 100644 (file)
--- a/Changes
+++ b/Changes
@@ -7,6 +7,12 @@ NEW FEATURES
       'pairwise.deletion'.
 
 
+BUG FIXES
+
+    o prop.part() failed with a single tree with the default option
+     'check.labels = TRUE'.
+
+
 
                CHANGES IN APE VERSION 2.2-1
 

diff --git a/R/dist.topo.R b/R/dist.topo.R
index 88110c59c8c7304444b06395cc4645eec33cabf9..b57fb0a591535817da88b108448da12f308faefd 100644 (file)
--- a/R/dist.topo.R
+++ b/R/dist.topo.R
@@ -1,4 +1,4 @@
-## dist.topo.R (2008-06-28)
+## dist.topo.R (2008-07-18)
 
 ##      Topological Distances, Tree Bipartitions,
 ##   Consensus Trees, and Bootstrapping Phylogenies
@@ -87,6 +87,7 @@ prop.part <- function(..., check.labels = TRUE)
     ## class(obj) <- NULL # needed?
     ## </FIXME>
     ntree <- length(obj)
+    if (ntree == 1) check.labels <- FALSE
     if (check.labels) obj <- .compressTipLabel(obj)
     for (i in 1:ntree) storage.mode(obj[[i]]$Nnode) <- "integer"
     ## <FIXME>