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);
+ EstOutput getValues(Tree*, string, string, int, string);
private:
struct linePair {
int num;
linePair(int i, int j) : start(i), num(j) {}
};
- vector<linePair*> lines;
+ vector<linePair> lines;
GlobalData* globaldata;
- Tree* copyTree;
EstOutput data;
TreeMap* tmap;
int processors;
string outputDir;
+ map< vector<string>, set<int> > rootForGrouping; //maps a grouping combo to the roots for that combo
+ bool includeRoot;
EstOutput driver(Tree*, vector< vector<string> >, int, int);
EstOutput createProcesses(Tree*, vector< vector<string> >);
-
+ EstOutput driver(Tree*, vector< vector<string> >, int, int, bool);
+ EstOutput createProcesses(Tree*, vector< vector<string> >, bool);
+ int getRoot(Tree*, int, vector<string>);
};
/***********************************************************************/