X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=logsd.cpp;h=6a795415d832f265325138422f48d77afe3315be;hb=70491a12902e89b85cfa6b44a7b7fbe066ee2ac1;hp=62faf8eab68c726f9499451ec3207fc66ae2cbd2;hpb=510b1cfc25cd79391d6973ca20c5ec25fb1bb3b2;p=mothur.git

diff --git a/logsd.cpp b/logsd.cpp
index 62faf8e..6a79541 100644
--- a/logsd.cpp
+++ b/logsd.cpp
@@ -14,6 +14,7 @@
 double LogSD::logS(double x){
 	return -(1-x)*log(1-x)/x;
 }
+/***********************************************************************/
 EstOutput LogSD::getValues(SAbundVector* rank){
 	try {
 		
@@ -29,8 +30,8 @@ EstOutput LogSD::getValues(SAbundVector* rank){
 		SAbundVector *rank = &rankw;*/
 		
 		data.resize(3,0);
-		int numInd = rank->getNumSeqs();
-		int numSpec = rank->getNumBins();
+		double numInd = rank->getNumSeqs();
+		double numSpec = rank->getNumBins();
 		double snRatio = (double)numSpec/numInd;
 		double x = .5;
 		double step = .4999999999;
@@ -44,7 +45,7 @@ EstOutput LogSD::getValues(SAbundVector* rank){
 		}
 		double alpha = numInd*(1-x)/x;
 
-		int oct = 1;
+		double oct = 1;
 		double octSumObs = 0;
 		double sumObs = 0;
 		double octSumExp = 0;
@@ -85,7 +86,7 @@ EstOutput LogSD::getValues(SAbundVector* rank){
 		return data;
 	}
 	catch(exception& e) {
-		errorOut(e, "LogSD", "getValues");
+		m->errorOut(e, "LogSD", "getValues");
 		exit(1);
 	}
 }