X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=parsimonycommand.h;h=7f7ad893b74140087248edfd7deb7b8c3441e671;hb=541bab1dac00688b4c3a8c4a95ab464412663c50;hp=81fa99ba06c691f9e0ee06f4b73521655b046e8c;hpb=a44542a3c740cf957cff72ac71742f2fe48b0eaf;p=mothur.git

diff --git a/parsimonycommand.h b/parsimonycommand.h
index 81fa99b..7f7ad89 100644
--- a/parsimonycommand.h
+++ b/parsimonycommand.h
@@ -11,7 +11,7 @@
 
 #include "command.hpp"
 #include "parsimony.h"
-#include "treemap.h"
+#include "counttable.h"
 #include "progress.hpp"
 #include "sharedutilities.h"
 #include "fileoutput.h"
@@ -28,7 +28,9 @@ public:
 	vector<string> setParameters();
 	string getCommandName()			{ return "parsimony";				}
 	string getCommandCategory()		{ return "Hypothesis Testing";		}
+	
 	string getHelpString();	
+    string getOutputPattern(string);	
 	string getCitation() { return "Slatkin M, Maddison WP (1989). A cladistic measure of gene flow inferred from the phylogenies of alleles. Genetics 123: 603-13. \nSlatkin M, Maddison WP (1990). Detecting isolation by distance using phylogenies of genes. Genetics 126: 249-60. \nMartin AP (2002). Phylogenetic approaches for describing and comparing the diversity of microbial communities. Appl Environ Microbiol 68: 3673-82. \nSchloss PD, Handelsman J (2006). Introducing TreeClimber, a test to compare microbial community structure. Appl Environ Microbiol 72: 2379-84.\nhttp://www.mothur.org/wiki/Parsimony"; }
 	string getDescription()		{ return "generic test that describes whether two or more communities have the same structure"; }
 
@@ -36,17 +38,14 @@ public:
 	void help() { m->mothurOut(getHelpString()); }
 	
 private:
-	ReadTree* read;
-	SharedUtil* util;
 	FileOutput* output;
 	vector<Tree*> T;	   //user trees
 	Tree* randT;  //random tree
 	Tree* copyUserTree; 
-	TreeMap* tmap; 
-	TreeMap* savetmap;
-	Parsimony* pars;
+	CountTable* ct; 
+	CountTable* savect;
 	vector<string> groupComb; // AB. AC, BC...
-	string sumFile, randomtree, allGroups, outputDir, treefile, groupfile, namefile;
+	string sumFile, randomtree, allGroups, outputDir, treefile, groupfile, namefile, countfile;
 	int iters, numGroups, numComp, counter, processors, numUniquesInName;
 	vector<int> numEachGroup; //vector containing the number of sequences in each group the users wants for random distrib.
 	vector< vector<float> > userTreeScores; //scores for users trees for each comb.