This is mothur v 1.2.0 - the April ~24, 2009 release

[mothur.git] / validcalculator.cpp

diff --git a/validcalculator.cpp b/validcalculator.cpp
index 7d3477f68c2c8eb71c5c42ab27b1aceb7eb81472..70299cb23dca8910e47c9fc8589e8f3d7543f18a 100644 (file)
--- a/validcalculator.cpp
+++ b/validcalculator.cpp
@@ -182,11 +182,13 @@ void ValidCalculators::initialSingle() {
                single["simpson"]           = "simpson";
                single["bergerparker"]  = "bergerparker";
                single["bootstrap"]     = "bootstrap";
-               single["geom"]          = "geom";
-               single["logsd"]         = "logsd";
+               single["geometric"]     = "geometric";
+               single["logseries"]         = "logseries";
                single["qstat"]         = "qstat";
                single["bstick"]        = "bstick";
                single["nseqs"]                 = "nseqs";
+               single["coverage"]              = "coverage";
+               
                single["default"]           = "default";
        }
        catch(exception& e) {
@@ -206,7 +208,7 @@ void ValidCalculators::initialShared() {
                shared["sharedchao"]                    = "sharedchao";
                shared["sharedace"]                             = "sharedace";
                shared["jabund"]                                = "jabund";
-               shared["sorensonabund"]                 = "sorensonabund";
+               shared["sorabund"]                      = "sorabund";
                shared["jclass"]                                = "jclass";
                shared["sorclass"]                              = "sorclass";
                shared["jest"]                                  = "jest";
@@ -214,7 +216,7 @@ void ValidCalculators::initialShared() {
                shared["thetayc"]                               = "thetayc";
                shared["thetan"]                                = "thetan";
                shared["kstest"]                                = "kstest";
-               shared["bdiversity"]                    = "bdiversity";
+               shared["whittaker"]                         = "whittaker";
                shared["sharednseqs"]                   = "sharednseqs";
                shared["ochiai"]                                = "ochiai";
                shared["anderberg"]                             = "anderberg";
@@ -247,6 +249,7 @@ void ValidCalculators::initialRarefaction() {
                rarefaction["simpson"]          = "simpson";
                rarefaction["bootstrap"]        = "bootstrap";
                rarefaction["nseqs"]            = "nseqs";
+               rarefaction["coverage"]         = "coverage";
                rarefaction["default"]      = "default";
        }
        catch(exception& e) {
@@ -271,12 +274,13 @@ void ValidCalculators::initialSummary() {
                summary["npshannon"]    = "npshannon";
                summary["simpson"]              = "simpson";
                summary["bergerparker"] = "bergerparker";
-               summary["geom"]         = "geom";
+               summary["geometric"]    = "geometric";
                summary["bootstrap"]    = "bootstrap";
-               summary["logsd"]        = "logsd";
+               summary["logseries"]    = "logseries";
                summary["qstat"]        = "qstat";
                summary["bstick"]       = "bstick";
                summary["nseqs"]                = "nseqs";
+               summary["coverage"]             = "coverage";
                summary["default"]          = "default";
        }
        catch(exception& e) {
@@ -296,7 +300,7 @@ void ValidCalculators::initialSharedSummary() {
                sharedsummary["sharedchao"]                             = "sharedchao";
                sharedsummary["sharedace"]                              = "sharedace";
                sharedsummary["jabund"]                                 = "jabund";
-               sharedsummary["sorensonabund"]                  = "sorensonabund";
+               sharedsummary["sorabund"]                       = "sorabund";
                sharedsummary["jclass"]                                 = "jclass";
                sharedsummary["sorclass"]                               = "sorclass";
                sharedsummary["jest"]                                   = "jest";
@@ -304,7 +308,7 @@ void ValidCalculators::initialSharedSummary() {
                sharedsummary["thetayc"]                                = "thetayc";
                sharedsummary["thetan"]                                 = "thetan";
                sharedsummary["kstest"]                                 = "kstest";
-               sharedsummary["bdiversity"]                             = "bdiversity";
+               sharedsummary["whittaker"]                              = "whittaker";
                sharedsummary["sharednseqs"]                    = "sharednseqs";
                sharedsummary["ochiai"]                                 = "ochiai";
                sharedsummary["anderberg"]                              = "anderberg";
@@ -386,7 +390,7 @@ void ValidCalculators::initialVennShared() {
 void ValidCalculators::initialTreeGroups() {
        try {   
                treegroup["jabund"]                                     = "jabund";
-               treegroup["sorensonabund"]                      = "sorensonabund";
+               treegroup["sorabund"]                   = "sorabund";
                treegroup["jclass"]                                     = "jclass";
                treegroup["sorclass"]                           = "sorclass";
                treegroup["jest"]                                       = "jest";
@@ -394,6 +398,7 @@ void ValidCalculators::initialTreeGroups() {
                treegroup["thetayc"]                            = "thetayc";
                treegroup["thetan"]                                     = "thetan";
                treegroup["morisitahorn"]                       = "morisitahorn";
+               treegroup["braycurtis"]                 = "braycurtis";
        }
        catch(exception& e) {
                cout << "Standard Error: " << e.what() << " has occurred in the ValidCalculator class Function initialTreeGroups. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
@@ -408,7 +413,7 @@ void ValidCalculators::initialTreeGroups() {
 void ValidCalculators::initialBoot() {
        try {   
                boot["jabund"]                          = "jabund";
-               boot["sorensonabund"]           = "sorensonabund";
+               boot["sorabund"]                = "sorabund";
                boot["jclass"]                          = "jclass";
                boot["sorclass"]                        = "orclass";
                boot["jest"]                            = "jest";
@@ -416,6 +421,7 @@ void ValidCalculators::initialBoot() {
                boot["thetayc"]                         = "thetayc";
                boot["thetan"]                          = "thetan";
                boot["morisitahorn"]            = "morisitahorn";
+               boot["braycurtis"]                      = "braycurtis";
        }
        catch(exception& e) {
                cout << "Standard Error: " << e.what() << " has occurred in the ValidCalculator class Function initialBoot. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";