added sequence name to error string in fastq.info. Changed np_shannon to npshannon.

[mothur.git] / sequenceparser.cpp

diff --git a/sequenceparser.cpp b/sequenceparser.cpp
index 76c90c3f9eb7f2802276526c8491dee1d1ba3883..6c98c047af76d2a3c29ee599b1141c336240390b 100644 (file)
--- a/sequenceparser.cpp
+++ b/sequenceparser.cpp
@@ -7,7 +7,7 @@
  *
  */
 
-#include "sequenceParser.h"
+#include "sequenceparser.h"
 
 
 /************************************************************/
@@ -64,6 +64,7 @@ SequenceParser::SequenceParser(string groupFile, string fastaFile, string nameFi
                string first, second;
                int countName = 0;
                set<string> thisnames1;
+               
                while(!inName.eof()) {
                        
                        if (m->control_pressed) { break; }
@@ -135,12 +136,14 @@ SequenceParser::SequenceParser(string groupFile, string fastaFile, string nameFi
                
                if (countName != (groupMap->getNumSeqs())) {
                        vector<string> groupseqsnames = groupMap->getNamesSeqs();
+                       
                        for (int i = 0; i < groupseqsnames.size(); i++) {
                                set<string>::iterator itnamesfile = thisnames1.find(groupseqsnames[i]);
                                if (itnamesfile == thisnames1.end()){
                                        cout << "missing name " + groupseqsnames[i] << '\t' << allSeqsMap[groupseqsnames[i]] << endl;
                                }
                        }
+                       
                        m->mothurOutEndLine();
                        m->mothurOut("[ERROR]: Your name file contains " + toString(countName) + " valid sequences, and your groupfile contains " + toString(groupMap->getNumSeqs()) + ", please correct.");
                        m->mothurOutEndLine();