]> git.donarmstrong.com Git - mothur.git/blobdiff - classify.cpp
fixes while testing
[mothur.git] / classify.cpp
index 7f451261550a949b3a1cbb7ab72fd374122597bb..2eb3ec1f800654ddd7e28cd8c72b2c5e996774d3 100644 (file)
@@ -97,7 +97,7 @@ void Classify::generateDatabaseAndNames(string tfile, string tempFile, string me
                if (method == "suffix") {
                        ifstream inFASTA;
                        openInputFile(tempFile, inFASTA);
-                       numSeqs = count(istreambuf_iterator<char>(inFASTA),istreambuf_iterator<char>(), '>');
+                       getNumSeqs(inFASTA, numSeqs);
                        inFASTA.close();
                }
 
@@ -138,7 +138,7 @@ void Classify::generateDatabaseAndNames(string tfile, string tempFile, string me
                }else if ((method == "kmer") && (!needToGenerate)) {    
                        ifstream kmerFileTest(kmerDBName.c_str());
                        database->readKmerDB(kmerFileTest);     
-                       
+               
                        ifstream fastaFile;
                        openInputFile(tempFile, fastaFile);
                        
@@ -150,7 +150,8 @@ void Classify::generateDatabaseAndNames(string tfile, string tempFile, string me
                        }
                        fastaFile.close();
                }
-#endif         
+#endif 
+       
                database->setNumSeqs(names.size());
                
                //sanity check