major change to the tree class to use the count table class instead of tree map....

[mothur.git] / unifracweightedcommand.h

diff --git a/unifracweightedcommand.h b/unifracweightedcommand.h
index 06354ce5cbeed8dc7c1629a482c65d9381b40e04..fead41b0e8cb5dae95eed551ff76427b8c8d85f3 100644 (file)
--- a/unifracweightedcommand.h
+++ b/unifracweightedcommand.h
@@ -12,7 +12,7 @@
 
 #include "command.hpp"
 #include "weighted.h"
-#include "treemap.h"
+#include "counttable.h"
 #include "progress.hpp"
 #include "sharedutilities.h"
 #include "fileoutput.h"
@@ -43,7 +43,7 @@ class UnifracWeightedCommand : public Command {
                        linePair(int i, int j) : start(i), num(j) {}
                };
                vector<linePair> lines;
-        TreeMap* tmap;
+        CountTable* ct;
                FileOutput* output;
                vector<Tree*> T;           //user trees
                vector<double> utreeScores;  //user tree unweighted scores
@@ -58,7 +58,7 @@ class UnifracWeightedCommand : public Command {
                map<float, float>  validScores;  //map contains scores from random
                
                bool abort, phylip, random, includeRoot, subsample, consensus;
-               string groups, itersString, outputForm, treefile, groupfile, namefile;
+               string groups, itersString, outputForm, treefile, groupfile, namefile, countfile;
                vector<string> Groups, outputNames; //holds groups to be used
                int processors, subsampleSize, subsampleIters;
                ofstream outSum;
@@ -73,7 +73,7 @@ class UnifracWeightedCommand : public Command {
                int createProcesses(Tree*,  vector< vector<string> >,  vector< vector<double> >&);
                int driver(Tree*, vector< vector<string> >, int, int,  vector< vector<double> >&);
         int runRandomCalcs(Tree*, vector<double>);
-        vector<Tree*> buildTrees(vector< vector<double> >&, int, TreeMap&);
+        vector<Tree*> buildTrees(vector< vector<double> >&, int, CountTable&);
         int getConsensusTrees(vector< vector<double> >&, int);
         int getAverageSTDMatrices(vector< vector<double> >&, int);