X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=splitabundcommand.h;h=9929b7967050308c2563561896fa615a6f371d12;hp=df925f34cc70bc405ac35e2302ecc49a8fd97872;hb=df7e3ff9f68ef157b0328a2d353c3258c5d45d89;hpb=a44542a3c740cf957cff72ac71742f2fe48b0eaf

diff --git a/splitabundcommand.h b/splitabundcommand.h
index df925f3..9929b79 100644
--- a/splitabundcommand.h
+++ b/splitabundcommand.h
@@ -22,6 +22,7 @@ also allow an option where a user can give a group file with the list or names f
 #include "inputdata.h"
 #include "listvector.hpp"
 #include "sequence.hpp"
+#include "counttable.h"
 
 /***************************************************************************************/
 
@@ -35,7 +36,9 @@ public:
 	vector<string> setParameters();
 	string getCommandName()			{ return "split.abund";				}
 	string getCommandCategory()		{ return "OTU-Based Approaches";	}
+	
 	string getHelpString();	
+    string getOutputPattern(string);	
 	string getCitation() { return "http://www.mothur.org/wiki/Split.abund"; }
 	string getDescription()		{ return "split a list, name, group or fasta file based on abundance"; }
 	
@@ -46,24 +49,24 @@ private:
 	int splitList(ListVector*);
 	int splitNames(); //namefile
 	int writeNames(); 
-	int writeList(ListVector*, string); 
+	int writeList(ListVector*, string, int); 
 	int writeAccnos(string); 
 	int parseGroup(string); 
 	int parseFasta(string); 
+    int parseCount(string);
+    int splitCount();
 	int readNamesFile(); //namefile
 	int createNameMap(ListVector*);
 	
 	vector<string> outputNames;
-	ListVector* list;
-	GroupMap* groupMap;
-	InputData* input;
+    GroupMap groupMap;
+    CountTable ct;
 	
-	string outputDir, listfile, namefile, groupfile, label, groups, fastafile, inputFile;
+	string outputDir, listfile, namefile, groupfile, countfile, label, groups, fastafile, inputFile;
 	set<string> labels, rareNames, abundNames;
 	vector<string> Groups;
 	bool abort, allLines, accnos;
 	int cutoff;
-	//map<string, bool> wroteListFile;
 	map<string, string> nameMap;