optimizing classify.seqs calculating of template probabilities.

[mothur.git] / mothurout.h

diff --git a/mothurout.h b/mothurout.h
index 9ce698be4e1963e6af9abee67673ded3e1743fde..33384034ae55ee7f11c72b48378fa59bfe29e16e 100644 (file)
--- a/mothurout.h
+++ b/mothurout.h
@@ -68,7 +68,7 @@ class MothurOut {
                //map<string, string> names;
                vector<string> binLabelsInFile;
                vector<string> currentBinLabels;
-               string saveNextLabel, argv, sharedHeaderMode;
+               string saveNextLabel, argv, sharedHeaderMode, groupMode;
                bool printedHeaders, commandInputsConvertError;
                
                //functions from mothur.h
@@ -82,6 +82,7 @@ class MothurOut {
                int appendFiles(string, string);
                int renameFile(string, string); //oldname, newname
                string getFullPathName(string);
+        string findProgramPath(string programName);
                string hasPath(string);
                string getExtension(string);
                string getPathName(string);
@@ -96,12 +97,21 @@ class MothurOut {
                string getline(istringstream&);
                void gobble(istream&);
                void gobble(istringstream&);
-               map<string, int> readNames(string);
+        vector<string> splitWhiteSpace(string& rest, char[], int);
+        vector<string> splitWhiteSpace(string);
+        set<string> readAccnos(string);
+        int readAccnos(string, vector<string>&);
+        map<string, int> readNames(string);
+        int readTax(string, map<string, string>&);
+        int readNames(string, map<string, string>&, map<string, int>&);
                int readNames(string, map<string, string>&);
+        int readNames(string, map<string, string>&, bool);
+        int readNames(string, map<string, string>&, int);
                int readNames(string, map<string, vector<string> >&);
                int readNames(string, vector<seqPriorityNode>&, map<string, string>&);
                int mothurRemove(string);
                bool mothurConvert(string, int&); //use for converting user inputs. Sets commandInputsConvertError to true if error occurs. Engines check this.
+        bool mothurConvert(string, intDist&); //use for converting user inputs. Sets commandInputsConvertError to true if error occurs. Engines check this.
                bool mothurConvert(string, float&); //use for converting user inputs. Sets commandInputsConvertError to true if error occurs. Engines check this.
                bool mothurConvert(string, double&); //use for converting user inputs. Sets commandInputsConvertError to true if error occurs. Engines check this.
        
@@ -130,6 +140,8 @@ class MothurOut {
                void splitAtChar(string&, vector<string>&, char);
         void splitAtChar(string&, string&, char);
                int removeConfidences(string&);
+        string makeList(vector<string>&);
+        bool isSubset(vector<string>, vector<string>); //bigSet, subset
                
                //math operation
                int factorial(int num);
@@ -140,9 +152,9 @@ class MothurOut {
                int getRandomIndex(int); //highest
 
                int control_pressed;
-               bool executing, runParse, jumble, gui, mothurCalling;
+               bool executing, runParse, jumble, gui, mothurCalling, debug;
                
-               //current files - if you add a new type you must edit optionParser->getParameters, get.current command and mothurOut->printCurrentFiles/clearCurrentFiles.
+               //current files - if you add a new type you must edit optionParser->getParameters, get.current command and mothurOut->printCurrentFiles/clearCurrentFiles/getCurrentTypes.
                string getPhylipFile()          { return phylipfile;            }
                string getColumnFile()          { return columnfile;            }
                string getListFile()            { return listfile;                      }
@@ -164,11 +176,12 @@ class MothurOut {
                string getTaxonomyFile()        { return taxonomyfile;          }
                string getFlowFile()            { return flowfile;                      }
         string getBiomFile()           { return biomfile;                      }
+        string getCountTableFile()     { return counttablefile;        }
                string getProcessors()          { return processors;            }
                
                void setListFile(string f)                      { listfile = getFullPathName(f);                        }
                void setTreeFile(string f)                      { treefile = getFullPathName(f);                        }
-               void setGroupFile(string f)                     { groupfile = getFullPathName(f);                       }               
+               void setGroupFile(string f)                     { groupfile = getFullPathName(f);       groupMode = "group";            }               
                void setPhylipFile(string f)            { phylipfile = getFullPathName(f);                      }
                void setColumnFile(string f)            { columnfile = getFullPathName(f);                      }
                void setNameFile(string f)                      { namefile = getFullPathName(f);                        }       
@@ -187,11 +200,13 @@ class MothurOut {
                void setTaxonomyFile(string f)          { taxonomyfile = getFullPathName(f);            }
                void setFlowFile(string f)                      { flowfile = getFullPathName(f);                        }
         void setBiomFile(string f)                     { biomfile = getFullPathName(f);                        }
-               void setProcessors(string p)            { processors = p;                                                       }
+        void setCountTableFile(string f)       { counttablefile = getFullPathName(f);  groupMode = "count";    }
+        void setProcessors(string p)           { processors = p; mothurOut("\nUsing " + toString(p) + " processors.\n");       }
                
                void printCurrentFiles();
                bool hasCurrentFiles();
                void clearCurrentFiles();
+        set<string> getCurrentTypes(); 
                
        private:
                static MothurOut* _uniqueInstance;
@@ -221,11 +236,14 @@ class MothurOut {
                        processors = "1";
                        flowfile = "";
             biomfile = "";
+            counttablefile = "";
                        gui = false;
                        printedHeaders = false;
                        commandInputsConvertError = false;
             mothurCalling = false;
+            debug = false;
                        sharedHeaderMode = "";
+            groupMode = "group";
                }
                ~MothurOut();
 
@@ -234,7 +252,7 @@ class MothurOut {
                string releaseDate, version;
        
                string accnosfile, phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, designfile, taxonomyfile, biomfile;
-               string orderfile, treefile, sharedfile, ordergroupfile, relabundfile, fastafile, qualfile, sfffile, oligosfile, processors, flowfile;
+               string orderfile, treefile, sharedfile, ordergroupfile, relabundfile, fastafile, qualfile, sfffile, oligosfile, processors, flowfile, counttablefile;
 
                vector<string> Groups;
                vector<string> namesOfGroups;