X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=blastdb.hpp;h=50a8379b68ec89130b7df1892aab4538daa77a1e;hb=250e3b11b1c9c1e1ad458ab6c7e71ac2e67e11d9;hp=d61aaecb5e0712b47458e000416b881719cc7e65;hpb=fdc1f6eaf544f695fc1511f24bddd7e6069c33ba;p=mothur.git

diff --git a/blastdb.hpp b/blastdb.hpp
index d61aaec..50a8379 100644
--- a/blastdb.hpp
+++ b/blastdb.hpp
@@ -12,37 +12,34 @@
  */
 
 #include "mothur.h"
-#include "globaldata.hpp"
 
 class BlastDB : public Database {
 
 public:
-	BlastDB(float, float, float, float);
-	BlastDB();
+	BlastDB(string, float, float, float, float, string, int);
+	BlastDB(string, int);
 	~BlastDB();
 	
 	void generateDB();
 	void addSequence(Sequence);
 	vector<int> findClosestSequences(Sequence*, int);
-	vector<int> findClosestMegaBlast(Sequence*, int);
-	
-	#ifdef USE_MPI	
-	int MPISend(int); //just sends gapOpen, gapExtend, match and mismatch
-	int MPIRecv(int);
-	#endif
+	vector<int> findClosestMegaBlast(Sequence*, int, int);
 	
 private:
+	
+	string scrubName(string);
+	
 	string dbFileName;
 	string queryFileName;
 	string blastFileName;
 	string path;
 	
-	int count;
+	int count, threadID;
 	float gapOpen;
 	float gapExtend;
 	float match;
 	float misMatch;
-	GlobalData* globaldata;
+	
 };
 
 #endif