X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=pintail.h;h=92c399889c3be0aa0e552fe296612eb336bc8168;hp=2e841475c79f9382fff32314a3a46577696ddfc3;hb=df7e3ff9f68ef157b0328a2d353c3258c5d45d89;hpb=db2df3a6a0e6354a666472ede1de74642cfeb06b

diff --git a/pintail.h b/pintail.h
index 2e84147..92c3998 100644
--- a/pintail.h
+++ b/pintail.h
@@ -14,6 +14,7 @@
 #include "dist.h"
 #include "decalc.h"
 
+/***********************************************************/
 //This class was created using the algorythms described in the 
 // "At Least 1 in 20 16S rRNA Sequence Records Currently Held in the Public Repositories is Estimated To Contain Substantial Anomalies" paper 
 //by Kevin E. Ashelford 1, Nadia A. Chuzhanova 3, John C. Fry 1, Antonia J. Jones 2 and Andrew J. Weightman 1.
@@ -23,68 +24,59 @@
 class Pintail : public Chimera {
 	
 	public:
-		Pintail(string, string);	
+		Pintail(string, string, bool, int, string, string, string, int, int, string); //fastafile, templatefile, filter, processors, mask, conservation, quantile, window, increment, outputDir)	
 		~Pintail();
 		
-		void getChimeras();
-		void print(ostream&);
+		int getChimeras(Sequence*);
+		Sequence print(ostream&, ostream&);
 		
 		void setCons(string c)		{ consfile = c;  }
 		void setQuantiles(string q) { quanfile = q;  }
 		
+		#ifdef USE_MPI
+		Sequence print(MPI_File&, MPI_File&);
+		#endif
 		
 	private:
 	
-		struct linePair {
-			int start;
-			int end;
-			linePair(int i, int j) : start(i), end(j) {}
-			linePair(){}
-		};
-
 		Dist* distcalculator;
 		DeCalculator* decalc;
-		int iters;
-		string fastafile, templateFile, consfile, quanfile;
-		
+		int iters, window, increment, processors;
+		string fastafile, quanfile, consfile;
 		
-		vector<linePair*> lines;
 		vector<linePair*> templateLines;
-		vector<Sequence*> querySeqs;
-		vector<Sequence*> templateSeqs;
+		Sequence* querySeq;
+				
+		Sequence* bestfit;  //closest match to query in template
 		
-		vector<Sequence*> bestfit;  //bestfit[0] matches queryseqs[0]...
-		
-		vector< vector<float> > obsDistance;  //obsDistance[0] is the vector of observed distances for queryseqs[0]... 
-		vector< vector<float> > expectedDistance;  //expectedDistance[0] is the vector of expected distances for queryseqs[0]... 
-		vector<float> deviation;  //deviation[0] is the percentage of mismatched pairs over the whole seq between querySeqs[0] and its best match.
-		vector< vector<int> > windowsForeachQuery;  // windowsForeachQuery[0] is a vector containing the starting spot in queryseqs[0] aligned sequence for each window.
+		vector<float>  obsDistance;  //obsDistance is the vector of observed distances for query 
+		vector<float>  expectedDistance;  //expectedDistance is the vector of expected distances for query
+		float deviation;  //deviation is the percentage of mismatched pairs over the whole seq between query and its best match.
+		vector<int>  windowsForeachQuery;  // windowsForeachQuery is a vector containing the starting spot in query aligned sequence for each window.
 										//this is needed so you can move by bases and not just spots in the alignment
 										
-		vector<int> windowSizes;			//windowSizes[0] = window size of querySeqs[0]
+		int  windowSizes;			//windowSizes = window size of query
 		vector<int> windowSizesTemplate;    //windowSizesTemplate[0] = window size of templateSeqs[0]
 		
-		vector< map<int, int> > trimmed;    //trimmed[0] = start and stop of trimmed sequences for querySeqs[0]
+		map<int, int> trimmed;    //trimmed = start and stop of trimmed sequences for query
 		map<int, int>::iterator it;
 		
-		vector< vector<float> > Qav;	//Qav[0] is the vector of average variablility for queryseqs[0]... 
-		vector<float>  seqCoef;				//seqCoef[0] is the coeff for queryseqs[0]...
-		vector<float> DE;					//DE[0] is the deviaation for queryseqs[0]...
+		vector<float>  Qav;	//Qav is the vector of average variablility for query
+		float  seqCoef;		//seqCoef is the coeff for query
+		float DE;			//DE is the deviaation for query
 		vector<float> probabilityProfile;
 		vector< vector<float> > quantiles;  //quantiles[0] is the vector of deviations with ceiling score of 1, quantiles[1] is the vector of deviations with ceiling score of 2...
-		vector< set<int> > h;
-		
+		vector< vector<float> > quantilesMembers;  //quantiles[0] is the vector of deviations with ceiling score of 1, quantiles[1] is the vector of deviations with ceiling score of 2...
+		set<int>  h;
+		string mergedFilterString;
 		
-		vector<float> readFreq();
 		vector< vector<float> > readQuantiles();
-		vector<Sequence*> findPairs(int, int);
+		vector<float> readFreq();
+		Sequence* findPairs(Sequence*);
 			
-		void createProcessesSpots();
-		void createProcessesPairs();
-		void createProcesses();
 		void createProcessesQuan();
-		
-		
+		int doPrep();
+		void printQuanFile(string, string);
 		
 };