X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=parsimonycommand.h;h=6fa1914f31e320517ff89389a34fc3e5a1cd6dc6;hb=cfe70bbc94980a0177af465d3464db754673bd56;hp=5429e77acf8411bd3836e3cc6fa3b1a23db24a5a;hpb=d037597badc8d18e235c59f0c1114180edb7f98f;p=mothur.git

diff --git a/parsimonycommand.h b/parsimonycommand.h
index 5429e77..6fa1914 100644
--- a/parsimonycommand.h
+++ b/parsimonycommand.h
@@ -9,53 +9,59 @@
  *
  */
 
-#include <iostream>
-#include <fstream>
-#include <vector>
-#include <map>
-#include <cmath>
 #include "command.hpp"
 #include "parsimony.h"
 #include "treemap.h"
+#include "progress.hpp"
+#include "sharedutilities.h"
+#include "fileoutput.h"
 
-using namespace std;
 
 class GlobalData;
 
 class ParsimonyCommand : public Command {
+
+public:
+	ParsimonyCommand(string);	
+	~ParsimonyCommand() { if (abort == false) { delete pars; delete util; delete output; }  }
+	int execute();	
+	void help();
+
+private:
+	GlobalData* globaldata;
+	SharedUtil* util;
+	FileOutput* output;
+	vector<Tree*> T;	   //user trees
+	Tree* randT;  //random tree
+	Tree* copyUserTree; 
+	TreeMap* tmap; 
+	TreeMap* savetmap;
+	Parsimony* pars;
+	vector<string> groupComb; // AB. AC, BC...
+	string sumFile, randomtree, allGroups, outputDir;
+	int iters, numGroups, numComp, counter;
+	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.
+	vector< vector<float> > UScoreSig;  //tree score signifigance when compared to random trees - percentage of random trees with that score or lower.
+	EstOutput userData;			//pscore info for user tree
+	EstOutput randomData;		//pscore info for random trees
+	map<int, double>  validScores;  //map contains scores from both user and random
+	vector< map<int, double> > rscoreFreq;  //map <pscore, number of random trees with that score.> -vector entry for each combination.
+	vector< map<int, double> > uscoreFreq;  //map <pscore, number of user trees with that score.> -vector entry for each combination.
+	vector< map<int, double> > rCumul;  //map <pscore, cumulative percentage of number of random trees with that score or lower.> -vector entry for each combination.
+	vector< map<int, double> > uCumul;  //map <pscore, cumulative percentage of number of user trees with that score or lower .> -vector entry for each combination.
+	
+	ofstream outSum;
 	
-	public:
-		ParsimonyCommand();	
-		~ParsimonyCommand() { delete pars; }
-		int execute();	
+
+	bool abort;
+	string groups, itersString;
+	vector<string> Groups, outputNames; //holds groups to be used
+
+	void printParsimonyFile();  
+	int printUSummaryFile();
+	void getUserInput();
 	
-	private:
-		GlobalData* globaldata;
-		vector<Tree*> T;	   //user trees
-		Tree* randT;  //random tree
-		TreeMap* tmap;
-		Parsimony* pars;
-		string parsFile, sumFile, distFile;
-		int iters, randomtree, numGroups;
-		vector<int> numEachGroup; //vector containing the number of sequences in each group the users wants for random distrib.
-		vector<float> userTreeScores; //scores for users trees
-		vector<float> UScoreSig;  //tree score signifigance when compared to random trees - percentage of random trees with that score or lower.
-		EstOutput userData;			//pscore info for user tree
-		EstOutput randomData;		//pscore info for random trees
-		map<int, float> validScores;  //contains scores from both user and random
-		map<int, float> rscoreFreq;  //pscore, number of random trees with that score.
-		map<int, float> uscoreFreq;  //pscore, number of user trees with that score.
-		map<int, float> rCumul;  //pscore, cumulative percentage of number of random trees with that score or lower.
-		map<int, float> uCumul;  //pscore, cumulative percentage of number of user trees with that score or lower .
-		map<int, float>::iterator it;
-		map<int, float>::iterator it2;
-		
-		ofstream out, outSum, outDist;
-		
-		void printParsimonyFile();  
-		void printUSummaryFile();
-		void getUserInput();
-		
 };