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

[mothur.git] / treegroupscommand.h

diff --git a/treegroupscommand.h b/treegroupscommand.h
index d3c1b3e47615fb6d3b342c8d41758aa7b9d9178a..b0ae730d98aa8af6da4fecabe3cf0f7aa03df2d4 100644 (file)
--- a/treegroupscommand.h
+++ b/treegroupscommand.h
@@ -81,6 +81,7 @@ public:
        vector<string> setParameters();
        string getCommandName()                 { return "tree.shared";                         }
        string getCommandCategory()             { return "OTU-Based Approaches";        }
+       string getOutputFileNameTag(string, string);
        string getHelpString(); 
        string getCitation() { return "http://www.mothur.org/wiki/Tree.shared"; }
        string getDescription()         { return "generate a tree file that describes the dissimilarity among groups"; }
@@ -100,12 +101,10 @@ private:
        Tree* createTree(vector< vector<double> >&);
        void printSims(ostream&, vector< vector<double> >&);
        int makeSimsShared();
-       vector< vector<double> > makeSimsDist();
+       vector< vector<double> > makeSimsDist(SparseDistanceMatrix*);
     int writeTree(string, Tree*);
     int driver(vector<SharedRAbundVector*>, int, int, vector< vector<seqDist> >&);
        
-       ReadMatrix* readMatrix;
-       SparseMatrix* matrix;
        NameAssignment* nameMap;
        ListVector* list;
        TreeMap* tmap;