added sequence name to error string in fastq.info. Changed np_shannon to npshannon.

[mothur.git] / deuniquetreecommand.cpp

diff --git a/deuniquetreecommand.cpp b/deuniquetreecommand.cpp
index f39a182ed863893c66f9b22a25c4c6765c04d165..64ea9b700d3e7193fb3502ae2bd5dd160cb26297 100644 (file)
--- a/deuniquetreecommand.cpp
+++ b/deuniquetreecommand.cpp
@@ -104,8 +104,8 @@ DeuniqueTreeCommand::DeuniqueTreeCommand(string option)  {
                        }
                        
                        m->runParse = true;
-                       m->Groups.clear();
-                       m->namesOfGroups.clear();
+                       m->clearGroups();
+                       m->clearAllGroups();
                        m->Treenames.clear();
                        m->names.clear();
                        
@@ -181,8 +181,8 @@ int DeuniqueTreeCommand::execute() {
                                
                                if (m->control_pressed) { 
                                        delete tmap; for (int i = 0; i < T.size(); i++) { delete T[i]; }
-                                       for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str()); } outputTypes.clear();
-                                       m->Groups.clear();
+                                       for (int i = 0; i < outputNames.size(); i++) {  m->mothurRemove(outputNames[i]); } outputTypes.clear();
+                                       m->clearGroups();
                                        return 0;
                                }