merged pat's trim seqs edits with sarah's major overhaul of global data; also added...

[mothur.git] / aligncommand.h

diff --git a/aligncommand.h b/aligncommand.h
index a3ec827c80e1dfa229bf228eb45df61499aef265..62bf3dc100297c2c3f089257329a750e2301f598 100644 (file)
--- a/aligncommand.h
+++ b/aligncommand.h
@@ -10,10 +10,10 @@
  *
  */
 
+#include "mothur.h"
 #include "command.hpp"
-#include "globaldata.hpp"
-
-
+#include "database.hpp"
+#include "alignment.hpp"
 
 class AlignCommand : public Command {
        
@@ -24,21 +24,27 @@ public:
        void help();    
 
 private:
-       GlobalData* globaldata;
-       OptionParser* parser;
-       map<string, string> parameters;
-       map<string, string>::iterator it;
-       bool abort;
+       struct linePair {
+               int start;
+               int numSeqs;
+               linePair(int i, int j) : start(i), numSeqs(j) {}
+       };
+       map<int, int> processIDS;   //end line, processid
+       vector<linePair*> lines;
+
+       Database* templateDB;
+       Alignment* alignment;
+
+       int driver(linePair*, string, string);
+       void createProcesses(string, string);
+       void appendAlignFiles(string, string); 
+       void appendReportFiles(string, string);
+       
        string candidateFileName, templateFileName, distanceFileName, search, align;
-       int kmerSize;
        float match, misMatch, gapOpen, gapExtend;
-       ofstream out;
-       ifstream in;
-       int ableToOpen;
-       
+       int processors, kmerSize;
 
+       bool abort;
 };
 
-
-
-#endif
\ No newline at end of file
+#endif