started shared utilities, updates to venn and heatmap added tree.groups command

[mothur.git] / unifracunweightedcommand.h

diff --git a/unifracunweightedcommand.h b/unifracunweightedcommand.h
index 3c250db030b04740e59df7ce24ba6b2752dc2023..3bd9a0db8915eb36c2e66174e8750c0fb1fab52a 100644 (file)
--- a/unifracunweightedcommand.h
+++ b/unifracunweightedcommand.h
@@ -13,6 +13,7 @@
 #include "command.hpp"
 #include "unweighted.h"
 #include "treemap.h"
+#include "sharedutilities.h"
 
 
 using namespace std;
@@ -23,15 +24,16 @@ class UnifracUnweightedCommand : public Command {
        
        public:
                UnifracUnweightedCommand();     
-               ~UnifracUnweightedCommand() { delete unweighted; }
+               ~UnifracUnweightedCommand() { delete unweighted; delete util; }
                int execute();  
        
        private:
                GlobalData* globaldata;
+               SharedUtil* util;
                vector<Tree*> T;           //user trees
                TreeMap* tmap;
                Unweighted* unweighted;
-               string sumFile, unweightedFile, unweightedFileout;
+               string sumFile, unweightedFile, unweightedFileout, allGroups;
                vector<string> groupComb; // AB. AC, BC...
                int iters, numGroups, numComp, counter;
                EstOutput userData;                     //unweighted score info for user tree
@@ -49,7 +51,6 @@ class UnifracUnweightedCommand : public Command {
                
                void printUWSummaryFile();
                void printUnweightedFile();
-               void setGroups();  
                void initFile(string);
                void output(vector<double>);
                void resetFile();