X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=parsimony.cpp;h=fc1a8b6f48821a3d66aa1fb9c70799260c56c241;hb=dbc9352256135d7b3e2b17dddc5c506770e2df92;hp=6239f75f08a59c9a5f690401e15ef93c19fe8f50;hpb=d97b619c4297b1274c754d73a64792ba656b0a79;p=mothur.git

diff --git a/parsimony.cpp b/parsimony.cpp
index 6239f75..fc1a8b6 100644
--- a/parsimony.cpp
+++ b/parsimony.cpp
@@ -10,58 +10,121 @@
 #include "parsimony.h"
 
 /**************************************************************************************************/
+
 EstOutput Parsimony::getValues(Tree* t) {
 	try {
 		globaldata = GlobalData::getInstance();
+		vector<string> groups;
 		
-		data.resize(1,0);
-			
-		int score = 0;
-			
-		for(int i=t->getNumLeaves();i<t->getNumNodes();i++){
-			int lc = t->tree[i].getLChild();
-			int rc = t->tree[i].getRChild();
-			
-			int iSize = 0;
-			int rcSize = 0;
-			int lcSize = 0;
-
-			//add in all the groups the users wanted
-			for (it = t->tree[i].pGroups.begin(); it != t->tree[i].pGroups.end(); it++) {
-				if (inUsersGroups(it->first, globaldata->Groups) == true) {  iSize++;  }
+		copyTree = new Tree();
+		
+		//if the users enters no groups then give them the score of all groups
+		int numGroups = globaldata->Groups.size();
+		
+		//calculate number of comparsions
+		int numComp = 0;
+		for (int r=0; r<numGroups; r++) { 
+			for (int l = r+1; l < numGroups; l++) {
+				numComp++;
 			}
+		}
 
-			//if that leaves no groups give it 1 so it will cause no change to parent
-			if (iSize == 0) { iSize++; }
-			
-			//add in all the groups the users wanted
-			for (it = t->tree[rc].pGroups.begin(); it != t->tree[rc].pGroups.end(); it++) {
+		//numComp+1 for AB, AC, BC, ABC
+		data.resize(numComp+1,0);
+		
+		int count = 0;
+		for (int a=0; a<numGroups; a++) { 
+			for (int l = a+1; l < numGroups; l++) {
+				int score = 0;
+				
+				//groups in this combo
+				groups.push_back(globaldata->Groups[a]); groups.push_back(globaldata->Groups[l]);
+				
+				//copy users tree so that you can redo pgroups 
+				copyTree->getCopy(t);
 
-				if (inUsersGroups(it->first, globaldata->Groups) == true) {  rcSize++;  }
-			}
+				//create pgroups that reflect the groups the user want to use
+				for(int i=copyTree->getNumLeaves();i<copyTree->getNumNodes();i++){
+					copyTree->tree[i].pGroups = (copyTree->mergeUserGroups(i, groups));
+				}
+		
+				for(int i=copyTree->getNumLeaves();i<copyTree->getNumNodes();i++){
+					int lc = copyTree->tree[i].getLChild();
+					int rc = copyTree->tree[i].getRChild();
 			
-			//if that leaves no groups give it 1 so it will cause no change to parent
-			if (rcSize == 0) { rcSize++; }
-
+					int iSize = copyTree->tree[i].pGroups.size();
+					int rcSize = copyTree->tree[rc].pGroups.size();
+					int lcSize = copyTree->tree[lc].pGroups.size();
+		
+					//if isize are 0 then that branch is to be ignored
+					if (iSize == 0) { }
+					else if ((rcSize == 0) || (lcSize == 0)) { }
+					//if you have more groups than either of your kids then theres been a change.
+					else if(iSize > rcSize || iSize > lcSize){
+						score++;
+					}
+				} 
 				
-			//add in all the groups the users wanted
-			for (it = t->tree[lc].pGroups.begin(); it != t->tree[lc].pGroups.end(); it++) {
-
-				if (inUsersGroups(it->first, globaldata->Groups) == true) {  lcSize++;  }
+				data[count] = score;
+				count++;
+				groups.clear();
+			}
+		}
+		
+		if (numComp != 1) {
+			if (numGroups == 0) {
+				//get score for all users groups
+				for (int i = 0; i < tmap->namesOfGroups.size(); i++) {
+					groups.push_back(tmap->namesOfGroups[i]);
+				}
+			}else {
+				for (int i = 0; i < globaldata->Groups.size(); i++) {
+					groups.push_back(globaldata->Groups[i]);
+				}
 			}
 			
-			//if that leaves no groups give it 1 so it will cause no change to parent
-			if (lcSize == 0) { lcSize++; }
-
-
-			//if you have more groups than either of your kids then theres been a change.
-			 if(iSize > rcSize || iSize > lcSize){
-				score++;
-
+			//copy users tree so that you can redo pgroups 
+			copyTree->getCopy(t);
+			int score = 0;
+		
+			//create pgroups that reflect the groups the user want to use
+			for(int i=copyTree->getNumLeaves();i<copyTree->getNumNodes();i++){
+//				cout << i << "..." << endl;
+				copyTree->tree[i].pGroups = (copyTree->mergeUserGroups(i, groups));
 			}
-		} 
 		
-		data[0] = score;
+//			map<string,int>::iterator it;
+			
+			for(int i=copyTree->getNumLeaves();i<copyTree->getNumNodes();i++){
+				int lc = copyTree->tree[i].getLChild();
+				int rc = copyTree->tree[i].getRChild();
+			
+				int iSize = copyTree->tree[i].pGroups.size();
+				int rcSize = copyTree->tree[rc].pGroups.size();
+				int lcSize = copyTree->tree[lc].pGroups.size();
+				
+//				cout << i+1 << '\t' << lc+1 << '\t' << rc+1 << ":\t";
+				
+//				for(it=copyTree->tree[i].pGroups.begin();it!=copyTree->tree[i].pGroups.end();it++){
+//					cout << it->first << '\t';
+//				}
+				
+//				cout << " : " << iSize << '\t' << rcSize << '\t' << lcSize << '\t';
+					
+				//if isize are 0 then that branch is to be ignored
+				if (iSize == 0) { }
+				else if ((rcSize == 0) || (lcSize == 0)) { }
+				//if you have more groups than either of your kids then theres been a change.
+				else if(iSize > rcSize || iSize > lcSize){
+					score++;
+				}
+//				cout << score << endl;
+			} 
+		
+			data[count] = score;
+			string hold;
+//			cin >> hold;
+		}
 		
 		return data;
 	}
@@ -76,3 +139,5 @@ EstOutput Parsimony::getValues(Tree* t) {
 
 }
 
+/**************************************************************************************************/
+