fixed multiple bugs for 1.4 release

[mothur.git] / treegroupscommand.h

diff --git a/treegroupscommand.h b/treegroupscommand.h
index 10a2e31c88ea6a177b55a6a2e8f19f99d07e520d..3f145e92b4780fa4f40a45ed1849150dafffc800 100644 (file)
--- a/treegroupscommand.h
+++ b/treegroupscommand.h
@@ -17,6 +17,10 @@
 #include "validcalculator.h"
 #include "tree.h"
 #include "treemap.h"
+#include "readmatrix.hpp"
+#include "readcolumn.h"
+#include "readphylip.h"
+#include "sparsematrix.hpp"
 
 
 /* This command create a tree file for each similarity calculator at distance level, using various calculators to find the similiarity between groups. 
@@ -25,6 +29,8 @@
        
 class GlobalData;
 
+typedef list<PCell>::iterator MatData;
+
 class TreeGroupCommand : public Command {
        
 public:
@@ -35,9 +41,15 @@ public:
 private:
        void createTree();
        void printSims(ostream&);
+       void makeSimsShared();
+       void makeSimsDist();
        
        GlobalData* globaldata;
        ReadOTUFile* read;
+       ReadMatrix* readMatrix;
+       SparseMatrix* matrix;
+       NameAssignment* nameMap;
+       ListVector* list;
        TreeMap* tmap;
        Tree* t;
        vector<Calculator*> treeCalculators;
@@ -46,9 +58,10 @@ private:
        InputData* input;
        ValidCalculators* validCalculator;
        vector<SharedRAbundVector*> lookup;
-       string format, outputFile, groupNames;
+       string format, outputFile, groupNames, filename;
        int numGroups;
        ofstream out;
+       float precision, cutoff;
 
 };