Merge remote-tracking branch 'origin'

[mothur.git] / subsamplecommand.cpp

diff --git a/subsamplecommand.cpp b/subsamplecommand.cpp
index 4128191598d22e8e7280f403dca79494e61da948..9e27fae51eca7ef564892e112d8a17d24eba6089 100644 (file)
--- a/subsamplecommand.cpp
+++ b/subsamplecommand.cpp
@@ -273,7 +273,7 @@ SubSampleCommand::SubSampleCommand(string option) {
                        else if (countfile == "not found") { countfile = "";  } 
                        else {
                 m->setCountTableFile(countfile); 
-                ct.readTable(countfile);
+                ct.readTable(countfile, true);
             }
             
             if ((namefile != "") && (countfile != "")) {
@@ -552,7 +552,7 @@ int SubSampleCommand::getSubSampleFasta() {
                     else{
                         itGroupCounts = groupCounts.find(group);
                         if (itGroupCounts != groupCounts.end()) {
-                            if (groupCounts[group] < size) {   subset.insert(names[j]);        groupCounts[group]++; }
+                            if (itGroupCounts->second < size) {        subset.insert(names[j]);        (itGroupCounts->second)++; }
                         }
                     }                          
                 }