X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=unweighted.cpp;h=a845f9bc2fa54a5c27b0d74aed20929f1aeb756f;hp=56694e32e3a977b08df087dfc8deeabb2524564c;hb=cf9987b67aa49777a4c91c2d21f96e58bf17aa82;hpb=67ea6ccd74dbd64828d31b952808255f206364ff

diff --git a/unweighted.cpp b/unweighted.cpp
index 56694e3..a845f9b 100644
--- a/unweighted.cpp
+++ b/unweighted.cpp
@@ -49,31 +49,21 @@ EstOutput Unweighted::getValues(Tree* t, int p, string o) {
 				namesOfGroupCombos.push_back(groups);
 			}
 		}
+        
+        lines.clear();
+        int numPairs = namesOfGroupCombos.size();
+        int numPairsPerProcessor = numPairs / processors;
+        
+        for (int i = 0; i < processors; i++) {
+            int startPos = i * numPairsPerProcessor;
+            if(i == processors - 1){ numPairsPerProcessor = numPairs - i * numPairsPerProcessor; }
+            lines.push_back(linePair(startPos, numPairsPerProcessor));
+        }
+        
+        data = createProcesses(t, namesOfGroupCombos, ct);
 
-		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
-			if(processors == 1){
-				data = driver(t, namesOfGroupCombos, 0, namesOfGroupCombos.size(), ct);
-			}else{
-				int numPairs = namesOfGroupCombos.size();
-				
-				int numPairsPerProcessor = numPairs / processors;
-				
-				for (int i = 0; i < processors; i++) {
-					int startPos = i * numPairsPerProcessor;
-			
-					if(i == processors - 1){
-						numPairsPerProcessor = numPairs - i * numPairsPerProcessor;
-					}
-		
-					lines.push_back(linePair(startPos, numPairsPerProcessor));
-				}
-				data = createProcesses(t, namesOfGroupCombos, ct);
-				lines.clear();
-			}
-		#else
-			data = driver(t, namesOfGroupCombos, 0, namesOfGroupCombos.size(), ct);
-		#endif
-		
+        lines.clear();
+        
 		return data;
 	}
 	catch(exception& e) {
@@ -85,11 +75,12 @@ EstOutput Unweighted::getValues(Tree* t, int p, string o) {
 
 EstOutput Unweighted::createProcesses(Tree* t, vector< vector<string> > namesOfGroupCombos, CountTable* ct) {
 	try {
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
-		int process = 1;
+        int process = 1;
 		vector<int> processIDS;
 		
 		EstOutput results;
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
+		
 		
 		//loop through and create all the processes you want
 		while (process != processors) {
@@ -155,11 +146,47 @@ EstOutput Unweighted::createProcesses(Tree* t, vector< vector<string> > namesOfG
 			in.close();
 			m->mothurRemove(s);
 		}
+#else
+		//fill in functions
+        vector<unweightedData*> pDataArray;
+		DWORD   dwThreadIdArray[processors-1];
+		HANDLE  hThreadArray[processors-1];
+        vector<CountTable*> cts;
+        vector<Tree*> trees;
+		
+		//Create processor worker threads.
+		for( int i=1; i<processors; i++ ){
+            CountTable* copyCount = new CountTable();
+            copyCount->copy(ct);
+            Tree* copyTree = new Tree(copyCount);
+            copyTree->getCopy(t);
+            
+            cts.push_back(copyCount);
+            trees.push_back(copyTree);
+            
+            unweightedData* tempweighted = new unweightedData(m, lines[i].start, lines[i].num, namesOfGroupCombos, copyTree, copyCount, includeRoot);
+			pDataArray.push_back(tempweighted);
+			processIDS.push_back(i);
+            
+			hThreadArray[i-1] = CreateThread(NULL, 0, MyUnWeightedThreadFunction, pDataArray[i-1], 0, &dwThreadIdArray[i-1]);
+		}
+		
+		results = driver(t, namesOfGroupCombos, lines[0].start, lines[0].num, ct);
 		
-		//m->mothurOut("DONE."); m->mothurOutEndLine(); m->mothurOutEndLine();
+		//Wait until all threads have terminated.
+		WaitForMultipleObjects(processors-1, hThreadArray, TRUE, INFINITE);
 		
-		return results;
-#endif		
+		//Close all thread handles and free memory allocations.
+		for(int i=0; i < pDataArray.size(); i++){
+            for (int j = 0; j < pDataArray[i]->results.size(); j++) {  results.push_back(pDataArray[i]->results[j]);  }
+			delete cts[i];
+            delete trees[i];
+			CloseHandle(hThreadArray[i]);
+			delete pDataArray[i];
+		}
+
+#endif	
+        return results;
 	}
 	catch(exception& e) {
 		m->errorOut(e, "Unweighted", "createProcesses");
@@ -175,10 +202,7 @@ EstOutput Unweighted::driver(Tree* t, vector< vector<string> > namesOfGroupCombo
 		
 		int count = 0;
 		int total = num;
-		int twentyPercent = (total * 0.20);
-		if (twentyPercent == 0) { twentyPercent = 1; }
-	 
-			
+					
 		for (int h = start; h < (start+num); h++) {
 				
 			if (m->control_pressed) { return results; }
@@ -240,12 +264,7 @@ EstOutput Unweighted::driver(Tree* t, vector< vector<string> > namesOfGroupCombo
 			}
 			count++;
 
-			//report progress
-			//if((count % twentyPercent) == 0) {	float tempOut = (count / (float)total); if (isnan(tempOut) || isinf(tempOut)) { tempOut = 0.0; } m->mothurOut("Percentage complete: " + toString((int(tempOut) * 100.0))); m->mothurOutEndLine();	}
-		}
-		
-		//report progress
-		//if((count % twentyPercent) != 0) {	float tempOut = (count / (float)total); if (isnan(tempOut) || isinf(tempOut)) { tempOut = 0.0; } m->mothurOut("Percentage complete: " + toString((int(tempOut) * 100.0))); m->mothurOutEndLine();	}
+        }
 		
 		return results; 
 	}
@@ -294,31 +313,20 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB, int p, st
 				namesOfGroupCombos.push_back(groups);
 			}
 		}
+     
+        lines.clear();
+        int numPairs = namesOfGroupCombos.size();
+        int numPairsPerProcessor = numPairs / processors;
+     
+        for (int i = 0; i < processors; i++) {
+            int startPos = i * numPairsPerProcessor;
+            if(i == processors - 1){ numPairsPerProcessor = numPairs - i * numPairsPerProcessor; }
+            lines.push_back(linePair(startPos, numPairsPerProcessor));
+        }
+     
+        data = createProcesses(t, namesOfGroupCombos, true, ct);
+        lines.clear();
 
-		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
-			if(processors == 1){
-				data = driver(t, namesOfGroupCombos, 0, namesOfGroupCombos.size(), true, ct);
-			}else{
-				int numPairs = namesOfGroupCombos.size();
-				
-				int numPairsPerProcessor = numPairs / processors;
-				
-				for (int i = 0; i < processors; i++) {
-					int startPos = i * numPairsPerProcessor;
-					if(i == processors - 1){
-						numPairsPerProcessor = numPairs - i * numPairsPerProcessor;
-					}
-					lines.push_back(linePair(startPos, numPairsPerProcessor));
-				}
-					
-				data = createProcesses(t, namesOfGroupCombos, true, ct);
-				
-				lines.clear();
-			}
-		#else
-			data = driver(t, namesOfGroupCombos, 0, namesOfGroupCombos.size(), true, ct);
-		#endif
-	
 		return data;
 	}
 	catch(exception& e) {
@@ -330,12 +338,12 @@ EstOutput Unweighted::getValues(Tree* t, string groupA, string groupB, int p, st
 
 EstOutput Unweighted::createProcesses(Tree* t, vector< vector<string> > namesOfGroupCombos, bool usingGroups, CountTable* ct) {
 	try {
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
-		int process = 1;
+        int process = 1;
 		vector<int> processIDS;
 		
 		EstOutput results;
-		
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
+
 		//loop through and create all the processes you want
 		while (process != processors) {
 			int pid = fork();
@@ -399,9 +407,51 @@ EstOutput Unweighted::createProcesses(Tree* t, vector< vector<string> > namesOfG
 			in.close();
 			m->mothurRemove(s);
 		}
+#else
+       //for some reason it doesn't seem to be calculating hte random trees scores.  all scores are the same even though copytree appears to be randomized.
+        
+        /*
+        //fill in functions
+        vector<unweightedData*> pDataArray;
+		DWORD   dwThreadIdArray[processors-1];
+		HANDLE  hThreadArray[processors-1];
+        vector<CountTable*> cts;
+        vector<Tree*> trees;
+		
+		//Create processor worker threads.
+		for( int i=1; i<processors; i++ ){
+            CountTable* copyCount = new CountTable();
+            copyCount->copy(ct);
+            Tree* copyTree = new Tree(copyCount);
+            copyTree->getCopy(t);
+            
+            cts.push_back(copyCount);
+            trees.push_back(copyTree);
+            
+            unweightedData* tempweighted = new unweightedData(m, lines[i].start, lines[i].num, namesOfGroupCombos, copyTree, copyCount, includeRoot);
+			pDataArray.push_back(tempweighted);
+			processIDS.push_back(i);
+            
+			hThreadArray[i-1] = CreateThread(NULL, 0, MyUnWeightedRandomThreadFunction, pDataArray[i-1], 0, &dwThreadIdArray[i-1]);
+		}
+		
+		results = driver(t, namesOfGroupCombos, lines[0].start, lines[0].num, usingGroups, ct);
 		
-		return results;
-#endif		
+		//Wait until all threads have terminated.
+		WaitForMultipleObjects(processors-1, hThreadArray, TRUE, INFINITE);
+		
+		//Close all thread handles and free memory allocations.
+		for(int i=0; i < pDataArray.size(); i++){
+            for (int j = 0; j < pDataArray[i]->results.size(); j++) {  results.push_back(pDataArray[i]->results[j]);  }
+			delete cts[i];
+            delete trees[i];
+			CloseHandle(hThreadArray[i]);
+			delete pDataArray[i];
+		}	*/
+        
+        results = driver(t, namesOfGroupCombos, 0, namesOfGroupCombos.size(), usingGroups, ct);
+#endif
+        return results;
 	}
 	catch(exception& e) {
 		m->errorOut(e, "Unweighted", "createProcesses");
@@ -481,7 +531,7 @@ EstOutput Unweighted::driver(Tree* t, vector< vector<string> > namesOfGroupCombo
 				if (isnan(UW) || isinf(UW)) { UW = 0; }
 				
 				results[count] = UW;
-			}
+            }
 			count++;
 			
 		}