X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=parsimony.h;h=bf0e0d4f90198ef353c2c1899414f699454c8a7e;hp=fc905f2d3c432ab1ce4a05007e13ca0f14264fd0;hb=1a20e24ee786195ab0e1cccd4f5aede7a88f3f4e;hpb=c53ef46b40b97c00e32bfd8c3924ce8c51b5cd7b

diff --git a/parsimony.h b/parsimony.h
index fc905f2..bf0e0d4 100644
--- a/parsimony.h
+++ b/parsimony.h
@@ -12,18 +12,16 @@
  */
 
 #include "treecalculator.h"
-#include "treemap.h"
-#include "globaldata.hpp"
+#include "counttable.h"
 
 /***********************************************************************/
 
 class Parsimony : public TreeCalculator  {
 	
 	public:
-		Parsimony(TreeMap* t) : tmap(t) {};
+		Parsimony() {};
 		~Parsimony() {};
 		EstOutput getValues(Tree*, int, string);
-		//EstOutput getValues(Tree*, string, string) { return data; }
 		
 	private:
 		struct linePair {
@@ -33,14 +31,12 @@ class Parsimony : public TreeCalculator  {
 		};
 		vector<linePair> lines;
 	
-		GlobalData* globaldata;
 		EstOutput data;
-		TreeMap* tmap;
 		int processors;
 		string outputDir;
 	
-		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*);
 };
 
 /***********************************************************************/