X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=summarysharedcommand.h;h=8ba9b9fcf3e40b745cf75ddbaccd2f6df8cde652;hp=2ffe90d6ab061601b8e1f8ecc89ee24170d02c7e;hb=3914b0d6480f67df53b1e838f51c4e6155710434;hpb=b302d221847b504388ec044c6929e9dde42f9bb1

diff --git a/summarysharedcommand.h b/summarysharedcommand.h
index 2ffe90d..8ba9b9f 100644
--- a/summarysharedcommand.h
+++ b/summarysharedcommand.h
@@ -67,7 +67,9 @@ public:
 	vector<string> setParameters();
 	string getCommandName()			{ return "summary.shared";			}
 	string getCommandCategory()		{ return "OTU-Based Approaches";	}
+	
 	string getHelpString();	
+    string getOutputPattern(string);	
 	string getCitation() { return "http://www.mothur.org/wiki/Summary.shared"; }
 	string getDescription()		{ return "generate a summary file containing calculator values for each line in the OTU data and for all possible comparisons between groups"; }
 
@@ -84,15 +86,16 @@ private:
 	vector<Calculator*> sumCalculators;	
 	InputData* input;
 	
-	bool abort, allLines, mult, all, createPhylip;
+	bool abort, allLines, mult, all, createPhylip, subsample;
 	set<string> labels; //holds labels to be used
-	string label, calc, groups, sharedfile;
+	string label, calc, groups, sharedfile, output;
 	vector<string>  Estimators, Groups, outputNames;
 	vector<SharedRAbundVector*> lookup;
 	string format, outputDir;
-	int numGroups, processors;
+	int numGroups, processors, subsampleSize, iters;
 	int process(vector<SharedRAbundVector*>, string, string);
 	int driver(vector<SharedRAbundVector*>, int, int, string, string, vector< vector<seqDist> >&);
+    int printSims(ostream&, vector< vector<double> >&);
 
 };
 
@@ -109,6 +112,7 @@ struct summarySharedData {
 	unsigned long long end;
 	MothurOut* m;
 	string sumFile;
+    int count;
 	
 	summarySharedData(){}
 	summarySharedData(string sf, MothurOut* mout, unsigned long long st, unsigned long long en, vector<string> est, vector<SharedRAbundVector*> lu) {
@@ -118,10 +122,11 @@ struct summarySharedData {
 		end = en;
         Estimators = est;
         thisLookup = lu;
+        count=0;
 	}
 };
 /**************************************************************************************************/
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
 static DWORD WINAPI MySummarySharedThreadFunction(LPVOID lpParam){ 
 	summarySharedData* pDataArray;
@@ -222,7 +227,7 @@ static DWORD WINAPI MySummarySharedThreadFunction(LPVOID lpParam){
 		
 		vector<SharedRAbundVector*> subset;
 		for (int k = pDataArray->start; k < pDataArray->end; k++) { // pass cdd each set of groups to compare
-            
+            pDataArray->count++;
 			for (int l = 0; l < k; l++) {
 				
 				outputFileHandle << pDataArray->thisLookup[0]->getLabel() << '\t';