X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=metastatscommand.cpp;h=c5d349bc77b685b67a1e3251fa70f15602bb215d;hb=e339f9008daa7d37c9a9034829565620a6abe783;hp=59916492213cf56c8851969876b1df7907f26f23;hpb=597560b3c23f03d0069082cf096ce65e0c087519;p=mothur.git

diff --git a/metastatscommand.cpp b/metastatscommand.cpp
index 5991649..c5d349b 100644
--- a/metastatscommand.cpp
+++ b/metastatscommand.cpp
@@ -8,7 +8,6 @@
  */
 
 #include "metastatscommand.h"
-#include "metastats.h"
 #include "sharedutilities.h"
 
 
@@ -343,7 +342,7 @@ int MetaStatsCommand::process(vector<SharedRAbundVector*>& thisLookUp){
 				}else{
 					int process = 1;
 					vector<int> processIDS;
-		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+		#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 					//loop through and create all the processes you want
 					while (process != processors) {
 						int pid = fork();
@@ -483,12 +482,13 @@ int MetaStatsCommand::driver(int start, int num, vector<SharedRAbundVector*>& th
 				m->mothurOut("Missing shared info for " + setA + " or " + setB + ". Skipping comparison."); m->mothurOutEndLine(); 
 				outputNames.pop_back();
 			}else {
+                
 				//fill data
 				for (int j = 0; j < thisLookUp[0]->getNumBins(); j++) {
 					//data[j] = new double[subset.size()];
 					data2[j].resize(subset.size(), 0.0);
+                   
 					for (int i = 0; i < subset.size(); i++) {
-						//data[j][i] = (subset[i]->getAbundance(j));
 						data2[j][i] = (subset[i]->getAbundance(j));
 					}
 				}
@@ -500,7 +500,6 @@ int MetaStatsCommand::driver(int start, int num, vector<SharedRAbundVector*>& th
 				MothurMetastats mothurMeta(threshold, iters);
 				mothurMeta.runMetastats(outputFileName , data2, setACount);
 				m->mothurOutEndLine();
-				
 				m->mothurOutEndLine(); 
 			}