deleted read.shared command and added its functionality to read.otu.

[mothur.git] / globaldata.cpp

diff --git a/globaldata.cpp b/globaldata.cpp
index b1ac4e87b986cee6380c997c6c40590b089067f7..3ddd02e5c24dc03cd8ff7549b6b03a32982562e9 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){
@@ -71,7 +27,7 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                reset();
                
                //clears out data from previous read
-               if ((commandName == "read.dist") || (commandName == "read.otu") || (commandName == "read.tree") || (commandName == "read.shared")) { 
+               if ((commandName == "read.dist") || (commandName == "read.otu") || (commandName == "read.tree")) { 
                        clear();
                        gGroupmap = NULL;
                        gTree.clear();