X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=shhhercommand.h;h=03f171e8a85cf0ebe363381793fbaea7e69950ab;hb=529ec122f7cac4af987e121d150b878d7c7a0d5d;hp=a7af7da4f1ce8a7d0c0e6daa809a58f95f2164fb;hpb=d6c0a11d1cecfac18b323285e7ffadb7f58e848f;p=mothur.git

diff --git a/shhhercommand.h b/shhhercommand.h
index a7af7da..03f171e 100644
--- a/shhhercommand.h
+++ b/shhhercommand.h
@@ -41,6 +41,7 @@ public:
 	vector<string> setParameters();
 	string getCommandName()			{ return "shhh.flows";	}
 	string getCommandCategory()		{ return "Sequence Processing";		}
+	string getOutputFileNameTag(string, string);
 	string getHelpString();	
 	string getCitation() { return "http://www.mothur.org/wiki/Shhh.flows"; }
 	string getDescription()		{ return "shhh.flows"; }
@@ -56,10 +57,10 @@ private:
 		linePair(int i, int j) : start(i), end(j) {}
 	};
     
-	int abort;
+	bool abort, large;
 	string outputDir, flowFileName, flowFilesFileName, lookupFileName, compositeFASTAFileName, compositeNamesFileName;
 
-	int processors, maxIters;
+	int processors, maxIters, largeSize;
 	float cutoff, sigma, minDelta;
 	string flowOrder;
     
@@ -68,6 +69,7 @@ private:
 	vector<double> jointLookUp;
     vector<string> flowFileVector;
 	
+    vector<string> parseFlowFiles(string);
     int driver(vector<string>, string, string, int, int);
     int createProcesses(vector<string>);
     int getFlowData(string, vector<string>&, vector<int>&, vector<short>&, map<string, int>&, int&);
@@ -90,7 +92,7 @@ private:
     void writeQualities(int, int, string, vector<int>, vector<int>&, vector<int>&, vector<double>&, vector<short>&, vector<short>&, vector<int>&, vector<int>&, vector<string>&, vector<int>&, vector<vector<int> >&);
     void writeSequences(string, int, int, string, vector<int>, vector<short>&, vector<string>&, vector<vector<int> >&, vector<int>&);
     void writeNames(string, int, string, vector<int>, vector<string>&, vector<vector<int> >&, vector<int>&);
-    void writeGroups(string, int, vector<string>&);
+    void writeGroups(string, string, int, vector<string>&);
     void writeClusters(string, int, int, vector<int>, vector<int>&, vector<short>&, vector<string>&, vector<vector<int> >&, vector<int>&, vector<int>&, vector<short>&);
     
 	void getSingleLookUp();
@@ -202,7 +204,7 @@ struct shhhFlowsData {
 };
 
 /**************************************************************************************************/
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
 static DWORD WINAPI ShhhFlowsThreadFunction(LPVOID lpParam){ 
 	shhhFlowsData* pDataArray;