X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=matrixoutputcommand.cpp;h=ccd4f538ab03f7ea86c59b2d3381d2de1a2de52f;hb=006601d68abe8d0061f77e8d28323b160750e343;hp=a886992a1120f36ff361e7f2a9b02921140bb731;hpb=ce8794490ab1d83adcdb2b92e0302a1e43e17adf;p=mothur.git diff --git a/matrixoutputcommand.cpp b/matrixoutputcommand.cpp index a886992..ccd4f53 100644 --- a/matrixoutputcommand.cpp +++ b/matrixoutputcommand.cpp @@ -199,7 +199,7 @@ MatrixOutputCommand::MatrixOutputCommand(string option) { else { subsample = false; } } - if (subsample == false) { iters = 1; } + if (subsample == false) { iters = 0; } if (abort == false) { @@ -675,6 +675,7 @@ int MatrixOutputCommand::process(vector thisLookup){ string distFileName = outputDir + m->getRootName(m->getSimpleName(sharedfile)) + matrixCalculators[i]->getName() + "." + thisLookup[0]->getLabel() + "." + output + "." + getOutputFileNameTag("phylip"); outputNames.push_back(distFileName); outputTypes["phylip"].push_back(distFileName); + ofstream outDist; m->openOutputFile(distFileName, outDist); outDist.setf(ios::fixed, ios::floatfield); outDist.setf(ios::showpoint); @@ -687,7 +688,7 @@ int MatrixOutputCommand::process(vector thisLookup){ for (int i = 0; i < calcDists.size(); i++) { calcDists[i].clear(); } } - if (iters != 1) { + if (iters != 0) { //we need to find the average distance and standard deviation for each groups distance vector< vector > calcAverages; calcAverages.resize(matrixCalculators.size());