Merge remote-tracking branch 'origin/master'

[mothur.git] / matrixoutputcommand.cpp

diff --git a/matrixoutputcommand.cpp b/matrixoutputcommand.cpp
index 4b92c577fa3f5ef319fb8805eaef432e793c8d2e..ccd4f538ab03f7ea86c59b2d3381d2de1a2de52f 100644 (file)
--- 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) {
                        
@@ -467,7 +467,7 @@ void MatrixOutputCommand::printSims(ostream& out, vector< vector<double> >& simM
                                out << endl;
                        }
                }else{
-                       for (int b = 0; b < simMatrix.size(); m++)      {
+                       for (int b = 0; b < simMatrix.size(); b++)      {
                                out << lookup[b]->getGroup() << '\t';
                                for (int n = 0; n < simMatrix[b].size(); n++)   {
                                        out << simMatrix[b][n] << '\t'; 
@@ -675,6 +675,7 @@ int MatrixOutputCommand::process(vector<SharedRAbundVector*> 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<SharedRAbundVector*> 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<seqDist>  > calcAverages; calcAverages.resize(matrixCalculators.size());