fixes while testing 1.33.0

[mothur.git] / getoturepcommand.h

diff --git a/getoturepcommand.h b/getoturepcommand.h
index a1bf3f0229a98231e9a627e4fc98f9d23ad897ea..daf5bc16cbd3640093502d315af1f35008300ef0 100644 (file)
--- a/getoturepcommand.h
+++ b/getoturepcommand.h
@@ -24,12 +24,13 @@ typedef map<int, float> SeqMap;
 
 struct repStruct {
                string name;
-               int     bin;
+               string bin;
+        int simpleBin;
                int size;
                string group;
                
                repStruct(){}
-               repStruct(string n, int b, int s, string g) : name(n), bin(b), size(s), group(g) {}
+               repStruct(string n, string b, int sb, int s, string g) : name(n), bin(b), size(s), group(g), simpleBin(sb) { }
                ~repStruct() {}
 };
 
@@ -56,14 +57,12 @@ public:
        
 private:
        ListVector* list;
-       InputData* input;
-       FastaMap* fasta;
        GroupMap* groupMap;
        ReadMatrix* readMatrix;
        FormatMatrix* formatMatrix;
        NameAssignment* nameMap;
     CountTable ct;
-       string filename, fastafile, listfile, namefile, groupfile, label, sorted, phylipfile, countfile, columnfile, distFile, format, outputDir, groups;
+       string filename, fastafile, listfile, namefile, groupfile, label, sorted, phylipfile, countfile, columnfile, distFile, format, outputDir, groups, method;
        ofstream out;
        ifstream in, inNames, inRow;
        bool abort, allLines, groupError, large, weighted, hasGroups;
@@ -78,13 +77,14 @@ private:
                                                                        // for all distances related to a certain sequence
        vector<int> rowPositions;
 
-       void readNamesFile();
+       void readNamesFile(FastaMap*&);
        void readNamesFile(bool);
        int process(ListVector*);
        SeqMap getMap(int);
        string findRep(vector<string>, string);         // returns the name of the "representative" sequence of given bin or subset of a bin, for groups
+    string findRepAbund(vector<string>, string);
        int processNames(string, string);
-       int processFastaNames(string, string);
+       int processFastaNames(string, string, FastaMap*&);
     int readDist();
 };