bugs fixes while testing for 1.5 release

[mothur.git] / bootstrapsharedcommand.cpp

diff --git a/bootstrapsharedcommand.cpp b/bootstrapsharedcommand.cpp
index 1fa968f5930243f0efc4d6b0f0764a6892fd1203..a3717fe621057f9b8b9a88f09545c79438a2c032 100644 (file)
--- a/bootstrapsharedcommand.cpp
+++ b/bootstrapsharedcommand.cpp
@@ -440,33 +440,33 @@ void BootSharedCommand::process(SharedOrderVector* order) {
                                                //creates tree from similarity matrix and write out file
                                                createTree(out[i], tempTree);
                                                
-                                               //save trees for concensus command.
+                                               //save trees for consensus command.
                                                trees[i].push_back(tempTree);
                                        }
                                }
                                
                                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 concensus trees for each bootstrapped tree set
+                               //create consensus trees for each bootstrapped tree set
                                for (int k = 0; k < trees.size(); k++) {
                                        
-                                       mothurOut("Generating concensus tree for " + treeCalculators[k]->getName()); mothurOutEndLine();
+                                       mothurOut("Generating consensus tree for " + treeCalculators[k]->getName()); mothurOutEndLine();
                                        
                                        //set global data to calc trees
                                        globaldata->gTree = trees[k];
                                        
                                        string filename = getRootName(globaldata->inputFileName) + treeCalculators[k]->getName() + ".boot" + order->getLabel();
-                                       concensus = new ConcensusCommand(filename);
-                                       concensus->execute();
-                                       delete concensus;
+                                       consensus = new ConcensusCommand(filename);
+                                       consensus->execute();
+                                       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();
                                        
                                }