added MPI to dist.seqs command

[mothur.git] / distancecommand.h

diff --git a/distancecommand.h b/distancecommand.h
index c99e5c2cf8b7a56c4cd9b74d7563619a80b8f421..3fa69d553ef857cb854e4ecfe9853ad36ecd2e0c 100644 (file)
--- a/distancecommand.h
+++ b/distancecommand.h
@@ -12,32 +12,43 @@
 
 #include "mothur.h"
 #include "command.hpp"
-#include "globaldata.hpp"
 #include "validcalculator.h"
 #include "dist.h"
 #include "sequencedb.h"
 
+
 class DistanceCommand : public Command {
 
 public:
-       DistanceCommand();      
-       ~DistanceCommand() {};
+       DistanceCommand(string);
+       ~DistanceCommand();
        int execute();  
+       void help();
        
 private:
-       GlobalData* globaldata;
-       ValidCalculators* validCalculator;
+       struct linePair {
+               int start;
+               int end;
+       };
+       
        Dist* distCalculator;
-       SequenceDB* seqDB;
-       ofstream out;
-       ifstream in;
-       string outputFileName;
-       string countends;
+       SequenceDB alignDB;
+
+       string countends, output, fastafile, calc, outputDir;
        int processors;
        float cutoff;
+       map<int, int> processIDS;   //end line, processid
+       vector<linePair*> lines;
+       
+       bool abort;
+       vector<string>  Estimators; //holds estimators to be used
+       
+       //void appendFiles(string, string);
+       void createProcesses(string);
+       int driver(/*Dist*, SequenceDB, */int, int, string, float);
+       int driverMPI(int, int, string&, float);
        
-       void appendFiles(string, string);
-       int driver(Dist*, SequenceDB*, int, int, string, float);
+       int convertMatrix(string);
 
 };