X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=chimeraslayer.h;h=7bf663afeadeb3517daf4f9bfa25135fbf872cab;hp=87439a327e9e83acf1db63375a3f1173e7829b3a;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=605ab6fa594317a38f0df7bb6797740c735b2348

diff --git a/chimeraslayer.h b/chimeraslayer.h
index 87439a3..7bf663a 100644
--- a/chimeraslayer.h
+++ b/chimeraslayer.h
@@ -15,47 +15,60 @@
 #include "maligner.h"
 #include "slayer.h"
 
+
+
 //***********************************************************************/
 //This class was modeled after the chimeraSlayer written by the Broad Institute
 /***********************************************************************/
 
-
 class ChimeraSlayer : public Chimera {
 	
 	public:
-		ChimeraSlayer(string, string, bool, string, int, int, int, int, float, int, int, int, int, int, int, int, int, bool);
-		ChimeraSlayer(string, string, bool, string, string, string, int, int, int, int, float, int, int, int, int, int, int, int, int, bool);
+		ChimeraSlayer(string, string, bool, string, int, int, int, int, float, int, int, int, int, int, int, int, int, bool, string, int);
+		ChimeraSlayer(string, string, bool, map<string, int>&, string,  int, int, int, int, float, int, int, int, int, int, int, int, int, bool, string, int);
+		ChimeraSlayer(string, string, bool, map<string, int>&, string,  int, int, int, int, float, int, int, int, int, int, int, int, int, bool, string, int, bool);
 
 		~ChimeraSlayer();
 		
 		int getChimeras(Sequence*);
-		Sequence* print(ostream&, ostream&);
+		Sequence print(ostream&, ostream&);
+		Sequence print(ostream&, ostream&, data_results, data_results);
 		void printHeader(ostream&);
 		int doPrep();
+		int getNumNoParents() { return numNoParents; }
+		data_results getResults() { return printResults; }
 		
 		#ifdef USE_MPI
-		Sequence* print(MPI_File&, MPI_File&);
+		Sequence print(MPI_File&, MPI_File&);
+		Sequence print(MPI_File&, MPI_File&, data_results, data_results, bool&);
 		#endif
 		
 	private:
-		Sequence* querySeq;
-		Sequence* trimQuery;
-		DeCalculator* decalc;
-		map<int, int>  spotMap;
+		Sequence querySeq;
+		Sequence trimQuery;
+		DeCalculator decalc;
 		Database* databaseRight;
 		Database* databaseLeft;
-		map<string, vector<string> > nameMapRank;  //sequence name to rank so you can construct a template of the abundant sequences if the user uses itself as template
-		
+		map<string, int> priority; //for template=self, seqname, seqAligned, abundance
+		set<string> chimericSeqs; //for template=self, so we don't add chimeric sequences to the userTemplate set
+		int numNoParents, threadID;
+	
 		vector<data_struct>  chimeraResults;
-		string chimeraFlags, searchMethod, fastafile, includeAbunds;
+		data_results printResults;
+		string chimeraFlags, searchMethod, fastafile, blastlocation;
 		bool realign, trimChimera;
 		int window, numWanted, kmerSize, match, misMatch, minSim, minCov, minBS, minSNP, parents, iters, increment;
 		float divR;
 	
 		void printBlock(data_struct, string, ostream&);
+		void printBlock(data_results, data_results, bool, bool, string, ostream&);
 		string getBlock(data_struct, string);
-		int readNameFile(string);
-		vector<Sequence*> getTemplate(Sequence*);
+		string getBlock(data_results, data_results, bool, bool, string);
+		//int readNameFile(string);
+		vector<Sequence*> getTemplate(Sequence, vector<Sequence*>&);
+		vector<Sequence> getRefSeqs(Sequence, vector<Sequence*>&, vector<Sequence*>&);
+		vector<Sequence> getBlastSeqs(Sequence, vector<Sequence*>&, int);
+		vector<Sequence> getKmerSeqs(Sequence, vector<Sequence*>&, int);
 		
 };