added sequence name to error string in fastq.info. Changed np_shannon to npshannon.

[mothur.git] / unweighted.h

diff --git a/unweighted.h b/unweighted.h
index 598af1a9a561fb51a5861c9e26a4c1994b1d2ad3..e751d2e79d19f17a2dd3a9af34ea11be95586ef4 100644 (file)
--- 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<linePair> lines;
                
-               GlobalData* globaldata;
                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> >);