X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fbipartition.c;h=d29d554a58386c0ec0d0911b91540d208b99c5c1;hb=1df144a18356d9b329324324bc2f78cfdf1cea3d;hp=884fc6c35100f1619c3017997343eef82524b24c;hpb=a02ce8c6e9fd80d3d7a749cc24699366fb8e54b6;p=ape.git diff --git a/src/bipartition.c b/src/bipartition.c index 884fc6c..d29d554 100644 --- a/src/bipartition.c +++ b/src/bipartition.c @@ -1,6 +1,6 @@ -/* bipartition.c 2011-10-22 */ +/* bipartition.c 2012-03-26 */ -/* Copyright 2005-2011 Emmanuel Paradis, and 2007 R Development Core Team */ +/* Copyright 2005-2012 Emmanuel Paradis, and 2007 R Development Core Team */ /* This file is part of the R-package `ape'. */ /* See the file ../COPYING for licensing issues. */ @@ -160,8 +160,8 @@ SEXP prop_part(SEXP TREES, SEXP nbtree, SEXP keep_partitions) INTEGER(nbtip)[0] = Ntip; INTEGER(nbnode)[0] = Nnode; - if (KeepPartition) Npart = Ntree*(Nnode - 1) + 1; - else Npart = Nnode; + if (KeepPartition) Npart = Ntree * (Ntip - 2) + 1; + else Npart = Ntip - 1; PROTECT(number = allocVector(INTSXP, Npart)); no = INTEGER(number); /* copy the pointer */