incorporation of nast-ier code / removed a cout

[mothur.git] / chimeraslayer.h

diff --git a/chimeraslayer.h b/chimeraslayer.h
index 6d57474829e51f44a9eca05021c937ba537cb610..ded0f89b1cb57c88c66777405d1c0d8de9df088d 100644 (file)
--- a/chimeraslayer.h
+++ b/chimeraslayer.h
@@ -19,37 +19,51 @@
 //This class was modeled after the chimeraSlayer written by the Broad Institute
 /***********************************************************************/
 
-
 class ChimeraSlayer : public Chimera {
        
        public:
-               ChimeraSlayer(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);
+               ChimeraSlayer(string, string, bool, map<string, int>&, string,  int, int, int, int, float, int, int, int, int, int, int, int, int, bool);
+
                ~ChimeraSlayer();
                
                int getChimeras(Sequence*);
-               int print(ostream&, ostream&);
+               Sequence* print(ostream&, ostream&);
+               Sequence* print(ostream&, ostream&, data_results, data_results);
                void printHeader(ostream&);
                int doPrep();
+               data_results getResults() { return printResults; }
                
                #ifdef USE_MPI
-               int print(MPI_File&, MPI_File&);
+               Sequence* print(MPI_File&, MPI_File&);
+               Sequence* print(MPI_File&, MPI_File&, data_results, data_results);
                #endif
                
        private:
                Sequence* querySeq;
+               Sequence trimQuery;
                DeCalculator* decalc;
-               map<int, int>  spotMap;
                Database* databaseRight;
                Database* databaseLeft;
-               
+               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
+       
                vector<data_struct>  chimeraResults;
+               data_results printResults;
                string chimeraFlags, searchMethod, fastafile;
-               bool realign;
+               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);
+               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);
                
 };