X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=unifracweightedcommand.cpp;h=e7009322c66ba8df3a7838fca8073bbfcd0034dd;hb=HEAD;hp=81ea326e67665cb006500ed8d04f273b15fca2b4;hpb=2cfb747aa8f63bde9c1114001e6d2e81ccd26178;p=mothur.git

diff --git a/unifracweightedcommand.cpp b/unifracweightedcommand.cpp
index 81ea326..e700932 100644
--- a/unifracweightedcommand.cpp
+++ b/unifracweightedcommand.cpp
@@ -359,7 +359,7 @@ int UnifracWeightedCommand::execute() {
                 variables["[tag]"] = toString(i+1);
                 string wFileName = getOutputFileName("weighted", variables);
                 output = new ColumnFile(wFileName, itersString);
-				outputNames.push_back(wFileName); outputTypes["wweighted"].push_back(wFileName);
+				outputNames.push_back(wFileName); outputTypes["weighted"].push_back(wFileName);
             } 
             
             userData = weighted.getValues(T[i], processors, outputDir); //userData[0] = weightedscore
@@ -408,7 +408,7 @@ int UnifracWeightedCommand::execute() {
                 delete newCt;
                 delete subSampleTree;
                 
-                if((thisIter+1) % 100 == 0){	m->mothurOut(toString(thisIter+1)); m->mothurOutEndLine();		}
+                if((thisIter+1) % 100 == 0){	m->mothurOutJustToScreen(toString(thisIter+1)+"\n"); 	}
             }
             
             if (m->control_pressed) { delete ct; for (int i = 0; i < T.size(); i++) { delete T[i]; } if (random) { delete output; } outSum.close(); for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]);  } return 0; }
@@ -699,14 +699,16 @@ int UnifracWeightedCommand::runRandomCalcs(Tree* thisTree, vector<double> usersS
         lines.clear();
         
         //breakdown work between processors
-        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));
+        int remainingPairs = namesOfGroupCombos.size();
+        int startIndex = 0;
+        for (int remainingProcessors = processors; remainingProcessors > 0; remainingProcessors--) {
+            int numPairs = remainingPairs; //case for last processor
+            if (remainingProcessors != 1) { numPairs = ceil(remainingPairs / remainingProcessors); }
+            lines.push_back(linePair(startIndex, numPairs)); //startIndex, numPairs
+            startIndex = startIndex + numPairs;
+            remainingPairs = remainingPairs - numPairs;
         }
+
         
         
         //get scores for random trees
@@ -766,7 +768,7 @@ int UnifracWeightedCommand::createProcesses(Tree* t, vector< vector<string> > na
 #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 		//loop through and create all the processes you want
 		while (process != processors) {
-			int pid = fork();
+			pid_t pid = fork();
 			
 			if (pid > 0) {
 				processIDS.push_back(pid);  //create map from line number to pid so you can append files in correct order later
@@ -776,7 +778,7 @@ int UnifracWeightedCommand::createProcesses(Tree* t, vector< vector<string> > na
 			
 				//pass numSeqs to parent
 				ofstream out;
-				string tempFile = outputDir + toString(getpid()) + ".weightedcommand.results.temp";
+				string tempFile = outputDir + m->mothurGetpid(process) + ".weightedcommand.results.temp";
 				m->openOutputFile(tempFile, out);
 				for (int i = lines[process].start; i < (lines[process].start + lines[process].num); i++) { out << scores[i][(scores[i].size()-1)] << '\t';  } out << endl;
 				out.close();
@@ -915,7 +917,7 @@ void UnifracWeightedCommand::printWeightedFile() {
 		for(int a = 0; a < numComp; a++) {
 			output->initFile(groupComb[a], tags);
 			//print each line
-			for (map<float,float>::iterator it = validScores.begin(); it != validScores.end(); it++) { 
+			for (map<double,double>::iterator it = validScores.begin(); it != validScores.end(); it++) {
 				data.push_back(it->first);  data.push_back(rScoreFreq[a][it->first]); data.push_back(rCumul[a][it->first]); 
 				output->output(data);
 				data.clear();
@@ -1085,7 +1087,7 @@ void UnifracWeightedCommand::calculateFreqsCumuls() {
 		for (int f = 0; f < numComp; f++) {
 			for (int i = 0; i < rScores[f].size(); i++) { //looks like 0,0,1,1,1,2,4,7...  you want to make a map that say rScoreFreq[0] = 2, rScoreFreq[1] = 3...
 				validScores[rScores[f][i]] = rScores[f][i];
-				map<float,float>::iterator it = rScoreFreq[f].find(rScores[f][i]);
+				map<double,double>::iterator it = rScoreFreq[f].find(rScores[f][i]);
 				if (it != rScoreFreq[f].end()) {
 					rScoreFreq[f][rScores[f][i]]++;
 				}else{
@@ -1098,9 +1100,9 @@ void UnifracWeightedCommand::calculateFreqsCumuls() {
 		for(int a = 0; a < numComp; a++) {
 			float rcumul = 1.0000;
 			//this loop fills the cumulative maps and put 0.0000 in the score freq map to make it easier to print.
-			for (map<float,float>::iterator it = validScores.begin(); it != validScores.end(); it++) {
+			for (map<double,double>::iterator it = validScores.begin(); it != validScores.end(); it++) {
 				//make rscoreFreq map and rCumul
-				map<float,float>::iterator it2 = rScoreFreq[a].find(it->first);
+				map<double,double>::iterator it2 = rScoreFreq[a].find(it->first);
 				rCumul[a][it->first] = rcumul;
 				//get percentage of random trees with that info
 				if (it2 != rScoreFreq[a].end()) {  rScoreFreq[a][it->first] /= iters; rcumul-= it2->second;  }