X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sensspeccommand.h;h=7d85a39bea25ced837551589cf21e2c431c8d7ca;hb=7aa301dfa67cfcb5b00c6b4e38a7ad56eb8337db;hp=1631e74ae054c834b30ed6763ad73faff10b0a13;hpb=a44542a3c740cf957cff72ac71742f2fe48b0eaf;p=mothur.git

diff --git a/sensspeccommand.h b/sensspeccommand.h
index 1631e74..7d85a39 100644
--- a/sensspeccommand.h
+++ b/sensspeccommand.h
@@ -13,6 +13,8 @@
 
 #include "mothur.h"
 #include "command.hpp"
+#include "listvector.hpp"
+#include "inputdata.h"
 
 class SensSpecCommand : public Command {
 	
@@ -24,16 +26,18 @@ public:
 	vector<string> setParameters();
 	string getCommandName()			{ return "sens.spec";				}
 	string getCommandCategory()		{ return "OTU-Based Approaches";	}
+	
 	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/Sens.spec"; }
+    string getOutputPattern(string);	
+	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 77:3219.\nhttp://www.mothur.org/wiki/Sens.spec"; }
 	string getDescription()		{ return "sens.spec"; }
 
 	int execute(); 
 	void help() { m->mothurOut(getHelpString()); }	
 	
 private:
-	void processPhylip();
-	void processColumn();
+	int processPhylip();
+	int processColumn();
 	void setUpOutput();
 	void outputStatistics(string, string);
 	
@@ -41,13 +45,21 @@ private:
 	string outputDir;
 	string format;
 	vector<string> outputNames;
+	set<string> labels; //holds labels to be used
 
 	long int truePositives, falsePositives, trueNegatives, falseNegatives;
-	bool abort;
+	bool abort, allLines;
 	bool hard;
-	string lineLabel;
+	//string lineLabel;
 	double cutoff;
 	int precision;
+	
+	int fillSeqMap(map<string, int>&, ListVector*&);
+	int fillSeqPairSet(set<string>&, ListVector*&);
+	int process(map<string, int>&, string, bool&, string&);
+	int process(set<string>&, string, bool&, string&, int);
+    string preProcessList();
+
 };
 
 #endif