Merge remote-tracking branch 'origin/master'

[mothur.git] / unifracweightedcommand.h

diff --git a/unifracweightedcommand.h b/unifracweightedcommand.h
index ddbdc8548dad7e0545d75f8e98cd92fdb76a3419..06354ce5cbeed8dc7c1629a482c65d9381b40e04 100644 (file)
--- a/unifracweightedcommand.h
+++ b/unifracweightedcommand.h
@@ -28,7 +28,8 @@ class UnifracWeightedCommand : public Command {
                vector<string> setParameters();
                string getCommandName()                 { return "unifrac.weighted";            }
                string getCommandCategory()             { return "Hypothesis Testing";          }
-               string getHelpString(); 
+               string getOutputFileNameTag(string, string);
+       string getHelpString(); 
                string getCitation() { return "Lozupone CA, Hamady M, Kelley ST, Knight R (2007). Quantitative and qualitative beta diversity measures lead to different insights into factors that structure microbial communities. Appl Environ Microbiol 73: 1576-85. \nhttp://www.mothur.org/wiki/Unifrac.weighted"; }
                string getDescription()         { return "generic tests that describes whether two or more communities have the same structure"; }
 
@@ -59,7 +60,7 @@ class UnifracWeightedCommand : public Command {
                bool abort, phylip, random, includeRoot, subsample, consensus;
                string groups, itersString, outputForm, treefile, groupfile, namefile;
                vector<string> Groups, outputNames; //holds groups to be used
-               int processors, numUniquesInName, subsampleSize, subsampleIters;
+               int processors, subsampleSize, subsampleIters;
                ofstream outSum;
                map<string, string> nameMap;