Merge remote-tracking branch 'mothur/master'

[mothur.git] / chimeraslayer.h

diff --git a/chimeraslayer.h b/chimeraslayer.h
index 8c3cbb22994cb4956f5752806a76bf5b9b1361df..c409c503da43a78f707d83a448372d9ef03595d7 100644 (file)
--- a/chimeraslayer.h
+++ b/chimeraslayer.h
@@ -24,8 +24,9 @@
 class ChimeraSlayer : public Chimera {
        
        public:
-               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(string, string, bool, string, int, int, int, int, float, int, int, int, int, int, int, int, int, bool, string, int);
+               ChimeraSlayer(string, string, bool, map<string, int>&, string,  int, int, int, int, float, int, int, int, int, int, int, int, int, bool, string, int);
+               ChimeraSlayer(string, string, bool, map<string, int>&, string,  int, int, int, int, float, int, int, int, int, int, int, int, int, bool, string, int, bool);
 
                ~ChimeraSlayer();
                
@@ -50,11 +51,11 @@ class ChimeraSlayer : public Chimera {
                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
-               int numNoParents;
+               int numNoParents, threadID;
        
                vector<data_struct>  chimeraResults;
                data_results printResults;
-               string chimeraFlags, searchMethod, fastafile;
+               string chimeraFlags, searchMethod, fastafile, blastlocation;
                bool realign, trimChimera;
                int window, numWanted, kmerSize, match, misMatch, minSim, minCov, minBS, minSNP, parents, iters, increment;
                float divR;