X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=weighted.cpp;h=cf1291dfa91af84e4d821541b2a8f43a169d64f7;hp=cae2b92885632b697852babccd84d463b7a78564;hb=1a20e24ee786195ab0e1cccd4f5aede7a88f3f4e;hpb=fca3f55d5ded10c3dc77856f3cc4a1c53b02bb6f

diff --git a/weighted.cpp b/weighted.cpp
index cae2b92..cf1291d 100644
--- a/weighted.cpp
+++ b/weighted.cpp
@@ -13,15 +13,15 @@
 
 EstOutput Weighted::getValues(Tree* t, int p, string o) {
     try {
-		globaldata = GlobalData::getInstance();
-		
 		data.clear(); //clear out old values
 		int numGroups;
 		vector<double> D;
 		processors = p;
 		outputDir = o;
+        
+        CountTable* ct = t->getCountTable();
 		
-		numGroups = globaldata->Groups.size();
+		numGroups = m->getNumGroups();
 		
 		if (m->control_pressed) { return data; }
 		
@@ -31,14 +31,14 @@ EstOutput Weighted::getValues(Tree* t, int p, string o) {
 			for (int l = 0; l < i; l++) {	
 				//initialize weighted scores
 				//WScore[globaldata->Groups[i]+globaldata->Groups[l]] = 0.0;
-				vector<string> groups; groups.push_back(globaldata->Groups[i]); groups.push_back(globaldata->Groups[l]);
+				vector<string> groups; groups.push_back((m->getGroups())[i]); groups.push_back((m->getGroups())[l]);
 				namesOfGroupCombos.push_back(groups);
 			}
 		}
 		
-		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 			if(processors == 1){
-				data = driver(t, namesOfGroupCombos, 0, namesOfGroupCombos.size());
+				data = driver(t, namesOfGroupCombos, 0, namesOfGroupCombos.size(), ct);
 			}else{
 				int numPairs = namesOfGroupCombos.size();
 				
@@ -52,12 +52,12 @@ EstOutput Weighted::getValues(Tree* t, int p, string o) {
 					lines.push_back(linePair(startPos, numPairsPerProcessor));
 				}
 
-				data = createProcesses(t, namesOfGroupCombos);
+				data = createProcesses(t, namesOfGroupCombos, ct);
 				
 				lines.clear();
 			}
 		#else
-			data = driver(t, namesOfGroupCombos, 0, namesOfGroupCombos.size());
+			data = driver(t, namesOfGroupCombos, 0, namesOfGroupCombos.size(), ct);
 		#endif
 		
 		return data;
@@ -69,9 +69,9 @@ EstOutput Weighted::getValues(Tree* t, int p, string o) {
 }
 /**************************************************************************************************/
 
-EstOutput Weighted::createProcesses(Tree* t, vector< vector<string> > namesOfGroupCombos) {
+EstOutput Weighted::createProcesses(Tree* t, vector< vector<string> > namesOfGroupCombos, CountTable* ct) {
 	try {
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 		int process = 1;
 		vector<int> processIDS;
 		
@@ -87,9 +87,9 @@ EstOutput Weighted::createProcesses(Tree* t, vector< vector<string> > namesOfGro
 			}else if (pid == 0){
 	
 				EstOutput Myresults;
-				Myresults = driver(t, namesOfGroupCombos, lines[process].start, lines[process].num);
+				Myresults = driver(t, namesOfGroupCombos, lines[process].start, lines[process].num, ct);
 			
-				m->mothurOut("Merging results."); m->mothurOutEndLine();
+				//m->mothurOut("Merging results."); m->mothurOutEndLine();
 				
 				//pass numSeqs to parent
 				ofstream out;
@@ -110,7 +110,7 @@ EstOutput Weighted::createProcesses(Tree* t, vector< vector<string> > namesOfGro
 			}
 		}
 	
-		results = driver(t, namesOfGroupCombos, lines[0].start, lines[0].num);
+		results = driver(t, namesOfGroupCombos, lines[0].start, lines[0].num, ct);
 	
 		//force parent to wait until all the processes are done
 		for (int i=0;i<(processors-1);i++) { 
@@ -141,10 +141,10 @@ EstOutput Weighted::createProcesses(Tree* t, vector< vector<string> > namesOfGro
 				m->gobble(in);
 			}
 			in.close();
-			remove(s.c_str());
+			m->mothurRemove(s);
 		}
 		
-		m->mothurOut("DONE."); m->mothurOutEndLine(); m->mothurOutEndLine();
+		//m->mothurOut("DONE."); m->mothurOutEndLine(); m->mothurOutEndLine();
 		
 		return results;
 #endif		
@@ -155,7 +155,7 @@ EstOutput Weighted::createProcesses(Tree* t, vector< vector<string> > namesOfGro
 	}
 }
 /**************************************************************************************************/
-EstOutput Weighted::driver(Tree* t, vector< vector<string> > namesOfGroupCombos, int start, int num) { 
+EstOutput Weighted::driver(Tree* t, vector< vector<string> > namesOfGroupCombos, int start, int num, CountTable* ct) { 
  try {
 		EstOutput results;
 		vector<double> D;
@@ -179,7 +179,7 @@ EstOutput Weighted::driver(Tree* t, vector< vector<string> > namesOfGroupCombos,
 				int numSeqsInGroupI = it->second;
 				
 				double sum = getLengthToRoot(t, t->groupNodeInfo[groupA][j], groupA, groupB);
-				double weightedSum = ((numSeqsInGroupI * sum) / (double)tmap->seqsPerGroup[groupA]);
+				double weightedSum = ((numSeqsInGroupI * sum) / (double)ct->getGroupCount(groupA));
 			
 				D[count] += weightedSum;
 			}
@@ -190,7 +190,7 @@ EstOutput Weighted::driver(Tree* t, vector< vector<string> > namesOfGroupCombos,
 				int numSeqsInGroupL = it->second;
 				
 				double sum = getLengthToRoot(t, t->groupNodeInfo[groupB][j], groupA, groupB);
-				double weightedSum = ((numSeqsInGroupL * sum) / (double)tmap->seqsPerGroup[groupB]);
+				double weightedSum = ((numSeqsInGroupL * sum) / (double)ct->getGroupCount(groupB));
 			
 				D[count] += weightedSum;
 			}
@@ -216,7 +216,7 @@ EstOutput Weighted::driver(Tree* t, vector< vector<string> > namesOfGroupCombos,
 				it = t->tree[i].pcount.find(groupA);
 				//if it does u = # of its descendants with a certain group / total number in tree with a certain group
 				if (it != t->tree[i].pcount.end()) {
-					u = (double) t->tree[i].pcount[groupA] / (double) tmap->seqsPerGroup[groupA];
+					u = (double) t->tree[i].pcount[groupA] / (double) ct->getGroupCount(groupA);
 				}else { u = 0.00; }
 				
 				
@@ -225,7 +225,7 @@ EstOutput Weighted::driver(Tree* t, vector< vector<string> > namesOfGroupCombos,
 				
 				//if it does subtract their percentage from u
 				if (it != t->tree[i].pcount.end()) {
-					u -= (double) t->tree[i].pcount[groupB] / (double) tmap->seqsPerGroup[groupB];
+					u -= (double) t->tree[i].pcount[groupB] / (double) ct->getGroupCount(groupB);
 				}
 				
 				if (includeRoot) {
@@ -267,9 +267,10 @@ EstOutput Weighted::driver(Tree* t, vector< vector<string> > namesOfGroupCombos,
 /**************************************************************************************************/
 EstOutput Weighted::getValues(Tree* t, string groupA, string groupB) { 
  try {
-		globaldata = GlobalData::getInstance();
 		
 		data.clear(); //clear out old values
+     
+        CountTable* ct = t->getCountTable();
 		
 		if (m->control_pressed) { return data; }
 		
@@ -286,7 +287,7 @@ EstOutput Weighted::getValues(Tree* t, string groupA, string groupB) {
 			int numSeqsInGroupI = it->second;
 			
 			double sum = getLengthToRoot(t, t->groupNodeInfo[groups[0]][j], groups[0], groups[1]);
-			double weightedSum = ((numSeqsInGroupI * sum) / (double)tmap->seqsPerGroup[groups[0]]);
+			double weightedSum = ((numSeqsInGroupI * sum) / (double)ct->getGroupCount(groups[0]));
 		
 			D += weightedSum;
 		}
@@ -297,7 +298,7 @@ EstOutput Weighted::getValues(Tree* t, string groupA, string groupB) {
 			int numSeqsInGroupL = it->second;
 			
 			double sum = getLengthToRoot(t, t->groupNodeInfo[groups[1]][j], groups[0], groups[1]);
-			double weightedSum = ((numSeqsInGroupL * sum) / (double)tmap->seqsPerGroup[groups[1]]);
+			double weightedSum = ((numSeqsInGroupL * sum) / (double)ct->getGroupCount(groups[1]));
 		
 			D += weightedSum;
 		}
@@ -313,7 +314,7 @@ EstOutput Weighted::getValues(Tree* t, string groupA, string groupB) {
 			it = t->tree[i].pcount.find(groupA);
 			//if it does u = # of its descendants with a certain group / total number in tree with a certain group
 			if (it != t->tree[i].pcount.end()) {
-				u = (double) t->tree[i].pcount[groupA] / (double) tmap->seqsPerGroup[groupA];
+				u = (double) t->tree[i].pcount[groupA] / (double) ct->getGroupCount(groupA);
 			}else { u = 0.00; }
 			
 			
@@ -321,7 +322,7 @@ EstOutput Weighted::getValues(Tree* t, string groupA, string groupB) {
 			it = t->tree[i].pcount.find(groupB);
 			//if it does subtract their percentage from u
 			if (it != t->tree[i].pcount.end()) {
-				u -= (double) t->tree[i].pcount[groupB] / (double) tmap->seqsPerGroup[groupB];
+				u -= (double) t->tree[i].pcount[groupB] / (double) ct->getGroupCount(groupB);
 			}
 			
 			if (includeRoot) {