X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=parsimonycommand.h;h=e093ceb2de8efbbacf2d58e4d46257563b0797c3;hb=f18d75f9c996cb619a5051a7664620c0c5ae05fb;hp=2881dc61e200540588691de3f205420139510561;hpb=010638fc7580c18a51f5ed650e9ee7589c8fb2d4;p=mothur.git

diff --git a/parsimonycommand.h b/parsimonycommand.h
index 2881dc6..e093ceb 100644
--- a/parsimonycommand.h
+++ b/parsimonycommand.h
@@ -12,6 +12,7 @@
 #include "command.hpp"
 #include "parsimony.h"
 #include "treemap.h"
+#include "progress.hpp"
 
 using namespace std;
 
@@ -32,27 +33,33 @@ class ParsimonyCommand : public Command {
 		TreeMap* tmap; 
 		TreeMap* savetmap;
 		Parsimony* pars;
-		string parsFile, sumFile, distFile, randomtree;
-		int iters, numGroups;
+		vector<string> groupComb; // AB. AC, BC...
+		string parsFile, parsFileout, sumFile, randomtree;
+		int iters, numGroups, numComp, counter;
 		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.
+		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, 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;
+		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.
+		map<int, double>::iterator it;
+		map<int, double>::iterator it2;
 		
-		ofstream out, outSum, outDist;
+		ofstream out, outSum;
+		ifstream inFile;
 		
 		void printParsimonyFile();  
 		void printUSummaryFile();
 		void getUserInput();
 		void setGroups();
+		void initFile(string);
+		void output(vector<double>);
+		void resetFile();
+
 		
 };