X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=distancecommand.h;h=3e3dc7098a768461c67dc1d45751e50891ccc9c2;hb=cdf9083dc32543cc640e72e9ca3aee0323cbad45;hp=61fc49ea89b37e064c7d6446421efcf12251301a;hpb=aa9238c0a9e6e7aa0ed8b8b606b08ad4fd7dcfe3;p=mothur.git

diff --git a/distancecommand.h b/distancecommand.h
index 61fc49e..3e3dc70 100644
--- a/distancecommand.h
+++ b/distancecommand.h
@@ -21,7 +21,12 @@ 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();
 	
@@ -34,19 +39,31 @@ private:
 	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<int> processIDS;   //end line, processid
 	vector<linePair*> 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 convertMatrix(string);
+	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);
+	bool sanityCheck();
+	//int convertToLowerTriangle(string);
 
 };