X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=treegroupscommand.h;h=b29670ae614205a7ee286116379ddda86f0e7cf9;hb=e8e13c129ba8184ec5932a090773f353f3ae3406;hp=a0e0d420163cabdfe46518873cc3a42d98bc14a6;hpb=49d2b7459c5027557564b21e9487dadafbbbdc96;p=mothur.git

diff --git a/treegroupscommand.h b/treegroupscommand.h
index a0e0d42..b29670a 100644
--- a/treegroupscommand.h
+++ b/treegroupscommand.h
@@ -15,11 +15,10 @@
 #include "groupmap.h"
 #include "validcalculator.h"
 #include "tree.h"
-#include "treemap.h"
+#include "counttable.h"
 #include "readmatrix.hpp"
 #include "readcolumn.h"
 #include "readphylip.h"
-#include "sparsematrix.hpp"
 #include "sharedsobscollectsummary.h"
 #include "sharedchao1.h"
 #include "sharedace.h"
@@ -69,8 +68,6 @@
 	They can also use as many or as few calculators as they wish. */
 	
 
-typedef list<PCell>::iterator MatData;
-
 class TreeGroupCommand : public Command {
 	
 public:
@@ -101,21 +98,19 @@ 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;
+	CountTable* ct;
 	Tree* t;
     InputData* input;
 	vector<Calculator*> treeCalculators;
 	vector<SharedRAbundVector*> lookup;
 	string lastLabel;
-	string format, groupNames, filename, sharedfile, inputfile;
+	string format, groupNames, filename, sharedfile, countfile, inputfile;
 	int numGroups, subsampleSize, iters, processors;
 	ofstream out;
 	float precision, cutoff;