X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=parsimony.h;h=b116aa2d1a55e0ba84571f1f4c9500c6be5d8fcc;hb=8dd3c225255d7084e3aff8740aa4f1f1cabb367a;hp=11d4cc859b2c35295a273780499485ac70e1c052;hpb=5a3592c6478d5d786ec20e4bee71854ad92fdb8c;p=mothur.git

diff --git a/parsimony.h b/parsimony.h
index 11d4cc8..b116aa2 100644
--- a/parsimony.h
+++ b/parsimony.h
@@ -13,7 +13,6 @@
 
 #include "treecalculator.h"
 #include "treemap.h"
-#include "globaldata.hpp"
 
 /***********************************************************************/
 
@@ -22,15 +21,26 @@ class Parsimony : public TreeCalculator  {
 	public:
 		Parsimony(TreeMap* t) : tmap(t) {};
 		~Parsimony() {};
-		EstOutput getValues(Tree*);
-		EstOutput getValues(Tree*, string, string) { return data; };
+		EstOutput getValues(Tree*, int, string);
+		//EstOutput getValues(Tree*, string, string) { return data; }
 		
 	private:
-		GlobalData* globaldata;
+		struct linePair {
+			int start;
+			int num;
+			linePair(int i, int j) : start(i), num(j) {}
+		};
+		vector<linePair> lines;
+	
 		EstOutput data;
 		TreeMap* tmap;
-		map<string, int>::iterator it;
+		int processors;
+		string outputDir;
+	
+		EstOutput driver(Tree*, vector< vector<string> >, int, int); 
+		EstOutput createProcesses(Tree*, vector< vector<string> >);
 };
 
 /***********************************************************************/
-#endif
\ No newline at end of file
+
+#endif