fixing out labels to match those in shared file. If shared file does not have column...

[mothur.git] / otuassociationcommand.cpp

diff --git a/otuassociationcommand.cpp b/otuassociationcommand.cpp
index eeefb41ffa9781aacad02a594cd4d61859631cb0..0d41e63f3526bc9af4e3933d5f3337d62ebd0f2a 100644 (file)
--- a/otuassociationcommand.cpp
+++ b/otuassociationcommand.cpp
@@ -308,8 +308,7 @@ int OTUAssociationCommand::process(vector<SharedRAbundVector*>& lookup){
                                else if (method == "kendall")   {       coef = linear.calcKendall(xy[i], xy[k], sig);   }                   
                                else { m->mothurOut("[ERROR]: invalid method, choices are spearman, pearson or kendall."); m->mothurOutEndLine(); m->control_pressed = true; }
                        
-                               if (m->binLabelsInFile.size() != 0) { out << m->binLabelsInFile[i] << '\t' << m->binLabelsInFile[k] << '\t' << coef << '\t' << sig << endl; }
-                else { out << i+1 << '\t' << k+1 << '\t' << coef << '\t' << sig << endl; }
+                out << m->binLabelsInFile[i] << '\t' << m->binLabelsInFile[k] << '\t' << coef << '\t' << sig << endl;
                        }
                }
                
@@ -437,8 +436,7 @@ int OTUAssociationCommand::process(vector<SharedRAbundFloatVector*>& lookup){
                                else if (method == "kendall")   {       coef = linear.calcKendall(xy[i], xy[k], sig);   }                   
                                else { m->mothurOut("[ERROR]: invalid method, choices are spearman, pearson or kendall."); m->mothurOutEndLine(); m->control_pressed = true; }
                                
-                if (m->binLabelsInFile.size() != 0) { out << m->binLabelsInFile[i] << '\t' << m->binLabelsInFile[k] << '\t' << coef << '\t' << sig << endl; }
-                else { out << i+1 << '\t' << k+1 << '\t' << coef << '\t' << sig << endl; }
+                out << m->binLabelsInFile[i] << '\t' << m->binLabelsInFile[k] << '\t' << coef << '\t' << sig << endl; 
                        }
                }