camberra fix

diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
index b09e93b5c85c3641e0383218f6404d10db82ea96..769e33999b25da3d3751b2249476e7c53fab7a6a 100644 (file)
--- 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 2612e16dc6c7d085431819eec046a22a0a48a9ac..9ab6234ae3119c4f3b103f314e97e9c69d793780 100644 (file)
--- 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; }