X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=parsimony.h;h=7316d508dd52729c8ddec87c34a08c76586cd4d1;hb=3cd964b03f04bc569c4a7d0b99be9908c54c1d44;hp=fc905f2d3c432ab1ce4a05007e13ca0f14264fd0;hpb=c53ef46b40b97c00e32bfd8c3924ce8c51b5cd7b;p=mothur.git diff --git a/parsimony.h b/parsimony.h index fc905f2..7316d50 100644 --- a/parsimony.h +++ b/parsimony.h @@ -13,17 +13,15 @@ #include "treecalculator.h" #include "treemap.h" -#include "globaldata.hpp" /***********************************************************************/ class Parsimony : public TreeCalculator { public: - Parsimony(TreeMap* t) : tmap(t) {}; + Parsimony() {}; ~Parsimony() {}; EstOutput getValues(Tree*, int, string); - //EstOutput getValues(Tree*, string, string) { return data; } private: struct linePair { @@ -33,14 +31,12 @@ class Parsimony : public TreeCalculator { }; vector lines; - GlobalData* globaldata; EstOutput data; - TreeMap* tmap; int processors; string outputDir; - EstOutput driver(Tree*, vector< vector >, int, int); - EstOutput createProcesses(Tree*, vector< vector >); + EstOutput driver(Tree*, vector< vector >, int, int, TreeMap*); + EstOutput createProcesses(Tree*, vector< vector >, TreeMap*); }; /***********************************************************************/