X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=unweighted.h;h=e751d2e79d19f17a2dd3a9af34ea11be95586ef4;hb=2bb9267aa4b4ecdf8488b06605cc9f3f36fa4332;hp=598af1a9a561fb51a5861c9e26a4c1994b1d2ad3;hpb=edad2fa8defaa6856b3606a215bf64b91340eeb4;p=mothur.git diff --git a/unweighted.h b/unweighted.h index 598af1a..e751d2e 100644 --- a/unweighted.h +++ b/unweighted.h @@ -19,7 +19,7 @@ class Unweighted : public TreeCalculator { public: - Unweighted(TreeMap* t) : tmap(t) {}; + Unweighted(TreeMap* t, bool r) : tmap(t), includeRoot(r) {}; ~Unweighted() {}; EstOutput getValues(Tree*, int, string); EstOutput getValues(Tree*, string, string, int, string); @@ -32,12 +32,12 @@ class Unweighted : public TreeCalculator { }; vector lines; - GlobalData* globaldata; EstOutput data; TreeMap* tmap; int processors; string outputDir; map< vector, set > rootForGrouping; //maps a grouping combo to the roots for that combo + bool includeRoot; EstOutput driver(Tree*, vector< vector >, int, int); EstOutput createProcesses(Tree*, vector< vector >);