ccode working - still need to paralellize

[mothur.git] / bootstrapsharedcommand.cpp

diff --git a/bootstrapsharedcommand.cpp b/bootstrapsharedcommand.cpp
index db1fa9e0dcfef20edc426e9053e4bac128e17f82..12c0b5e647fefccded7b826e23efb7d019e1b703 100644 (file)
--- a/bootstrapsharedcommand.cpp
+++ b/bootstrapsharedcommand.cpp
@@ -228,7 +228,7 @@ int BootSharedCommand::execute(){
                
                        if(allLines == 1 || lines.count(count) == 1 || labels.count(order->getLabel()) == 1){                   
                                
-                               mothurOut(order->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+                               mothurOut(order->getLabel()); mothurOutEndLine();
                                process(order);
                                
                                processedLabels.insert(order->getLabel());
@@ -241,7 +241,7 @@ int BootSharedCommand::execute(){
                                
                                delete order;
                                order = input->getSharedOrderVector(lastLabel);                                                                                                 
-                               mothurOut(order->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+                               mothurOut(order->getLabel()); mothurOutEndLine();
                                process(order);
 
                                processedLabels.insert(order->getLabel());
@@ -274,7 +274,7 @@ int BootSharedCommand::execute(){
                if (needToRun == true)  {
                                delete order;
                                order = input->getSharedOrderVector(lastLabel);                                                                                                 
-                               mothurOut(order->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+                               mothurOut(order->getLabel()); mothurOutEndLine();
                                process(order);
                                delete order;
 
@@ -447,8 +447,8 @@ void BootSharedCommand::process(SharedOrderVector* order) {
                                
                                mothurOut("\tDone."); mothurOutEndLine();
                                //delete globaldata's tree
-                               for (int m = 0; m < globaldata->gTree.size(); m++) {  delete globaldata->gTree[m];  }
-                               globaldata->clear();
+                               //for (int m = 0; m < globaldata->gTree.size(); m++) {  delete globaldata->gTree[m];  }
+                               //globaldata->gTree.clear();
                                
                                
                                //create consensus trees for each bootstrapped tree set
@@ -465,8 +465,8 @@ void BootSharedCommand::process(SharedOrderVector* order) {
                                        delete consensus;
                                        
                                        //delete globaldata's tree
-                                       for (int m = 0; m < globaldata->gTree.size(); m++) {  delete globaldata->gTree[m];  }
-                                       globaldata->clear();
+                                       //for (int m = 0; m < globaldata->gTree.size(); m++) {  delete globaldata->gTree[m];  }
+                                       //globaldata->gTree.clear();
                                        
                                }