From: pschloss <pschloss>
Date: Tue, 11 Oct 2011 11:37:28 +0000 (+0000)
Subject: camberra fix
X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=commitdiff_plain;h=b36456f889ccf8ef273875f384bc668d0cdee672

camberra fix
---

diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
index b09e93b..769e339 100644
--- a/Mothur.xcodeproj/project.pbxproj
+++ b/Mothur.xcodeproj/project.pbxproj
@@ -2198,7 +2198,7 @@
 				GCC_ENABLE_SSE3_EXTENSIONS = NO;
 				GCC_ENABLE_SSE41_EXTENSIONS = NO;
 				GCC_ENABLE_SSE42_EXTENSIONS = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"MOTHUR_FILES=\"\\\"../release\\\"\"",
 					"VERSION=\"\\\"1.21.0\\\"\"",
@@ -2232,7 +2232,7 @@
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_MODEL_TUNING = "";
-				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"VERSION=\"\\\"1.19.0\\\"\"",
 					"RELEASE_DATE=\"\\\"5/9/2011\\\"\"",
diff --git a/canberra.cpp b/canberra.cpp
index 2612e16..9ab6234 100644
--- a/canberra.cpp
+++ b/canberra.cpp
@@ -32,7 +32,7 @@ EstOutput Canberra::getValues(vector<SharedRAbundVector*> shared) {
 			}
 		}
 		
-		data[0] = (1 / (float) numSharedOTUS) * sum;
+		data[0] = (1 / (float) shared[0]->getNumBins()) * sum;
 		
 		if (isnan(data[0]) || isinf(data[0])) { data[0] = 0; }