finished cluster.split adding classify method.

[mothur.git] / blastdb.cpp

diff --git a/blastdb.cpp b/blastdb.cpp
index b139f3eb7a47bcc86f0920bdc0fc22bad368816a..35a19f485816c87db85b71c74ca138f00595b180 100644 (file)
--- a/blastdb.cpp
+++ b/blastdb.cpp
@@ -25,6 +25,19 @@ gapOpen(gO), gapExtend(gE), match(m), misMatch(mM) {
        queryFileName = toString(randNumber) + ".candidate.unaligned.fasta";
        blastFileName = toString(randNumber) + ".blast";
 
+}
+/**************************************************************************************************/
+
+BlastDB::BlastDB() : Database() {
+       
+       globaldata = GlobalData::getInstance();
+       count = 0;
+
+       int randNumber = rand();
+       dbFileName = toString(randNumber) + ".template.unaligned.fasta";
+       queryFileName = toString(randNumber) + ".candidate.unaligned.fasta";
+       blastFileName = toString(randNumber) + ".blast";
+
 }
 
 /**************************************************************************************************/
@@ -75,7 +88,7 @@ vector<int> BlastDB::findClosestSequences(Sequence* seq, int n) {
                return topMatches;
        }
        catch(exception& e) {
-               errorOut(e, "BlastDB", "findClosestSequences");
+               m->errorOut(e, "BlastDB", "findClosestSequences");
                exit(1);
        }
 
@@ -101,7 +114,7 @@ vector<int> BlastDB::findClosestMegaBlast(Sequence* seq, int n) {
                system(blastCommand.c_str());
                
                ifstream m8FileHandle;
-               openInputFile(blastFileName, m8FileHandle);
+               openInputFile(blastFileName, m8FileHandle, "no error");
        
                string dummy;
                int templateAccession;
@@ -115,13 +128,14 @@ vector<int> BlastDB::findClosestMegaBlast(Sequence* seq, int n) {
                        
                        gobble(m8FileHandle);
                        topMatches.push_back(templateAccession);
+//cout << templateAccession << endl;
                }
                m8FileHandle.close();
-               
+//cout << "\n\n" ;             
                return topMatches;
        }
        catch(exception& e) {
-               errorOut(e, "BlastDB", "findClosest");
+               m->errorOut(e, "BlastDB", "findClosest");
                exit(1);
        }
 }
@@ -136,11 +150,11 @@ void BlastDB::addSequence(Sequence seq) {
                unalignedFastaFile << '>' << count << endl;                                     //      sequences, which will be input to formatdb
                unalignedFastaFile << seq.getUnaligned() << endl;
                unalignedFastaFile.close();
-               
+       
                count++;
        }
        catch(exception& e) {
-               errorOut(e, "BlastDB", "addSequence");
+               m->errorOut(e, "BlastDB", "addSequence");
                exit(1);
        }
 }
@@ -148,7 +162,7 @@ void BlastDB::addSequence(Sequence seq) {
 void BlastDB::generateDB() {
        try {
        
-               //mothurOut("Generating the temporary BLAST database...\t");    cout.flush();
+               //m->mothurOut("Generating the temporary BLAST database...\t"); cout.flush();
                
                path = globaldata->argv;
                path = path.substr(0, (path.find_last_of('m')));
@@ -156,13 +170,14 @@ void BlastDB::generateDB() {
                string formatdbCommand = path + "blast/bin/formatdb -p F -o T -i " + dbFileName;        //      format the database, -o option gives us the ability
                system(formatdbCommand.c_str());                                                                //      to get the right sequence names, i think. -p F
                                                                                                                                        //      option tells formatdb that seqs are DNA, not prot
-               //mothurOut("DONE."); mothurOutEndLine();       mothurOutEndLine(); cout.flush();
+               //m->mothurOut("DONE."); m->mothurOutEndLine(); m->mothurOutEndLine(); cout.flush();
        }
        catch(exception& e) {
-               errorOut(e, "BlastDB", "generateDB");
+               m->errorOut(e, "BlastDB", "generateDB");
                exit(1);
        }
 }
+/**************************************************************************************************/
 
 /**************************************************************************************************/