fixed memory issue with cluster command

[mothur.git] / globaldata.cpp

diff --git a/globaldata.cpp b/globaldata.cpp
index 015293d727e5e94c51f1ce2bbe5a7ff6c6a7aee9..60a106a17eb6ce31e75b51a088bb2261e1815361 100644 (file)
--- a/globaldata.cpp
+++ b/globaldata.cpp
@@ -16,50 +16,6 @@ GlobalData* GlobalData::getInstance() {
 }
 /*******************************************************/
 
-/******************************************************/
-
-ListVector* GlobalData::getListVector()                {       return gListVector;             }
-/*******************************************************/
-
-/******************************************************/
-void GlobalData::setListVector(ListVector* lv){
-       try {
-               if(gListVector != NULL){        delete gListVector;     }
-               gListVector = new ListVector(*lv);
-       }
-       catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the GlobalData class Function setListVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-       catch(...) {
-               cout << "An unknown error has occurred in the GlobalData class function setListVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-}
-/*******************************************************/
-
-/******************************************************/
-
-SparseMatrix* GlobalData::getSparseMatrix()    {       return gSparseMatrix;   }
-/*******************************************************/
-
-/******************************************************/
-void GlobalData::setSparseMatrix(SparseMatrix* sm){
-       try{
-               if(gSparseMatrix != NULL){      delete gSparseMatrix;   }
-               gSparseMatrix = new SparseMatrix(*sm);
-       }
-       catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the GlobalData class Function setSparseMatrix. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-       catch(...) {
-               cout << "An unknown error has occurred in the GlobalData class function setSparseMatrix. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-}
-/*******************************************************/
-
 /******************************************************/
 //This function parses through the option string of the command to remove its parameters
 void GlobalData::parseGlobalData(string commandString, string optionText){
@@ -185,6 +141,7 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                
                //set format for shared
                if ((listfile != "") && (groupfile != "")) { format = "shared"; }
+               if ((phylipfile != "") && (groupfile != "")) { format = "matrix"; }
                                
                //input defaults for calculators
                if (commandName == "collect.single") {