X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=distancecommand.h;h=595483d2b3e84aef55478a78bd84906771949e5d;hb=173a1a82a4e4aa6bef8e4ba77bce342fb9c6563e;hp=b0a3c049025066a566365db37b0229c92920e6bf;hpb=30f2d98fffb579b870c8969ddcc1dfc61ccbb70a;p=mothur.git

diff --git a/distancecommand.h b/distancecommand.h
index b0a3c04..595483d 100644
--- a/distancecommand.h
+++ b/distancecommand.h
@@ -21,35 +21,50 @@ class DistanceCommand : public Command {
 
 public:
 	DistanceCommand(string);
+	DistanceCommand();
 	~DistanceCommand();
+	vector<string> getRequiredParameters();
+	vector<string> getValidParameters();
+	vector<string> getRequiredFiles();
+	map<string, vector<string> > getOutputFiles() { return outputTypes; }
 	int execute();	
 	void help();
 	
 private:
-	struct linePair {
+	struct distlinePair {
 		int start;
 		int end;
+		
 	};
 	
 	Dist* distCalculator;
 	SequenceDB alignDB;
 
-	string countends, output, fastafile, calc, outputDir;
-	int processors;
+	string countends, output, fastafile, calc, outputDir, oldfastafile, column, compress;
+
+	int processors, numNewFasta;
 	float cutoff;
-	map<int, int> processIDS;   //end line, processid
-	vector<linePair*> lines;
+	vector<int> processIDS;   //end line, processid
+	vector<distlinePair> lines;
 	
 	bool abort;
-	vector<string>  Estimators; //holds estimators to be used
+	vector<string>  Estimators, outputNames; //holds estimators to be used
+	map<string, vector<string> > outputTypes;
 	
-	//void appendFiles(string, string);
+	//void m->appendFiles(string, string);
 	void createProcesses(string);
 	int driver(/*Dist*, SequenceDB, */int, int, string, float);
+	int driver(int, int, string, string);
+	
+	#ifdef USE_MPI 
 	int driverMPI(int, int, MPI_File&, float);
+	int driverMPI(int, int, string, unsigned long int&);
+	int driverMPI(int, int, string, unsigned long int&, string);
+	#endif
 	
-	int convertMatrix(string);
-	int convertToLowerTriangle(string);
+	//int convertMatrix(string);
+	bool sanityCheck();
+	//int convertToLowerTriangle(string);
 
 };