X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=clustersplitcommand.h;h=28de9488b68516e2e194db0dd35920c7078e91f9;hb=0469e54185b42ce6e22245718e5e35f35bd4bbb6;hp=cf52ff27d01c28d61f90aa0a8c514d4a04b2136d;hpb=d6c0a11d1cecfac18b323285e7ffadb7f58e848f;p=mothur.git

diff --git a/clustersplitcommand.h b/clustersplitcommand.h
index cf52ff2..28de948 100644
--- a/clustersplitcommand.h
+++ b/clustersplitcommand.h
@@ -23,6 +23,7 @@
 #include "readmatrix.hpp"
 #include "inputdata.h"
 #include "clustercommand.h"
+#include "clusterclassic.h"
 
 class ClusterSplitCommand : public Command {
 	
@@ -34,6 +35,7 @@ public:
 	vector<string> setParameters();
 	string getCommandName()			{ return "cluster.split";		}
 	string getCommandCategory()		{ return "Clustering";			}
+	string getOutputFileNameTag(string, string);
 	string getHelpString();	
 	string getCitation() { return "Schloss PD, Westcott SL (2011). Assessing and improving methods used in OTU-based approaches for 16S rRNA gene sequence analysis. Appl Environ Microbiol. \nhttp://www.mothur.org/wiki/Cluster.split"; }
 	string getDescription()		{ return "splits your sequences by distance or taxonomy then clusters into OTUs"; }
@@ -48,13 +50,15 @@ private:
 	string method, fileroot, tag, outputDir, phylipfile, columnfile, namefile, distfile, format, showabund, timing, splitmethod, taxFile, fastafile;
 	double cutoff, splitcutoff;
 	int precision, length, processors, taxLevelCutoff;
-	bool print_start, abort, hard, large;
+	bool print_start, abort, hard, large, classic;
 	time_t start;
 	ofstream outList, outRabund, outSabund;
 	
 	void printData(ListVector*);
 	vector<string> createProcesses(vector< map<string, string> >, set<string>&);
 	vector<string> cluster(vector< map<string, string> >, set<string>&);
+    string clusterFile(string, string, set<string>&, double&);
+    string clusterClassicFile(string, string, set<string>&, double&);
 	int mergeLists(vector<string>, map<float, int>, ListVector*);
 	map<float, int> completeListFile(vector<string>, string, set<string>&, ListVector*&);
 	int createMergedDistanceFile(vector< map<string, string> >);
@@ -102,7 +106,7 @@ struct clusterData {
 };
 
 /**************************************************************************************************/
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
 #else
 static DWORD WINAPI MyClusterThreadFunction(LPVOID lpParam){ 
 	clusterData* pDataArray;