changed tags on temp blast db to include template name

[mothur.git] / blastdb.cpp

diff --git a/blastdb.cpp b/blastdb.cpp
index cc85989dad80dd1b0f85997b3428006b7d353c5c..6d7ab18b870567cff8a39dc3b848a3de9b3c9c4f 100644 (file)
--- a/blastdb.cpp
+++ b/blastdb.cpp
@@ -14,15 +14,15 @@
 
 /**************************************************************************************************/
 
-BlastDB::BlastDB(float gO, float gE, float m, float mM) : Database(), 
+BlastDB::BlastDB(string tag, float gO, float gE, float m, float mM) : Database(), 
 gapOpen(gO), gapExtend(gE), match(m), misMatch(mM) {
        
        count = 0;
 
        int randNumber = rand();
-       dbFileName = toString(randNumber) + ".template.unaligned.fasta";
-       queryFileName = toString(randNumber) + ".candidate.unaligned.fasta";
-       blastFileName = toString(randNumber) + ".blast";
+       dbFileName = tag + toString(randNumber) + ".template.unaligned.fasta";
+       queryFileName = tag + toString(randNumber) + ".candidate.unaligned.fasta";
+       blastFileName = tag + toString(randNumber) + ".blast";
 
 }
 /**************************************************************************************************/
@@ -141,13 +141,13 @@ vector<int> BlastDB::findClosestMegaBlast(Sequence* seq, int n, int minPerID) {
                
                while(!m8FileHandle.eof()){
                        m8FileHandle >> dummy >> templateAccession >> searchScore >> numBases >> mismatch >> gap >> startQuery >> endQuery >> startRef >> endRef >> eScore >> score;
-                       //cout << dummy << '\t' << templateAccession << '\t' << searchScore << '\t';
+                       //cout << dummy << '\t' << templateAccession << '\t' << searchScore << '\t' << numBases << '\t' << mismatch << '\t' << gap << '\t' << startQuery << '\t' << endQuery << '\t' << startRef << '\t' << endRef << '\t' << eScore << '\t' << score << endl; 
                        
                        //get rest of junk in line
                        //while (!m8FileHandle.eof())   {       char c = m8FileHandle.get(); if (c == 10 || c == 13){   break;  }else{ cout << c; }     } //
                                //cout << endl;
                        m->gobble(m8FileHandle);
-                       if (searchScore >= minPerID) {
+                       if (searchScore >= minPerID) { 
                                topMatches.push_back(templateAccession);
                                Scores.push_back(searchScore);
                        }