From: westcott Date: Thu, 6 Aug 2009 16:12:17 +0000 (+0000) Subject: This is 1.5. X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4c8e0f463a145681fab553c7d46f3de8570586b3;p=mothur.git This is 1.5. --- diff --git a/tree.cpp b/tree.cpp index 5331dba..ad80b2b 100644 --- a/tree.cpp +++ b/tree.cpp @@ -399,7 +399,7 @@ void Tree::randomTopology() { escape = 1; } } - + tree[i].setChildren(rnd_index1,rnd_index2); tree[i].setParent(-1); tree[rnd_index1].setParent(i); diff --git a/unifracunweightedcommand.cpp b/unifracunweightedcommand.cpp index 7f85121..54a4426 100644 --- a/unifracunweightedcommand.cpp +++ b/unifracunweightedcommand.cpp @@ -134,7 +134,7 @@ int UnifracUnweightedCommand::execute() { for (int j = 0; j < iters; j++) { //we need a different getValues because when we swap the labels we only want to swap those in each parwise comparison randomData = unweighted->getValues(T[i], "", ""); - + for(int k = 0; k < numComp; k++) { //add trees unweighted score to map of scores map::iterator it = rscoreFreq[k].find(randomData[k]);