testing 1.13.0

[mothur.git] / preclustercommand.h

diff --git a/preclustercommand.h b/preclustercommand.h
index 3a1157d1979935e990f45e1f3202d4fe74525574..de6a5727575a7f35d2605239968a37435faa388f 100644 (file)
--- a/preclustercommand.h
+++ b/preclustercommand.h
@@ -30,7 +30,7 @@ struct seqPNode {
 class PreClusterCommand : public Command {
        
 public:
-       PreClusterCommand(string);      
+       PreClusterCommand(string);
        ~PreClusterCommand();
        int execute();  
        void help();
@@ -40,12 +40,14 @@ private:
        bool abort;
        string fastafile, namefile, outputDir;
        vector<seqPNode> alignSeqs; //maps the number of identical seqs to a sequence
-//     map<string, string> names; //represents the names file first column maps to second column
-//     map<string, int> sizes;  //this map a seq name to the number of identical seqs in the names file
+       map<string, string> names; //represents the names file first column maps to second column
+       map<string, int> sizes;  //this map a seq name to the number of identical seqs in the names file
+       map<string, int>::iterator itSize; 
 //     map<string, bool> active; //maps sequence name to whether it has already been merged or not.
        
        int readFASTA();
-       int readNamesFASTA();
+       void readNameFile();
+       //int readNamesFASTA();
        int calcMisMatches(string, string);
        void printData(string, string); //fasta filename, names file name
 };