working on get.communitytype command

[mothur.git] / sffinfocommand.h

diff --git a/sffinfocommand.h b/sffinfocommand.h
index 5ec6e72239d0772548ce10f584ebccb435230d25..1909e2d43e6d83b3d48ef06922b2d369a0e104d5 100644 (file)
--- a/sffinfocommand.h
+++ b/sffinfocommand.h
@@ -11,7 +11,7 @@
  */
 
 #include "command.hpp"
-
+#include "groupmap.h"
 
 /**********************************************************/
 struct CommonHeader {
@@ -79,24 +79,27 @@ public:
        void help() { m->mothurOut(getHelpString()); }  
        
 private:
-       string sffFilename, sfftxtFilename, outputDir, accnosName, currentFileName, oligosfile, noMatchFile;
-       vector<string> filenames, outputNames, accnosFileNames, oligosFileNames;
-       bool abort, fasta, qual, trim, flow, sfftxt, hasAccnos, hasOligos;
-       int mycount, split, numFPrimers, numLinkers, numSpacers, pdiffs, bdiffs, ldiffs, sdiffs, tdiffs;
+       string sffFilename, sfftxtFilename, outputDir, accnosName, currentFileName, oligosfile, noMatchFile, groupfile;
+       vector<string> filenames, outputNames, accnosFileNames, oligosFileNames, groupFileNames;
+       bool abort, fasta, qual, trim, flow, sfftxt, hasAccnos, hasOligos, hasGroup;
+       int mycount, split, numFPrimers, numLinkers, numSpacers, pdiffs, bdiffs, ldiffs, sdiffs, tdiffs, numNoMatch;
        set<string> seqNames;
     map<string, int> barcodes;
     map<string, int> primers;
+    GroupMap* groupMap;
     vector<string> linker, spacer, primerNameVector, barcodeNameVector, revPrimer;
     vector<vector<int> > numSplitReads;
-    vector<vector<string> > filehandles, filehandlesHeaders;
+    vector<vector<string> > filehandles;
+    vector<vector<string> > filehandlesHeaders;
     
        //extract sff file functions
        int extractSffInfo(string, string, string);
        int readCommonHeader(ifstream&, CommonHeader&);
-       //int readHeader(ifstream&, Header&);
-       int readSeqData(ifstream&, seqRead&, int, Header&);
+       int readHeader(ifstream&, Header&);
+       bool readSeqData(ifstream&, seqRead&, int, Header&);
        int decodeName(string&, string&, string&, string);
     bool readOligos(string oligosFile);
+    bool readGroup(string oligosFile);
        
        int printCommonHeader(ofstream&, CommonHeader&); 
        int printHeader(ofstream&, Header&);
@@ -109,6 +112,7 @@ private:
        bool sanityCheck(Header&, seqRead&);
     int adjustCommonHeader(CommonHeader);
     int findGroup(Header header, seqRead read, int& barcode, int& primer);
+    int findGroup(Header header, seqRead read, int& barcode, int& primer, string);
     string reverseOligo(string oligo);
     
        //parsesfftxt file functions