added hcluster command and fixed some bugs, namely one with smart distancing.

[mothur.git] / heatmapcommand.cpp

diff --git a/heatmapcommand.cpp b/heatmapcommand.cpp
index 52395bb2a2613f24846e031f530519afbd2ed39c..1992ce593a7e65c2638f7d5ac0c5f39e4f50b5f9 100644 (file)
--- a/heatmapcommand.cpp
+++ b/heatmapcommand.cpp
@@ -163,6 +163,8 @@ int HeatMapCommand::execute(){
                                }
                                
                                if ((anyLabelsToProcess(lookup[0]->getLabel(), userLabels, "") == true) && (processedLabels.count(lastLabel) != 1)) {
+                                       string saveLabel = lookup[0]->getLabel();
+                               
                                        for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  }  
                                        lookup = input->getSharedRAbundVectors(lastLabel);
                                        mothurOut(lookup[0]->getLabel()); mothurOutEndLine();
@@ -171,6 +173,9 @@ int HeatMapCommand::execute(){
                                        
                                        processedLabels.insert(lookup[0]->getLabel());
                                        userLabels.erase(lookup[0]->getLabel());
+                                       
+                                       //restore real lastlabel to save below
+                                       lookup[0]->setLabel(saveLabel);
                                }
                                
                                lastLabel = lookup[0]->getLabel();
@@ -223,7 +228,8 @@ int HeatMapCommand::execute(){
                                }
                                
                                if ((anyLabelsToProcess(rabund->getLabel(), userLabels, "") == true) && (processedLabels.count(lastLabel) != 1)) {
-
+                                       string saveLabel = rabund->getLabel();
+                                       
                                        delete rabund;
                                        rabund = input->getRAbundVector(lastLabel);
                                        mothurOut(rabund->getLabel()); mothurOutEndLine();
@@ -232,6 +238,9 @@ int HeatMapCommand::execute(){
                                        
                                        processedLabels.insert(rabund->getLabel());
                                        userLabels.erase(rabund->getLabel());
+                                       
+                                       //restore real lastlabel to save below
+                                       rabund->setLabel(saveLabel);
                                }