X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedsorclass.cpp;h=85609dad69311e08474a2115755d74761052ab13;hb=372fb21ea66ced432b109225851a1b80ef0491a3;hp=8f6065096853b358ac75a9fad0355fdb15a47b49;hpb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;p=mothur.git

diff --git a/sharedsorclass.cpp b/sharedsorclass.cpp
index 8f60650..85609da 100644
--- a/sharedsorclass.cpp
+++ b/sharedsorclass.cpp
@@ -13,7 +13,7 @@
 
 EstOutput SorClass::getValues(vector<SharedRAbundVector*> shared) {
 	try {
-		int S1, S2, S12, tempA, tempB;
+		double S1, S2, S12, tempA, tempB;
 		S1 = 0; S2 = 0; S12 = 0; tempA = 0; tempB = 0; 
 		
 		/*S1, S2 = number of OTUs observed or estimated in A and B 
@@ -21,7 +21,7 @@ EstOutput SorClass::getValues(vector<SharedRAbundVector*> shared) {
 
 		data.resize(1,0);
 		
-		for (int i = 0; i < shared[0]->size(); i++) {
+		for (int i = 0; i < shared[0]->getNumBins(); i++) {
 			//store in temps to avoid multiple repetitive function calls
 			tempA = shared[0]->getAbundance(i);
 			tempB = shared[1]->getAbundance(i);
@@ -34,7 +34,7 @@ EstOutput SorClass::getValues(vector<SharedRAbundVector*> shared) {
 			if ((tempA != 0) && (tempB != 0)) {	S12++; }
 		}
 		
-		data[0] = (2 * S12) / (float)(S1 + S2);
+		data[0] = 1.0-(2 * S12) / (float)(S1 + S2);
 		
 		if (isnan(data[0]) || isinf(data[0])) { data[0] = 0; }