X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=metastatscommand.h;h=82a2cd463fab9762b38bb26dabdef11a7e7a4a0a;hp=7884130ad55dda3fff3fb7880a4c80e6fe15ed9b;hb=d1c97b8c04bb75faca1e76ffad60b37a4d789d3d;hpb=deba0af0ccdcb6005ed5b2b82649b137c63fbdf7

diff --git a/metastatscommand.h b/metastatscommand.h
index 7884130..82a2cd4 100644
--- a/metastatscommand.h
+++ b/metastatscommand.h
@@ -56,6 +56,9 @@ private:
 	
 	int process(vector<SharedRAbundVector*>&);
 	int driver(int, int, vector<SharedRAbundVector*>&);
+    int convertToShared(string filename);
+    int convertToInput(vector<SharedRAbundVector*>&, string);
+    bool convertSharedToInput;
 };
 
 /**************************************************************************************************/
@@ -68,7 +71,7 @@ struct metastatsData {
     vector<string> designMapGroups;
     vector<string> outputNames;
 	int start;
-	int num, iters;
+	int num, iters, count;
 	float threshold;
 	MothurOut* m;
 	string sharedfile;
@@ -86,6 +89,7 @@ struct metastatsData {
         designMapGroups = dg;
         iters = i;
         threshold = thr;
+        count=0;
 	}
 };
 /**************************************************************************************************/
@@ -99,7 +103,7 @@ static DWORD WINAPI MyMetastatsThreadFunction(LPVOID lpParam){
 		
         //for each combo
 		for (int c = pDataArray->start; c < (pDataArray->start+pDataArray->num); c++) {
-			
+			pDataArray->count++;
 			//get set names
 			string setA = pDataArray->namesOfGroupCombos[c][0]; 
 			string setB = pDataArray->namesOfGroupCombos[c][1];