Fixes trim.seqs bug if nothing is scrapped

#792
mothur · Jan 10, 2022 · c2633a6 · c2633a6
1 parent bfc2071
commit c2633a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
@@ -3960,7 +3960,7 @@
 				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"MOTHUR_FILES=\"\\\"/Users/swestcott/Desktop/release/;/Users/swestcott/Desktop/mothurbugs/\\\"\"",
 					"VERSION=\"\\\"1.46.0\\\"\"",
@@ -4012,7 +4012,7 @@
 				"FRAMEWORK_SEARCH_PATHS[arch=*]" = "${SRCROOT}/mothur_resources_10.14/libs";
 				GCC_C_LANGUAGE_STANDARD = "compiler-default";
 				GCC_MODEL_TUNING = G5;
-				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_OPTIMIZATION_LEVEL = 3;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"MOTHUR_FILES=\"\\\"/Users/swestcott/Desktop/release\\\"\"",
 					"VERSION=\"\\\"1.46.0\\\"\"",

diff --git a/source/commands/trimseqscommand.cpp b/source/commands/trimseqscommand.cpp
@@ -965,7 +965,7 @@ int TrimSeqsCommand::processNamesCountFiles(string trimFasta, set<string> badNam
 
             CountTable newCt;
 
-            if (badNames.size() != 0) { newCt.addGroup("scrap");  }
+            if (badNames.size() != 0) { newCt.addGroup("scrap");   }
 
             for (map<string, int>::iterator itCount = groupCounts.begin(); itCount != groupCounts.end(); itCount++) { newCt.addGroup(itCount->first); }
 
@@ -980,7 +980,7 @@ int TrimSeqsCommand::processNamesCountFiles(string trimFasta, set<string> badNam
 
                 map<string, int>::iterator itCount = nameCount.find(seqName);
                 if (itCount != nameCount.end()) {
-                    vector<int> counts; counts.resize(groupCounts.size()+1, 0);
+                    vector<int> counts; counts.resize(count, 0);
                     counts[groupIndexes[seqGroup]] = itCount->second;
                     newCt.push_back(seqName, counts);
                 }else { m->mothurOut("[ERROR]: missing count info for " + seqName + "\n"); m->setControl_pressed(true); }