X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=weighted.h;h=d4082fe9c82a7aeeb41aeaad62f016d0ec588d4d;hb=196c22d0f93ba48e8ec54ab76608b6e3ba5e68cc;hp=180409ce2dbad5da67b570a7ca4a3666c61ae3b3;hpb=0caf3fbabaa3ece404f8ce77f4c883dc5b1bf1dc;p=mothur.git diff --git a/weighted.h b/weighted.h index 180409c..d4082fe 100644 --- a/weighted.h +++ b/weighted.h @@ -12,7 +12,7 @@ */ #include "treecalculator.h" -#include "treemap.h" +#include "counttable.h" /***********************************************************************/ @@ -41,8 +41,8 @@ class Weighted : public TreeCalculator { map< vector, set > rootForGrouping; //maps a grouping combo to the root 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, CountTable*); + EstOutput createProcesses(Tree*, vector< vector >, CountTable*); double getLengthToRoot(Tree*, int, string, string); };