removing extra file output from pintail

[mothur.git] / heatmapcommand.cpp

diff --git a/heatmapcommand.cpp b/heatmapcommand.cpp
index e21b14dce5afaf3744b1338416b1af3630a6830c..e2fdc645a83dfd72574bc8f14a61db30b74b4e45 100644 (file)
--- a/heatmapcommand.cpp
+++ b/heatmapcommand.cpp
@@ -168,7 +168,7 @@ int HeatMapCommand::execute(){
                
                                if(allLines == 1 || lines.count(count) == 1 || labels.count(lookup[0]->getLabel()) == 1){                       
        
-                                       mothurOut(lookup[0]->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+                                       mothurOut(lookup[0]->getLabel()); mothurOutEndLine();
                                        heatmap->getPic(lookup);
                                        
                                        processedLabels.insert(lookup[0]->getLabel());
@@ -179,7 +179,7 @@ int HeatMapCommand::execute(){
                                if ((anyLabelsToProcess(lookup[0]->getLabel(), userLabels, "") == true) && (processedLabels.count(lastLabel) != 1)) {
                                        for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  }  
                                        lookup = input->getSharedRAbundVectors(lastLabel);
-                                       mothurOut(lookup[0]->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+                                       mothurOut(lookup[0]->getLabel()); mothurOutEndLine();
                                        
                                        heatmap->getPic(lookup);
                                        
@@ -211,10 +211,10 @@ int HeatMapCommand::execute(){
                
                        //run last line if you need to
                        if (needToRun == true)  {
-                               for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  }  
+                               for (int i = 0; i < lookup.size(); i++) { if (lookup[i] != NULL) { delete lookup[i]; } }  
                                lookup = input->getSharedRAbundVectors(lastLabel);
                                
-                               mothurOut(lookup[0]->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+                               mothurOut(lookup[0]->getLabel()); mothurOutEndLine();
                                heatmap->getPic(lookup);
                                for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  }
                        }
@@ -230,7 +230,7 @@ int HeatMapCommand::execute(){
 
                                if(allLines == 1 || lines.count(count) == 1 || labels.count(rabund->getLabel()) == 1){                  
        
-                                       mothurOut(rabund->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+                                       mothurOut(rabund->getLabel()); mothurOutEndLine();
                                        heatmap->getPic(rabund);
                                        
                                        processedLabels.insert(rabund->getLabel());
@@ -242,7 +242,7 @@ int HeatMapCommand::execute(){
 
                                        delete rabund;
                                        rabund = input->getRAbundVector(lastLabel);
-                                       mothurOut(rabund->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+                                       mothurOut(rabund->getLabel()); mothurOutEndLine();
                                        
                                        heatmap->getPic(rabund);
                                        
@@ -274,9 +274,9 @@ int HeatMapCommand::execute(){
                        //run last line if you need to
                        if (needToRun == true)  {
                
-                               delete rabund;
+                               if (rabund != NULL) {   delete rabund;  }
                                rabund = input->getRAbundVector(lastLabel);
-                               mothurOut(rabund->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+                               mothurOut(rabund->getLabel()); mothurOutEndLine();
                                        
                                heatmap->getPic(rabund);
                                delete rabund; globaldata->rabund = NULL;