added ability to put # in front of any line in the batch file you don't want to use

[mothur.git] / globaldata.cpp

diff --git a/globaldata.cpp b/globaldata.cpp
index 1baf4edf1bf90ef469a9426de2e06f0a3ce137fc..4005f40d8cb32bc5f293c97f32386029be08c1f3 100644 (file)
--- a/globaldata.cpp
+++ b/globaldata.cpp
@@ -198,7 +198,7 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                //input defaults for calculators
                if (commandName == "collect.single") {
 
-                       if ((calc == "default") || (calc == "")) { calc = "sobs-chao-ace-jack-shannon-npshannon-simpson-efron-boneh-solow-shen"; }
+                       if ((calc == "default") || (calc == "")) { calc = "sobs-chao-ace-jack-shannon-npshannon-simpson"; }
                        Estimators.clear();
                        splitAtDash(calc, Estimators); 
                }
@@ -214,7 +214,7 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                        splitAtDash(calc, Estimators); 
                }
                if (commandName == "summary.single") {
-                       if ((calc == "default") || (calc == "")) { calc = "sobs-chao-ace-jack-shannon-npshannon-simpson-efron-boneh-solow-shen"; }
+                       if ((calc == "default") || (calc == "")) { calc = "sobs-chao-ace-jack-shannon-npshannon-simpson"; }
                        Estimators.clear();
                        splitAtDash(calc, Estimators); 
                }
@@ -241,7 +241,7 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                        Estimators.clear();
                        splitAtDash(calc, Estimators); 
                }
-               if ((commandName == "tree.shared") || (commandName == "bootstrap.shared")) {
+               if ((commandName == "tree.shared") || (commandName == "bootstrap.shared") || (commandName == "dist.shared")) {
                        if (calc != "") { 
                                Estimators.clear();
                                splitAtDash(calc, Estimators);