testing

[mothur.git] / chimera.h

diff --git a/chimera.h b/chimera.h
index da908ce07571a54148f561e28c16b94e8b09f68b..ef62b5357981272c93cd2c9869c5b507f0c1daaa 100644 (file)
--- a/chimera.h
+++ b/chimera.h
@@ -88,11 +88,11 @@ class Chimera {
 
        public:
        
-               Chimera(){};
-               Chimera(string);
-               Chimera(string, bool, string);
-               Chimera(string, string);
-               virtual ~Chimera(){};
+               Chimera(){ m = MothurOut::getInstance(); }
+               Chimera(string) { m = MothurOut::getInstance(); }
+               Chimera(string, bool, string) { m = MothurOut::getInstance(); }
+               Chimera(string, string) { m = MothurOut::getInstance(); }
+               virtual ~Chimera(){     for (int i = 0; i < templateSeqs.size(); i++) { delete templateSeqs[i];  } };
                virtual void setFilter(bool f)                  {       filter = f;                     }
                virtual void setCorrection(bool c)              {       correction = c;         }
                virtual void setProcessors(int p)               {       processors = p;         }
@@ -111,13 +111,13 @@ class Chimera {
                virtual void setMinBS(int b)                    {       minBS = b;                      }
                virtual void setMinSNP(int s)                   {       minSNP = s;                     }
                virtual void setIters(int i)                    {       iters = i;                      }
-               virtual void setTemplateSeqs(vector<Sequence*> t)       {       templateSeqs = t;       }
                virtual bool getUnaligned()                             {       return unaligned;                       }
-               virtual void setTemplateFile(string t)  {   templateFileName = t;       }
+               virtual void setTemplateFile(string t)  {   templateFileName = t;       templateSeqs = readSeqs(t);  }
+               virtual int getLength()                                 {   return length;      }
                
                virtual void setCons(string){};
                virtual void setQuantiles(string){};
-               virtual void doPrep(){};
+               virtual int doPrep(){ return 0; }
                virtual vector<Sequence*> readSeqs(string);
                virtual vector< vector<float> > readQuantiles();
                virtual void setMask(string);
@@ -127,17 +127,18 @@ class Chimera {
                virtual void printHeader(ostream&){};
                virtual int getChimeras(Sequence*){ return 0; }
                virtual int getChimeras(){ return 0; }
-               virtual void print(ostream&){}; 
+               virtual int print(ostream&, ostream&){ return 0; }
                
                
        protected:
                
                vector<Sequence*> templateSeqs;
                bool filter, correction, svg, unaligned;
-               int processors, window, increment, numWanted, kmerSize, match, misMatch, minSim, minCov, minBS, minSNP, parents, iters;
+               int processors, window, increment, numWanted, kmerSize, match, misMatch, minSim, minCov, minBS, minSNP, parents, iters, length;
                float divR;
                string seqMask, quanfile, filterString, name, outputDir, templateFileName;
                Sequence* getSequence(string);  //find sequence from name       
+               MothurOut* m;
 };
 
 /***********************************************************************/