X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=whittaker.cpp;h=5ab1e5dd88eedb8e0fb0dbe52d0b42e0c61d3c44;hp=4b66ec9ef049cf0cb086bef586d6b9ce3889aebd;hb=615301e57c25e241356a9c2380648d117709458d;hpb=163b300cfd7d4ca4e70c454be20f07b1d8346650

diff --git a/whittaker.cpp b/whittaker.cpp
index 4b66ec9..5ab1e5d 100644
--- a/whittaker.cpp
+++ b/whittaker.cpp
@@ -23,17 +23,13 @@ EstOutput Whittaker::getValues(vector<SharedRAbundVector*> shared){
 			if(shared[1]->getAbundance(i) != 0){	countB++;	}		
 		}
 		
-		data[0] = 2*sTotal/(float)(countA+countB)-1;
+		data[0] = 2-2*sTotal/(float)(countA+countB);
 		return data;
 	}
 	catch(exception& e) {
-		cout << "Standard Error: " << e.what() << " has occurred in the Whittaker class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		m->errorOut(e, "Whittaker", "getValues");
 		exit(1);
 	}
-	catch(...) {
-		cout << "An unknown error has occurred in the Whittaker class function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-		exit(1);
-	}	
 }
 
 /***********************************************************************/