fixed xp user bug with rarefact commands and cluster error checking

[mothur.git] / globaldata.cpp

diff --git a/globaldata.cpp b/globaldata.cpp
index 714b5ad2e447a579872f9f5b8d8c7886303a8391..ce10ee1bca9ea35dca648c97a49e1657a11509ee 100644 (file)
--- a/globaldata.cpp
+++ b/globaldata.cpp
@@ -173,7 +173,7 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                        splitAtDash(calc, Estimators); 
                }
                if (commandName == "collect.shared") {
-                       if ((calc == "default") || (calc == "")) { calc = "sharedsobs-sharedchao-sharedace-jabund-sorensonabund-jclass-sorclass-jest-sorest-thetayc-thetan"; }
+                       if ((calc == "default") || (calc == "")) { calc = "sharedsobs-sharedchao-sharedace-jabund-sorabund-jclass-sorclass-jest-sorest-thetayc-thetan"; }
                        Estimators.clear();
                        splitAtDash(calc, Estimators); 
                }
@@ -183,7 +183,7 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                        splitAtDash(calc, Estimators); 
                }
                if (commandName == "summary.shared") {
-                       if ((calc == "default") || (calc == "")) { calc = "sharedsobs-sharedchao-sharedace-jabund-sorensonabund-jclass-sorclass-jest-sorest-thetayc-thetan"; }
+                       if ((calc == "default") || (calc == "")) { calc = "sharedsobs-sharedchao-sharedace-jabund-sorabund-jclass-sorclass-jest-sorest-thetayc-thetan"; }
                        Estimators.clear();
                        splitAtDash(calc, Estimators); 
                }
@@ -272,6 +272,8 @@ GlobalData::GlobalData() {
        //option definitions should go here...
        helpRequest = "";
        clear();
+       gListVector == NULL;            
+       gSparseMatrix == NULL;  
 }
 /*******************************************************/