X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=validcalculator.cpp;fp=validcalculator.cpp;h=bc8c4b8d7ab4b753cfa3f75a7c7da0b8ba740bc0;hb=10e9f1ff74515ff887519b08e50c30c47d2472d2;hp=0ade87338bb9c2b264f99200a3c7e09fac3fdd12;hpb=94ba64671398f3c9e591df90536833123de0fd34;p=mothur.git

diff --git a/validcalculator.cpp b/validcalculator.cpp
index 0ade873..bc8c4b8 100644
--- a/validcalculator.cpp
+++ b/validcalculator.cpp
@@ -209,11 +209,16 @@ void ValidCalculators::initialSingle() {
 		single["jack"]		    = "jack";
 		single["shannon"]	    = "shannon";
 		single["npshannon"]    	= "npshannon";
+		single["shannoneven"]	= "shannoneven";
+		single["smithwilson"]	= "smithwilson";
+		single["heip"]			= "heip";
 		single["simpson"]	    = "simpson";
+		single["simpsoneven"]   = "simpsoneven";
+		single["invsimpson"]	= "invsimpson";
 		single["bergerparker"]  = "bergerparker";
 		single["bootstrap"]    	= "bootstrap";
 		single["geometric"]     = "geometric";
-		single["logseries"]         = "logseries";
+		single["logseries"]		= "logseries";
 		single["qstat"]         = "qstat";
 		single["bstick"]        = "bstick";
 		single["goodscoverage"] = "goodscoverage";
@@ -271,8 +276,13 @@ void ValidCalculators::initialRarefaction() {
 		rarefaction["ace"]			= "ace";
 		rarefaction["jack"]			= "jack";
 		rarefaction["shannon"]		= "shannon";
+		rarefaction["smithwilson"]	= "smithwilson";
+		rarefaction["heip"]			= "heip";
 		rarefaction["npshannon"]	= "npshannon";
+		rarefaction["shannoneven"]	= "shannoneven";
 		rarefaction["simpson"]		= "simpson";
+		rarefaction["invsimpson"]	= "invsimpson";
+		rarefaction["simpsoneven"]	= "simpsoneven";
 		rarefaction["bootstrap"]	= "bootstrap";
 		rarefaction["nseqs"]		= "nseqs";
 		rarefaction["coverage"]		= "coverage";
@@ -293,8 +303,13 @@ void ValidCalculators::initialSummary() {
 		summary["ace"]			= "ace";
 		summary["jack"]			= "jack";
 		summary["shannon"]		= "shannon";
+		summary["heip"]			= "heip";
+		summary["shannoneven"]	= "shannoneven";
+		summary["smithwilson"]	= "smithwilson";
+		summary["invsimpson"]	= "invsimpson";
 		summary["npshannon"]	= "npshannon";
 		summary["simpson"]		= "simpson";
+		summary["simpsoneven"]	= "simpsoneven";
 		summary["bergerparker"] = "bergerparker";
 		summary["geometric"]    = "geometric";
 		summary["bootstrap"]	= "bootstrap";