X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=unifracunweightedcommand.h;h=91f005c2500b9011b9149f3b7a18996c00af5c6f;hb=3a13eff5c26d6fc156a299c9fa7f5497bded94a0;hp=c6fc46ac0bce0437b2d04315442fcf33e045b4d3;hpb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;p=mothur.git diff --git a/unifracunweightedcommand.h b/unifracunweightedcommand.h index c6fc46a..91f005c 100644 --- a/unifracunweightedcommand.h +++ b/unifracunweightedcommand.h @@ -23,7 +23,12 @@ class UnifracUnweightedCommand : public Command { public: UnifracUnweightedCommand(string); - ~UnifracUnweightedCommand() { delete unweighted; delete util; } + UnifracUnweightedCommand(); + ~UnifracUnweightedCommand() { globaldata->Groups.clear(); if (abort == false) { delete unweighted; delete util; } } + vector getRequiredParameters(); + vector getValidParameters(); + vector getRequiredFiles(); + map > getOutputFiles() { return outputTypes; } int execute(); void help(); @@ -36,7 +41,7 @@ class UnifracUnweightedCommand : public Command { Unweighted* unweighted; string sumFile, allGroups; vector groupComb; // AB. AC, BC... - int iters, numGroups, numComp, counter; + int iters, numGroups, numComp, counter, processors; EstOutput userData; //unweighted score info for user tree EstOutput randomData; //unweighted score info for random trees vector< vector > utreeScores; //scores for users trees for each comb. @@ -48,6 +53,7 @@ class UnifracUnweightedCommand : public Command { bool abort, phylip, random; string groups, itersString, outputDir; vector Groups, outputNames; //holds groups to be used + map > outputTypes; ofstream outSum, out; ifstream inFile;