X-Git-Url: https://git.donarmstrong.com/?p=ape.git;a=blobdiff_plain;f=src%2Fmvrs.c;h=14b5fac267fed528b82d8fcd1a9d24c24f2ec4e4;hp=d2aa342135a68536e407bfdeb62b3446a6f849e4;hb=06e83c6878153f8e7999c0470263c40aad4db258;hpb=fab4946bb5d41cd408dffd4b66aae8a697690cfa diff --git a/src/mvrs.c b/src/mvrs.c index d2aa342..14b5fac 100644 --- a/src/mvrs.c +++ b/src/mvrs.c @@ -1,6 +1,6 @@ -/* mvrs.c 2011-10-11 */ +/* mvrs.c 2012-02-17 */ -/* Copyright 2011 Andrei-Alin Popescu */ +/* Copyright 2011-2012 Andrei-Alin Popescu */ /* This file is part of the R-package `ape'. */ /* See the file ../COPYING for licensing issues. */ @@ -129,7 +129,7 @@ void mvrs(double *D, double* v,int *N, int *edge1, int *edge2, double *edge_leng for (j = i + 1; j <= n; j++) { //Rprintf("S[%i]=%f, S[%i]=%f, D[%i,%i]=%f, B=%f",i,S[i],j,S[j],i,j,D[give_index(i,j,n)],B); A=S[i]+S[j]-B*D[give_index(i,j,n)]; - Rprintf("Q[%i,%i]=%f\n",i,j,A); + //Rprintf("Q[%i,%i]=%f\n",i,j,A); if (A > smallest_S) { OTU1 = i; OTU2 = j; @@ -392,6 +392,3 @@ void mvrs(double *D, double* v,int *N, int *edge1, int *edge2, double *edge_leng edge_length[*N*2 - 5] = (D[0] + D[2] - D[1])/2; edge_length[*N*2 - 6] = (D[2] + D[1] - D[0])/2; } - - -