X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=classify.h;h=bd9f34bc7eb3f51b6b360ce4b4f18251f194e155;hb=cad05a21b084833b07808c1586e755be48fe7e1a;hp=1a34362ce798072d8554bb22a997b11dc16d223b;hpb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;p=mothur.git

diff --git a/classify.h b/classify.h
index 1a34362..bd9f34b 100644
--- a/classify.h
+++ b/classify.h
@@ -26,13 +26,11 @@ class Sequence;
 class Classify {
 
 public:
-	Classify(string, string, string, int, float, float, float, float);
-	
-	virtual ~Classify(){  delete phyloTree; delete database;  };
+	Classify();
+	virtual ~Classify(){};
 	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 +44,10 @@ protected:
 	string taxFile, templateFile, simpleTax;
 	vector<string> names;
 	
-	void readTaxonomy(string);
+	int readTaxonomy(string);
 	vector<string> parseTax(string);
 	MothurOut* m;
+	
 };
 
 /**************************************************************************************************/