removed make count from make.contigs

[mothur.git] / weighted.h

diff --git a/weighted.h b/weighted.h
index ca9f0378ffc96b545912742e10aab2242651558a..d4082fe9c82a7aeeb41aeaad62f016d0ec588d4d 100644 (file)
--- a/weighted.h
+++ b/weighted.h
@@ -12,14 +12,14 @@
  */
 
 #include "treecalculator.h"
-#include "treemap.h"
+#include "counttable.h"
 
 /***********************************************************************/
 
 class Weighted : public TreeCalculator  {
        
        public:
-               Weighted(TreeMap* t) : tmap(t) {};
+        Weighted( bool r) : includeRoot(r) {};
                ~Weighted() {};
                
                EstOutput getValues(Tree*, string, string);
@@ -33,16 +33,16 @@ class Weighted : public TreeCalculator  {
                };
                vector<linePair> lines;
 
-               GlobalData* globaldata;
                EstOutput data;
-               TreeMap* tmap;
                map<string, int>::iterator it;
                map<string, double> WScore; //a score for each group combination i.e. AB, AC, BC.
                int processors;
                string outputDir;
+               map< vector<string>, set<int> > rootForGrouping;  //maps a grouping combo to the root 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, CountTable*); 
+               EstOutput createProcesses(Tree*, vector< vector<string> >, CountTable*);
                double getLengthToRoot(Tree*, int, string, string);
 };