X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=logsd.cpp;h=e959ab8cb8c1bcce52350331653903345b89c48b;hb=477e76a8a79b60f6cd4253324dd830bdea25e3e9;hp=14d2e442fa2bea0a6e153dc310b59d687b51b642;hpb=e4827e0945cbda536064e5a345996b2a7dfcbb81;p=mothur.git diff --git a/logsd.cpp b/logsd.cpp index 14d2e44..e959ab8 100644 --- a/logsd.cpp +++ b/logsd.cpp @@ -78,17 +78,21 @@ EstOutput LogSD::getValues(SAbundVector* rank){ if(diff > maxDiff) maxDiff = diff; } - - double DStatistic = (maxDiff + .5)/numSpec; + + /*cout << "LogSD:\n"; cout << "D Test Statistic = " << DStatistic << "\n"; cout << ".05 confidence value = " << .89196/sqrt(numSpec) << "\n"; cout << "If D Test Statistic is greater than the critical value then the data fits the Log Series Distribution model w/ 95% confidence.\n\n";*/ - data[0] = DStatistic; - data[1] = .89196/sqrt(numSpec); + data[0] = (maxDiff + .5)/numSpec; + data[1] = 0.886/sqrt(numSpec); + data[2] = 1.031/sqrt(numSpec); + if (isnan(data[0]) || isinf(data[0])) { data[0] = 0; } if (isnan(data[1]) || isinf(data[1])) { data[1] = 0; } + if (isnan(data[2]) || isinf(data[2])) { data[2] = 0; } + return data; } catch(exception& e) {