fixed template=self thing

diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
index 2e6f5a8244aead5d33354fd4d765e183ee2092c2..321c130ca8efed7cfad93ec56d1f38d52d0311a5 100644 (file)
--- a/Mothur.xcodeproj/project.pbxproj
+++ b/Mothur.xcodeproj/project.pbxproj
@@ -1979,7 +1979,7 @@
                                ARCHS = "$(ARCHS_STANDARD_64_BIT)";
                                DEPLOYMENT_LOCATION = NO;
                                GCC_C_LANGUAGE_STANDARD = gnu99;
-                               GCC_OPTIMIZATION_LEVEL = 3;
+                               GCC_OPTIMIZATION_LEVEL = 0;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "MOTHUR_FILES=\"\\\"../release\\\"\"",
                                        "VERSION=\"\\\"1.18.1\\\"\"",
@@ -2013,7 +2013,7 @@
                                GCC_C_LANGUAGE_STANDARD = gnu99;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_MODEL_TUNING = "";
-                               GCC_OPTIMIZATION_LEVEL = 3;
+                               GCC_OPTIMIZATION_LEVEL = 0;
                                GCC_PREPROCESSOR_DEFINITIONS = (
                                        "VERSION=\"\\\"1.18.1\\\"\"",
                                        "RELEASE_DATE=\"\\\"4/15/2011\\\"\"",

diff --git a/decalc.cpp b/decalc.cpp
index c600a7f56633c270ec83810a306ad71ca3cd65c8..f6203827baec8e2575532ef43b0b2e3703745ca7 100644 (file)
--- a/decalc.cpp
+++ b/decalc.cpp
@@ -789,7 +789,7 @@ vector<Sequence*> DeCalculator::findClosest(Sequence* querySeq, vector<Sequence*
                float lastRight = distsRight[0].dist;
                float lastLeft = distsLeft[0].dist;
                //int lasti = 0;
-               for (int i = 0; i < numWanted+1; i++) {
+               for (int i = 0; i < distsLeft.size(); i++) {
                        
                        if (m->control_pressed) { return seqsMatches; }
                        
@@ -811,6 +811,8 @@ vector<Sequence*> DeCalculator::findClosest(Sequence* querySeq, vector<Sequence*
 //                             cout << "loop-right\t" << db[distsRight[i].index]->getName() << '\t' << distsRight[i].dist << endl;
                        }
                        
+                       if (i == numWanted) { break; }
+                       
                }
                
                //are we still above the minimum similarity cutoff