X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=treegroupscommand.h;h=6790afb73984377c1aba8f6488a3cf1c2e544280;hb=6ede3bf5c0a9eedb23f24577a97da81ab3e1f7df;hp=a0e0d420163cabdfe46518873cc3a42d98bc14a6;hpb=49d2b7459c5027557564b21e9487dadafbbbdc96;p=mothur.git diff --git a/treegroupscommand.h b/treegroupscommand.h index a0e0d42..6790afb 100644 --- a/treegroupscommand.h +++ b/treegroupscommand.h @@ -19,7 +19,6 @@ #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::iterator MatData; - class TreeGroupCommand : public Command { public: @@ -101,12 +98,10 @@ private: Tree* createTree(vector< vector >&); void printSims(ostream&, vector< vector >&); int makeSimsShared(); - vector< vector > makeSimsDist(); + vector< vector > makeSimsDist(SparseDistanceMatrix*); int writeTree(string, Tree*); int driver(vector, int, int, vector< vector >&); - ReadMatrix* readMatrix; - SparseMatrix* matrix; NameAssignment* nameMap; ListVector* list; TreeMap* tmap;