made classifier faster

[mothur.git] / classify.h

diff --git a/classify.h b/classify.h
index 1a34362ce798072d8554bb22a997b11dc16d223b..a2401dde6c10feaa4f83c6f3f7a65b8ff885dafd 100644 (file)
--- a/classify.h
+++ b/classify.h
@@ -26,13 +26,14 @@ class Sequence;
 class Classify {
 
 public:
-       Classify(string, string, string, int, float, float, float, float);
+       Classify();
        
-       virtual ~Classify(){  delete phyloTree; delete database;  };
+       virtual ~Classify(){  delete phyloTree; if (database != NULL) {  delete database; } };
        virtual string getTaxonomy(Sequence*) = 0;
        //virtual map<string, int> getConfidenceScores() { return taxConfidenceScore; }
        //virtual vector<string> parseTax(string);
        virtual string getSimpleTax()  { return simpleTax;      }
+       virtual void generateDatabaseAndNames(string, string, string, int, float, float, float, float);
        
 protected:
 
@@ -46,9 +47,10 @@ protected:
        string taxFile, templateFile, simpleTax;
        vector<string> names;
        
-       void readTaxonomy(string);
+       int readTaxonomy(string);
        vector<string> parseTax(string);
        MothurOut* m;
+       
 };
 
 /**************************************************************************************************/