X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Freorder_phylo.c;h=c54ea52ee9103d28eef2ca301903503dca327e04;hb=99df51c79eb9c42eaffff0694b3b07e42282217f;hp=2ab6f5b2f97963bc3ec7b4ef811156281818ded0;hpb=c827059eeafc8cbe41c812b26979543ab287803e;p=ape.git diff --git a/src/reorder_phylo.c b/src/reorder_phylo.c index 2ab6f5b..c54ea52 100644 --- a/src/reorder_phylo.c +++ b/src/reorder_phylo.c @@ -1,6 +1,6 @@ -/* reorder_phylo.c 2006-10-11 */ +/* reorder_phylo.c 2008-03-17 */ -/* Copyright 2006 Emmanuel Paradis */ +/* Copyright 2008 Emmanuel Paradis */ /* This file is part of the R-package `ape'. */ /* See the file ../COPYING for licensing issues. */ @@ -22,10 +22,9 @@ void neworder_cladewise(int *n, int *edge1, int *edge2, done = (int*)R_alloc(*N, sizeof(int)); node_back = (int*)R_alloc(*N + 2 - *n, sizeof(int)); - for (i = 0; i < *N; i++) done[i] = 0; + memset(done, 0, *N * sizeof(int)); - j = 0; - k = 0; + j = k = 0; node = *n + 1; while (j < *N) { for (i = 0; i < *N; i++) { @@ -71,7 +70,7 @@ void neworder_pruningwise(int *ntip, int *nnode, int *edge1, /* use `nextI' temporarily because need an address for R_tabulate */ nextI = *ntip + *nnode; Ndegr = (int*)R_alloc(nextI, sizeof(int)); - for (i = 0; i < nextI; i++) Ndegr[i] = 0; + memset(Ndegr, 0, nextI*sizeof(int)); R_tabulate(edge1, nedge, &nextI, Ndegr); /* `ready' indicates whether an edge is ready to be */