X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=classify.h;h=7b4c1022fef35aacbc33824d99ede551e55b187c;hp=f13224a14fe456d8acc0a868047145492b9e62e6;hb=1a20e24ee786195ab0e1cccd4f5aede7a88f3f4e;hpb=ef3f6d42fe720cd6d91419e5e32f8c04d8765010

diff --git a/classify.h b/classify.h
index f13224a..7b4c102 100644
--- a/classify.h
+++ b/classify.h
@@ -15,29 +15,26 @@
 
 #include "mothur.h"
 #include "database.hpp"
-#include "doTaxonomy.h"
-
+#include "phylotree.h"
 
 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 bool getFlipped()  { return flipped;	}
+	virtual void generateDatabaseAndNames(string, string, string, int, float, float, float, float);
+	virtual void setDistName(string s) {} //for knn, so if distance method is selected with knn you can create the smallest distance file in the right place.
 	
 protected:
 
 	map<string, string> taxonomy;  //name maps to taxonomy
-	//map<string, int> genusCount;  //maps genus to count - in essence a list of how many seqs are in each taxonomy
 	map<string, int>::iterator itTax;
 	map<string, string>::iterator it;
 	Database* database;
@@ -45,10 +42,14 @@ protected:
 	
 	string taxFile, templateFile, simpleTax;
 	vector<string> names;
-	//map<string, int> taxConfidenceScore;
+	int threadID, numLevels, numTaxa;
+	bool flip, flipped, shortcuts;
 	
-	void readTaxonomy(string);
+	int readTaxonomy(string);
 	vector<string> parseTax(string);
+    double getLogExpSum(vector<double>, int&);
+	MothurOut* m;
+	
 };
 
 /**************************************************************************************************/