X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bstick.cpp;h=eabf087ba0b7def92129c52e1f60257b93ca8b7f;hb=477e76a8a79b60f6cd4253324dd830bdea25e3e9;hp=7f12d1d826fa0baf28b4726c3dbd0abf0c9b660c;hpb=e4827e0945cbda536064e5a345996b2a7dfcbb81;p=mothur.git

diff --git a/bstick.cpp b/bstick.cpp
index 7f12d1d..eabf087 100644
--- a/bstick.cpp
+++ b/bstick.cpp
@@ -46,7 +46,7 @@ RAbundVector BStick::getRAbundVector(SAbundVector* rank){
 /***************************************************************************/
 EstOutput BStick::getValues(SAbundVector* rank){
 	try {
-		data.resize(2,0);
+		data.resize(3,0);
 		rdata = getRAbundVector(rank);
 		double numInd = (double)rdata.getNumSeqs();
 		double numSpec = (double)rdata.getNumBins();
@@ -64,27 +64,16 @@ EstOutput BStick::getValues(SAbundVector* rank){
 				maxDiff = diff;
 		}
 		
-		double DStatistic = maxDiff/numInd;
-		double critVal = 0;
-		/*cout << "BStick:\n";
-		cout << "D-Statistic = " << DStatistic << "\n";
-		cout << "Critical value for 95% confidence interval = ";*/
-		if(rdata.size() > 20)
-		{
-			critVal = .886/sqrt(rdata.size());
-		}
-		else
-		{
-			KOSTable table;
-			critVal = table.getConfLimit(numSpec);
-		}
+		data[0] = maxDiff/numInd;
+		data[1] = 0.886/sqrt(rdata.size());
+		data[2] = 1.031/sqrt(rdata.size());
+
 		/*cout << critVal << "\n";
 		cout << "If D-Statistic is less than the critical value then the data fits the Broken Stick model w/ 95% confidence.\n\n";*/
 		
-		data[0] = DStatistic;
-		data[1] = critVal;
 		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;
 	}