X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=matrixoutputcommand.h;h=8af539ba01ae59ed07027d63f2bd9d1859b4c217;hb=e0ce7cbc93d7d2fbb753ca694182db092a0ea0e7;hp=762b0e10a02b0428e6a3e8119c1e0a2ee0887d84;hpb=6b2ac07f3e9ee57594d2358a3a25f9f700bd7362;p=mothur.git

diff --git a/matrixoutputcommand.h b/matrixoutputcommand.h
index 762b0e1..8af539b 100644
--- a/matrixoutputcommand.h
+++ b/matrixoutputcommand.h
@@ -88,7 +88,7 @@ private:
 	};
 	vector<linePair> lines;
 	
-	void printSims(ostream&, vector< vector<float> >&);
+	void printSims(ostream&, vector< vector<double> >&);
 	int process(vector<SharedRAbundVector*>);
 	
 	vector<Calculator*> matrixCalculators;
@@ -96,10 +96,10 @@ private:
 	InputData* input;
 	vector<SharedRAbundVector*> lookup;
 	string exportFileName, output, sharedfile;
-	int numGroups, processors;
+	int numGroups, processors, iters, subsampleSize;
 	ofstream out;
 
-	bool abort, allLines;
+	bool abort, allLines, subsample;
 	set<string> labels; //holds labels to be used
 	string outputFile, calc, groups, label, outputDir;
 	vector<string>  Estimators, Groups, outputNames; //holds estimators to be used
@@ -130,7 +130,7 @@ struct distSharedData {
 	}
 };
 /**************************************************************************************************/
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
 static DWORD WINAPI MyDistSharedThreadFunction(LPVOID lpParam){ 
 	distSharedData* pDataArray;