X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=validcalculator.cpp;fp=validcalculator.cpp;h=f8c7cc3352e9281defb720c24d15ebda4337a44d;hb=99254b7a399bb635a4acfe8d9c8a586601db5a11;hp=6583bbefc9564d17959d4b1240fc589fea54751d;hpb=a3ab9317d12127ff88b039c9933e98eeb562eaa0;p=mothur.git diff --git a/validcalculator.cpp b/validcalculator.cpp index 6583bbe..f8c7cc3 100644 --- a/validcalculator.cpp +++ b/validcalculator.cpp @@ -516,16 +516,46 @@ void ValidCalculators::initialHeat() { /********************************************************************/ void ValidCalculators::initialMatrix() { try { - matrix["jabund"] = "jabund"; + matrix["sharedsobs"] = "sharedsobs"; + matrix["sharedchao"] = "sharedchao"; + matrix["sharedace"] = "sharedace"; + matrix["jabund"] = "jabund"; matrix["sorabund"] = "sorabund"; - matrix["jclass"] = "jclass"; + matrix["jclass"] = "jclass"; matrix["sorclass"] = "sorclass"; matrix["jest"] = "jest"; - matrix["sorest"] = "sorest"; + matrix["sorest"] = "sorest"; matrix["thetayc"] = "thetayc"; - matrix["thetan"] = "thetan"; + matrix["thetan"] = "thetan"; + matrix["kstest"] = "kstest"; + matrix["whittaker"] = "whittaker"; + matrix["sharednseqs"] = "sharednseqs"; + matrix["ochiai"] = "ochiai"; + matrix["anderberg"] = "anderberg"; + matrix["kulczynski"] = "kulczynski"; + matrix["kulczynskicody"] = "kulczynskicody"; + matrix["lennon"] = "lennon"; matrix["morisitahorn"] = "morisitahorn"; - matrix["braycurtis"] = "braycurtis"; + matrix["braycurtis"] = "braycurtis"; + matrix["odum"] = "odum"; + matrix["canberra"] = "canberra"; + matrix["structeuclidean"] = "structeuclidean"; + matrix["structchord"] = "structchord"; + matrix["hellinger"] = "hellinger"; + matrix["manhattan"] = "manhattan"; + matrix["structpearson"] = "structpearson"; + matrix["structkulczynski"] = "structkulczynski"; + matrix["structchi2"] = "structchi2"; + matrix["soergel"] = "soergel"; + matrix["spearman"] = "spearman"; + matrix["speciesprofile"] = "speciesprofile"; + matrix["hamming"] = "hamming"; + matrix["gower"] = "gower"; + matrix["memchi2"] = "memchi2"; + matrix["memchord"] = "memchord"; + matrix["memeuclidean"] = "memeuclidean"; + matrix["mempearson"] = "mempearson"; + } catch(exception& e) { m->errorOut(e, "ValidCalculator", "initialMatrix");