fixes while testing 1.33.0

[mothur.git] / parsefastaqcommand.h

diff --git a/parsefastaqcommand.h b/parsefastaqcommand.h
index b4d90e542a98f329dd166a93c54d57852e0f54dd..2ac141626b4b528d352d2860dc64e65826e22357 100644 (file)
--- a/parsefastaqcommand.h
+++ b/parsefastaqcommand.h
@@ -12,6 +12,20 @@
 
 
 #include "command.hpp"
+#include "trimoligos.h"
+#include "sequence.hpp"
+#include "groupmap.h"
+
+struct fastqRead2 {
+    string quality;
+       Sequence seq;
+    string wholeRead;
+       
+       fastqRead2() {  };
+       fastqRead2(Sequence s, string q, string w) : seq(s), quality(q), wholeRead(w){};
+       ~fastqRead2() {};
+};
+
 
 class ParseFastaQCommand : public Command {
 
@@ -21,7 +35,7 @@ public:
        ~ParseFastaQCommand() {}
        
        vector<string> setParameters();
-       string getCommandName()                 { return "parse.fastq";         }
+       string getCommandName()                 { return "fastq.info";          }
        string getCommandCategory()             { return "Sequence Processing"; }
        
        string getHelpString(); 
@@ -35,11 +49,29 @@ public:
 private:
 
        vector<string> outputNames;     
-       string outputDir, fastaQFile, format;
-       bool abort, fasta, qual;
+       string outputDir, fastaQFile, format, oligosfile, groupfile;
+       bool abort, fasta, qual, pacbio, pairedOligos;
+    int pdiffs, bdiffs, ldiffs, sdiffs, tdiffs, split;
+    GroupMap* groupMap;
+    
+    //oligos file data structures
+    vector<string> linker, spacer, primerNameVector, barcodeNameVector, revPrimer;
+       map<string, int> barcodes;
+       map<string, int> primers;
+    map<int, oligosPair> pairedBarcodes;
+    map<int, oligosPair> pairedPrimers;
+    vector<vector<string> > fastqFileNames;
+    string noMatchFile;
        
        vector<int> convertQual(string);
     vector<char> convertTable;
+    bool readOligos(string oligosFile);
+    bool readGroup(string oligosFile);
+    string reverseOligo(string oligo);
+    fastqRead2 readFastq(ifstream&, bool&);
+    int findGroup(fastqRead2, int&, int&, TrimOligos*&, int, int);
+    int findGroup(fastqRead2, int&, int&, string);
+    
 };
 
 #endif