X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=treegroupscommand.h;h=7342b36584ce76b3b22a96d0e3ba885cb2ab172a;hb=ea4f373c28543cd1002b0dd7dc6e55c526647d59;hp=b0ae730d98aa8af6da4fecabe3cf0f7aa03df2d4;hpb=0cefb55a2616975bd4a144fc345693695ffc9bb6;p=mothur.git diff --git a/treegroupscommand.h b/treegroupscommand.h index b0ae730..7342b36 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::iterator MatData; - class TreeGroupCommand : public Command { public: @@ -107,7 +104,7 @@ private: NameAssignment* nameMap; ListVector* list; - TreeMap* tmap; + CountTable* ct; Tree* t; InputData* input; vector treeCalculators;