X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=parsimonycommand.cpp;h=1a493bd86df990266d4504a5e938a7e78e721f44;hb=3c5c4e255ee8c36feb9e97aebc4e792e6ff8c440;hp=534ff0b1ab940a4b9398cc457a3f03a5d1381384;hpb=692e0c1f69a78b568dc85cbdcea9fb6c189e2e6c;p=mothur.git

diff --git a/parsimonycommand.cpp b/parsimonycommand.cpp
index 534ff0b..1a493bd 100644
--- a/parsimonycommand.cpp
+++ b/parsimonycommand.cpp
@@ -25,33 +25,8 @@ ParsimonyCommand::ParsimonyCommand() {
 			openOutputFile(parsFile, out);
 			sumFile = globaldata->getTreeFile() + ".psummary";
 			openOutputFile(sumFile, outSum);
-			distFile = globaldata->getTreeFile() + ".pdistrib";
-			openOutputFile(distFile, outDist);
-			
-			//if the user has not entered specific groups to analyze then do them all
-			if (globaldata->Groups.size() != 0) {
-				//check that groups are valid
-				for (int i = 0; i < globaldata->Groups.size(); i++) {
-					if (tmap->isValidGroup(globaldata->Groups[i]) != true) {
-						cout << globaldata->Groups[i] << " is not a valid group, and will be disregarded." << endl;
-						// erase the invalid group from globaldata->Groups
-						globaldata->Groups.erase (globaldata->Groups.begin()+i);
-					}
-				}
-			
-				//if the user only entered invalid groups
-				if (globaldata->Groups.size() == 0) { 
-					cout << "When using the groups parameter you must have at least 1 valid group. I will run the command using all the groups in your groupfile." << endl; 
-					for (int i = 0; i < tmap->namesOfGroups.size(); i++) {
-						globaldata->Groups.push_back(tmap->namesOfGroups[i]);
-					}
-				}		
-			}else {
-				for (int i = 0; i < tmap->namesOfGroups.size(); i++) {
-					globaldata->Groups.push_back(tmap->namesOfGroups[i]);
-				}
-			}
-
+			//set users groups to analyze
+			setGroups();
 		}else { //user wants random distribution
 			savetmap = globaldata->gTreemap;
 			getUserInput();
@@ -80,15 +55,15 @@ int ParsimonyCommand::execute() {
 		userData.resize(1,0);  //data[0] = pscore.
 		randomData.resize(1,0);  //data[0] = pscore.
 		
-		//format output
-		outDist.setf(ios::fixed, ios::floatfield); outDist.setf(ios::showpoint);
-		outDist << "RandomTree#" << '\t' << "ParsScore" << endl;
-		
 		if (randomtree == "") {
+			copyUserTree = new Tree();
 			//get pscores for users trees
 			for (int i = 0; i < T.size(); i++) {
+				//copy users tree so that you can redo pgroups 
+				copyUserTree->getCopy(T[i]);
 				cout << "Processing tree " << i+1 << endl;
-				userData = pars->getValues(T[i]);  //userData[0] = pscore
+				userData = pars->getValues(copyUserTree);  //userData[0] = pscore
+				cout << "Tree " << i+1 << " parsimony score = " << userData[0] << endl;
 				//update uscoreFreq
 				it = uscoreFreq.find(userData[0]);
 				if (it == uscoreFreq.end()) {//new score
@@ -123,9 +98,6 @@ int ParsimonyCommand::execute() {
 				//add randoms score to validscores
 				validScores[randomData[0]] = randomData[0];
 				
-				//output info to pdistrib file
-				outDist << j+1 << '\t'<< '\t' << randomData[0] << endl;
-					
 				delete randT;
 			}
 		}else {
@@ -189,7 +161,7 @@ int ParsimonyCommand::execute() {
 		//reset randomTree parameter to ""
 		globaldata->setRandomTree("");
 		//reset groups parameter
-		globaldata->Groups.clear();
+		globaldata->Groups.clear();  globaldata->setGroups("");
 		
 		return 0;
 		
@@ -312,3 +284,49 @@ void ParsimonyCommand::getUserInput() {
 }
 /***********************************************************/
 
+void ParsimonyCommand::setGroups() {
+	try {
+		//if the user has not entered specific groups to analyze then do them all
+		if (globaldata->Groups.size() != 0) {
+			if (globaldata->Groups[0] != "all") {
+				//check that groups are valid
+				for (int i = 0; i < globaldata->Groups.size(); i++) {
+					if (tmap->isValidGroup(globaldata->Groups[i]) != true) {
+						cout << globaldata->Groups[i] << " is not a valid group, and will be disregarded." << endl;
+						// erase the invalid group from globaldata->Groups
+						globaldata->Groups.erase (globaldata->Groups.begin()+i);
+					}
+				}
+			
+				//if the user only entered invalid groups
+				if (globaldata->Groups.size() == 0) { 
+					cout << "When using the groups parameter you must have at least 1 valid group. I will run the command using all the groups in your groupfile." << endl; 
+					for (int i = 0; i < tmap->namesOfGroups.size(); i++) {
+						globaldata->Groups.push_back(tmap->namesOfGroups[i]);
+					}
+				}
+			}else{//user has enter "all" and wants the default groups
+				for (int i = 0; i < tmap->namesOfGroups.size(); i++) {
+					globaldata->Groups.push_back(tmap->namesOfGroups[i]);
+				}
+				globaldata->setGroups("");
+			}
+		}else {
+			for (int i = 0; i < tmap->namesOfGroups.size(); i++) {
+				globaldata->Groups.push_back(tmap->namesOfGroups[i]);
+			}
+		}
+	}
+	catch(exception& e) {
+		cout << "Standard Error: " << e.what() << " has occurred in the ParsimonyCommand class Function setGroups. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		exit(1);
+	}
+	catch(...) {
+		cout << "An unknown error has occurred in the ParsimonyCommand class function setGroups. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+		exit(1);
+	}		
+
+}
+/*****************************************************************/
+
+