X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=unweighted.h;h=b136b007b517e56645be544ee6556f83a45de649;hb=79ca496859f48f1c38803c0f7c603faac348fe4c;hp=c6c13bb3a7abd14c824dfe6b495871790809833d;hpb=f55cf350ca6643f8eb070d8336e1957699a3f109;p=mothur.git diff --git a/unweighted.h b/unweighted.h index c6c13bb..b136b00 100644 --- a/unweighted.h +++ b/unweighted.h @@ -12,7 +12,7 @@ */ #include "treecalculator.h" -#include "treemap.h" +#include "counttable.h" /***********************************************************************/ @@ -38,10 +38,10 @@ class Unweighted : public TreeCalculator { map< vector, set > rootForGrouping; //maps a grouping combo to the roots for that combo bool includeRoot; - EstOutput driver(Tree*, vector< vector >, int, int, TreeMap*); - EstOutput createProcesses(Tree*, vector< vector >, TreeMap*); - EstOutput driver(Tree*, vector< vector >, int, int, bool, TreeMap*); - EstOutput createProcesses(Tree*, vector< vector >, bool, TreeMap*); + EstOutput driver(Tree*, vector< vector >, int, int, CountTable*); + EstOutput createProcesses(Tree*, vector< vector >, CountTable*); + EstOutput driver(Tree*, vector< vector >, int, int, bool, CountTable*); + EstOutput createProcesses(Tree*, vector< vector >, bool, CountTable*); int getRoot(Tree*, int, vector); };