classify.seqs summary file fix

diff --git a/classifyseqscommand.cpp b/classifyseqscommand.cpp
index 9030948074003f663978ab10ff0128adc0ad7c37..bbdf8119ad9332f49be4b1c71679b50fc51fe68d 100644 (file)
--- a/classifyseqscommand.cpp
+++ b/classifyseqscommand.cpp
@@ -652,7 +652,7 @@ int ClassifySeqsCommand::execute(){
                        
                        //get maxLevel from phylotree so you know how many 'unclassified's to add
                        int maxLevel = taxaSum.getMaxLevel();
-                       
+                                                       
                        //read taxfile - this reading and rewriting is done to preserve the confidence scores.
                        string name, taxon;
                        while (!inTax.eof()) {

diff --git a/mothur b/mothur
index 3bd8d608825f46fafccef6d5324afd7d34d802a6..0812c5e78d5e1ecd1dc75495548ba531ee812bc7 100755 (executable)
Binary files a/mothur and b/mothur differ

diff --git a/phylosummary.cpp b/phylosummary.cpp
index 39bfdf3dfecb1cd4aaecb2763043d0c8cbb00d29..4e94605e47caf6e09d099a4df32dfdd7677be676 100644 (file)
--- a/phylosummary.cpp
+++ b/phylosummary.cpp
@@ -117,15 +117,15 @@ int PhyloSummary::addSeqToTree(string seqName, string seqTaxonomy){
                                        if (group == "not found") {  m->mothurOut(seqName + " is not in your groupfile, and will be included in the overall total, but not any group total."); m->mothurOutEndLine();  }
                                        
                                        //do you have a count for this group?
-                                       map<string, int>::iterator itGroup = tree[currentNode].groupCount.find(group);
+                                       map<string, int>::iterator itGroup = tree[childPointer->second].groupCount.find(group);
                                        
                                        //if yes, increment it - there should not be a case where we can't find it since we load group in read
-                                       if (itGroup != tree[currentNode].groupCount.end()) {
-                                               tree[currentNode].groupCount[group]++;
+                                       if (itGroup != tree[childPointer->second].groupCount.end()) {
+                                               tree[childPointer->second].groupCount[group]++;
                                        }
                                }
                                
-                               tree[currentNode].total++;
+                               tree[childPointer->second].total++;
 
                                currentNode = childPointer->second;
                        }else{  //otherwise, error