reworked the classifiers summary file added groupfile option to classify.seqs, added...

[mothur.git] / classifyseqscommand.h

diff --git a/classifyseqscommand.h b/classifyseqscommand.h
index 993968b3bdcf88164521214e2bfc5e884ed10f85..d19f862d340983786f00c25eaf02a6df30e0dea8 100644 (file)
--- a/classifyseqscommand.h
+++ b/classifyseqscommand.h
@@ -12,7 +12,7 @@
 
 #include "mothur.h"
 #include "command.hpp"
-#include "alignment.hpp"
+//#include "alignment.hpp"
 #include "classify.h"
 
 //KNN and Bayesian methods modeled from algorithms in
@@ -28,7 +28,7 @@
 class ClassifySeqsCommand : public Command {
        
 public:
-       ClassifySeqsCommand(string);    
+       ClassifySeqsCommand(string);
        ~ClassifySeqsCommand();
        int execute(); 
        void help();    
@@ -41,17 +41,27 @@ private:
        };
        vector<int> processIDS;   //processid
        vector<linePair*> lines;
+       vector<string> fastaFileNames;
+       vector<string> namefileNames;
+       map<string, int> nameMap;
+       map<string, int>::iterator itNames;
        
        Classify* classify;
        
-       string fastaFileName, templateFileName, distanceFileName, search, method, taxonomyFileName;
-       int processors, kmerSize, numWanted, cutoff;
+       string fastaFileName, templateFileName, distanceFileName, namefile, search, method, taxonomyFileName, outputDir, groupfile;
+       int processors, kmerSize, numWanted, cutoff, iters;
        float match, misMatch, gapOpen, gapExtend;
        bool abort, probs;
        
-       int driver(linePair*, string, string);
+       int driver(linePair*, string, string, string);
        void appendTaxFiles(string, string);
-       void createProcesses(string, string); 
+       void createProcesses(string, string, string); 
+       string addUnclassifieds(string, int);
+       
+       int MPIReadNamesFile(string);
+       #ifdef USE_MPI
+       int driverMPI(int, int, MPI_File&, MPI_File&, MPI_File&, vector<long>&);
+       #endif
 };
 
 #endif