X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=validcalculator.cpp;h=6242d5aaf5c7e49eb54a75b26a0eb48425302123;hb=e6c4a7223199d800d496356604eb34dfe273673d;hp=0ade87338bb9c2b264f99200a3c7e09fac3fdd12;hpb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;p=mothur.git

diff --git a/validcalculator.cpp b/validcalculator.cpp
index 0ade873..6242d5a 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";
@@ -255,6 +260,24 @@ void ValidCalculators::initialShared() {
 		shared["lennon"]				= "lennon";
 		shared["morisitahorn"]			= "morisitahorn";
 		shared["braycurtis"]			= "braycurtis";
+		shared["odum"]					= "odum";
+		shared["canberra"]				= "canberra";
+		shared["structeuclidean"]		= "structeuclidean";
+		shared["structchord"]			= "structchord";
+		shared["hellinger"]				= "hellinger";
+		shared["manhattan"]				= "manhattan";
+		shared["structpearson"]			= "structpearson";
+		shared["soergel"]				= "soergel";
+		shared["spearman"]				= "spearman";
+		shared["structkulczynski"]		= "structkulczynski";
+		shared["structchi2"]			= "structchi2";
+		shared["speciesprofile"]		= "speciesprofile";
+		shared["hamming"]				= "hamming";
+		shared["gower"]					= "gower";
+		shared["memchi2"]				= "memchi2";
+		shared["memchord"]				= "memchord";
+		shared["memeuclidean"]			= "memeuclidean";
+		shared["mempearson"]			= "mempearson";
 		shared["default"]	            = "default";
 	}
 	catch(exception& e) {
@@ -271,8 +294,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 +321,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";
@@ -323,7 +356,7 @@ void ValidCalculators::initialSharedSummary() {
 		sharedsummary["sharedchao"]				= "sharedchao";
 		sharedsummary["sharedace"]				= "sharedace";
 		sharedsummary["jabund"]					= "jabund";
-		sharedsummary["sorabund"]			= "sorabund";
+		sharedsummary["sorabund"]				= "sorabund";
 		sharedsummary["jclass"]					= "jclass";
 		sharedsummary["sorclass"]				= "sorclass";
 		sharedsummary["jest"]					= "jest";
@@ -340,6 +373,24 @@ void ValidCalculators::initialSharedSummary() {
 		sharedsummary["lennon"]					= "lennon";
 		sharedsummary["morisitahorn"]			= "morisitahorn";
 		sharedsummary["braycurtis"]				= "braycurtis";
+		sharedsummary["odum"]					= "odum";
+		sharedsummary["canberra"]				= "canberra";
+		sharedsummary["structeuclidean"]		= "structeuclidean";
+		sharedsummary["structchord"]			= "structchord";
+		sharedsummary["hellinger"]				= "hellinger";
+		sharedsummary["manhattan"]				= "manhattan";
+		sharedsummary["structpearson"]			= "structpearson";
+		sharedsummary["structkulczynski"]		= "structkulczynski";
+		sharedsummary["structchi2"]				= "structchi2";
+		sharedsummary["soergel"]				= "soergel";
+		sharedsummary["spearman"]				= "spearman";
+		sharedsummary["speciesprofile"]			= "speciesprofile";
+		sharedsummary["hamming"]				= "hamming";
+		sharedsummary["gower"]					= "gower";
+		sharedsummary["memchi2"]				= "memchi2";
+		sharedsummary["memchord"]				= "memchord";
+		sharedsummary["memeuclidean"]			= "memeuclidean";
+		sharedsummary["mempearson"]				= "mempearson";
 		sharedsummary["default"]				= "default";
 	}
 	catch(exception& e) {