X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trimoligos.h;h=d72b8146d36bc659ec13ddffc28463ef4a7b8204;hb=767c2ab76d70664af19b1afca8e1fd5233962698;hp=fb8f74dcb4f309387ccf3caa923354a466c9fccb;hpb=cc19310422f125d6628980bd1148e1e816792382;p=mothur.git

diff --git a/trimoligos.h b/trimoligos.h
index fb8f74d..d72b814 100644
--- a/trimoligos.h
+++ b/trimoligos.h
@@ -29,16 +29,18 @@ class TrimOligos {
 	public:
         TrimOligos(int,int, map<string, int>, map<string, int>, vector<string>); //pdiffs, bdiffs, primers, barcodes, revPrimers
         TrimOligos(int,int, int, int, map<string, int>, map<string, int>, vector<string>, vector<string>, vector<string>); //pdiffs, bdiffs, ldiffs, sdiffs, primers, barcodes, revPrimers, linker, spacer
-        TrimOligos(int,int, int, int, map<int, oligosPair>, map<int, oligosPair>, vector<string>, vector<string>); //pdiffs, bdiffs, ldiffs, sdiffs, primers, barcodes, linker, spacer
+        TrimOligos(int,int, int, int, map<int, oligosPair>, map<int, oligosPair>); //pdiffs, bdiffs, ldiffs, sdiffs, primers, barcodes
 		~TrimOligos();
 	
 		int stripBarcode(Sequence&, int&);	
 		int stripBarcode(Sequence&, QualityScores&, int&);
         int stripBarcode(Sequence&, Sequence&, QualityScores&, QualityScores&, int&);
+        int stripBarcode(Sequence&, Sequence&, int&);
     	
 		int stripForward(Sequence&, int&);
 		int stripForward(Sequence&, QualityScores&, int&, bool);
         int stripForward(Sequence&, Sequence&, QualityScores&, QualityScores&, int&);
+        int stripForward(Sequence&, Sequence&, int&);
 	
 		bool stripReverse(Sequence&);
 		bool stripReverse(Sequence&, QualityScores&);
@@ -48,6 +50,11 @@ class TrimOligos {
     
         bool stripSpacer(Sequence&);
         bool stripSpacer(Sequence&, QualityScores&);
+    
+        //seq, primerStart, primerEnd
+        bool findForward(Sequence&, int&, int&);
+        bool findReverse(Sequence&, int&, int&);
+    
 				
 	
 	private:
@@ -58,8 +65,14 @@ class TrimOligos {
 		vector<string> revPrimer;
         vector<string> linker;
         vector<string> spacer;
-        map<int, oligosPair> ibarcodes;
-        map<int, oligosPair> iprimers;
+        map<string, vector<int> > ifbarcodes;
+        map<string, vector<int> > ifprimers;
+        map<string, vector<int> > irbarcodes;
+        map<string, vector<int> > irprimers;
+        map<int, oligosPair> ipbarcodes;
+        map<int, oligosPair> ipprimers;
+    
+        int maxFBarcodeLength, maxRBarcodeLength, maxFPrimerLength, maxRPrimerLength, maxLinkerLength, maxSpacerLength;
 	
 		MothurOut* m;