X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=unifracweightedcommand.cpp;h=e698fffb58e435ddae9d3f496f5f19d33923c5c2;hp=cbec7490bfe028ea02de0b4a1e024b1ce2d89e1f;hb=a9dbc22713bfc056a797361dd757b1a5c98e1c01;hpb=e10c72304ee071c0c40e0218a06d89dc4731cbc2 diff --git a/unifracweightedcommand.cpp b/unifracweightedcommand.cpp index cbec749..e698fff 100644 --- a/unifracweightedcommand.cpp +++ b/unifracweightedcommand.cpp @@ -384,16 +384,20 @@ int UnifracWeightedCommand::execute() { //subsample loop vector< vector > calcDistsTotals; //each iter, each groupCombos dists. this will be used to make .dist files for (int thisIter = 0; thisIter < subsampleIters; thisIter++) { //subsampleIters=0, if subsample=f. - if (m->control_pressed) { break; } //copy to preserve old one - would do this in subsample but memory cleanup becomes messy. CountTable* newCt = new CountTable(); + int sampleTime = 0; + if (m->debug) { sampleTime = time(NULL); } + //uses method of setting groups to doNotIncludeMe SubSample sample; Tree* subSampleTree = sample.getSample(T[i], ct, newCt, subsampleSize); - + + if (m->debug) { m->mothurOut("[DEBUG]: iter " + toString(thisIter) + " took " + toString(time(NULL) - sampleTime) + " seconds to sample tree.\n"); } + //call new weighted function vector iterData; iterData.resize(numComp,0); Weighted thisWeighted(includeRoot);