added sparseDistanceMatrix class. Modified cluster commands to use the new sparse...

[mothur.git] / classify.h

diff --git a/classify.h b/classify.h
index 03142353feb8af7b8488007e5367144602a45acf..4e0354782e5063e2a52268e88a1412b40db3c28e 100644 (file)
--- a/classify.h
+++ b/classify.h
@@ -11,11 +11,11 @@
  */
 
 
-/* This class is a parent to phylotyp, bayesian, knn.  */
+/* This class is a parent to bayesian, knn.  */
 
 #include "mothur.h"
 #include "database.hpp"
-#include "doTaxonomy.h"
+#include "phylotree.h"
 
 
 class Sequence;
@@ -26,14 +26,13 @@ class Sequence;
 class Classify {
 
 public:
-       Classify(string, string, string, int, int, int, int, int);
-       Classify(){     delete phyloTree;  }
-       
+       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:
 
@@ -46,10 +45,13 @@ protected:
        
        string taxFile, templateFile, simpleTax;
        vector<string> names;
-       //map<string, int> taxConfidenceScore;
+       int threadID;
+       bool flip, flipped;
        
-       void readTaxonomy(string);
+       int readTaxonomy(string);
        vector<string> parseTax(string);
+       MothurOut* m;
+       
 };
 
 /**************************************************************************************************/