X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=globaldata.cpp;h=6138e2cc1b8f4fc70b8febc1105fcecca0448306;hb=4f4070ac3fbb5da75f834b48062e9123364b006e;hp=ce10ee1bca9ea35dca648c97a49e1657a11509ee;hpb=dc08123b7f14e2305e5bb2b3a8fcef96fc829b07;p=mothur.git diff --git a/globaldata.cpp b/globaldata.cpp index ce10ee1..6138e2c 100644 --- a/globaldata.cpp +++ b/globaldata.cpp @@ -26,9 +26,11 @@ void GlobalData::parseGlobalData(string commandString, string optionText){ if ((commandName == "read.dist") || (commandName == "read.otu") || (commandName == "read.tree")) { clear(); gGroupmap = NULL; + gListVector = NULL; + gSparseMatrix = NULL; gTree.clear(); Treenames.clear(); - labels.clear(); lines.clear(); groups.clear(); + labels.clear(); lines.clear(); Groups.clear(); allLines = 1; } @@ -42,6 +44,9 @@ void GlobalData::parseGlobalData(string commandString, string optionText){ cutoff = "1.0"; } + //set default value for cutoff + if (commandName == "dist.seqs") { cutoff = "1.0"; } + string key, value; //reads in parameters and values if((optionText != "") && (commandName != "help")){ @@ -54,7 +59,7 @@ void GlobalData::parseGlobalData(string commandString, string optionText){ if (key == "list" ) { listfile = value; inputFileName = value; fileroot = value; format = "list"; } if (key == "rabund" ) { rabundfile = value; inputFileName = value; fileroot = value; format = "rabund"; } if (key == "sabund" ) { sabundfile = value; inputFileName = value; fileroot = value; format = "sabund"; } - if (key == "fasta" ) { fastafile = value; inputFileName = value; fileroot = value; format = "fasta"; } + if (key == "fasta" ) { fastafile = value; inputFileName = value; fileroot = value; format = "fasta"; } if (key == "tree" ) { treefile = value; inputFileName = value; fileroot = value; format = "tree"; } if (key == "shared" ) { sharedfile = value; inputFileName = value; fileroot = value; format = "sharedfile"; } if (key == "name" ) { namefile = value; } @@ -73,25 +78,45 @@ void GlobalData::parseGlobalData(string commandString, string optionText){ if (key == "step") { step = value; } if (key == "form") { form = value; } if (key == "sorted") { sorted = value; } + if (key == "vertical") { vertical = value; } + if (key == "trump") { trump = value; } + if (key == "hard") { hard = value; } + if (key == "soft") { soft = value; } if (key == "scale") { scale = value; } + if (key == "countends" ) { countends = value; } + if (key == "processors" ) { processors = value; } + if (key == "size" ) { size = value; } + if (key == "candidate") { candidatefile = value; } + if (key == "search") { search = value; } + if (key == "ksize") { ksize = value; } + if (key == "align") { align = value; } + if (key == "match") { match = value; } + if (key == "mismatch") { mismatch = value; } + if (key == "gapopen") { gapopen = value; } + if (key == "gapextend" ) { gapextend = value; } + if (key == "start" ) { startPos = value; } + if (key == "end" ) { endPos = value; } + if (key == "maxambig" ) { maxAmbig = value; } + if (key == "maxhomop" ) { maxHomoPolymer = value; } + if (key == "minlength" ) { minLength = value; } + if (key == "maxlength" ) { maxLength = value; } - - - if (key == "line") {//stores lines to be used in a set + if (key == "line") {//stores lines to be used in a vector lines.clear(); labels.clear(); line = value; label = ""; - splitAtDash(value, lines); - allLines = 0; + if (line != "all") { splitAtDash(value, lines); allLines = 0; } + else { allLines = 1; } } - if (key == "label") {//stores labels to be used in a set + + if (key == "label") {//stores lines to be used in a vector labels.clear(); lines.clear(); label = value; line = ""; - splitAtDash(value, labels); - allLines = 0; + if (label != "all") { splitAtDash(value, labels); allLines = 0; } + else { allLines = 1; } } if (key == "groups") {//stores groups to be used in a vector @@ -112,7 +137,7 @@ void GlobalData::parseGlobalData(string commandString, string optionText){ if (key == "sabund" ) { sabundfile = value; inputFileName = value; fileroot = value; format = "sabund"; } if (key == "fasta" ) { fastafile = value; inputFileName = value; fileroot = value; format = "fasta"; } if (key == "tree" ) { treefile = value; inputFileName = value; fileroot = value; format = "tree"; } - if (key == "shared" ) { sharedfile = value; inputFileName = value; fileroot = value; format = "sharedfile"; } + if (key == "shared" ) { sharedfile = value; inputFileName = value; fileroot = value; format = "sharedfile"; } if (key == "name" ) { namefile = value; } if (key == "order" ) { orderfile = value; } if (key == "group" ) { groupfile = value; } @@ -129,8 +154,29 @@ void GlobalData::parseGlobalData(string commandString, string optionText){ if (key == "step") { step = value; } if (key == "form") { form = value; } if (key == "sorted") { sorted = value; } + if (key == "vertical") { vertical = value; } + if (key == "trump") { trump = value; } + if (key == "hard") { hard = value; } + if (key == "soft") { soft = value; } if (key == "scale") { scale = value; } - + if (key == "countends" ) { countends = value; } + if (key == "processors" ) { processors = value; } + if (key == "size" ) { size = value; } + if (key == "candidate") { candidatefile = value; } + if (key == "search") { search = value; } + if (key == "ksize") { ksize = value; } + if (key == "align") { align = value; } + if (key == "match") { match = value; } + if (key == "mismatch") { mismatch = value; } + if (key == "gapopen") { gapopen = value; } + if (key == "gapextend" ) { gapextend = value; } + if (key == "start" ) { startPos = value; } + if (key == "end" ) { endPos = value; } + if (key == "maxambig" ) { maxAmbig = value; } + if (key == "maxhomop" ) { maxHomoPolymer = value; } + if (key == "minlength" ) { minLength = value; } + if (key == "maxlength" ) { maxLength = value; } + if (key == "line") {//stores lines to be used in a vector lines.clear(); @@ -163,6 +209,7 @@ void GlobalData::parseGlobalData(string commandString, string optionText){ //input defaults for calculators if (commandName == "collect.single") { + if ((calc == "default") || (calc == "")) { calc = "sobs-chao-ace-jack-shannon-npshannon-simpson"; } Estimators.clear(); splitAtDash(calc, Estimators); @@ -192,6 +239,12 @@ void GlobalData::parseGlobalData(string commandString, string optionText){ Estimators.clear(); splitAtDash(calc, Estimators); } + if (commandName == "dist.seqs") { + if ((calc == "default") || (calc == "")) { calc = "onegap"; } + if (countends == "") { countends = "T"; } + Estimators.clear(); + splitAtDash(calc, Estimators); + } if (commandName == "venn") { if ((calc == "default") || (calc == "")) { if (format == "list") { calc = "sobs"; } @@ -200,13 +253,20 @@ void GlobalData::parseGlobalData(string commandString, string optionText){ Estimators.clear(); splitAtDash(calc, Estimators); } - if ((commandName == "tree.shared") || (commandName == "bootstrap.shared")) { - if (calc != "") { - Estimators.clear(); - splitAtDash(calc, Estimators); - }else { cout << "You have not specified any calculators." << endl; } + if ((commandName == "tree.shared") || (commandName == "bootstrap.shared") || (commandName == "dist.shared")) { + if ((calc == "default") || (calc == "")) { + calc = "jclass-thetayc"; + } + Estimators.clear(); + splitAtDash(calc, Estimators); } + + if(commandName == "filter.seqs"){ + if(trump == "" && vertical == "" && hard == "" && soft == ""){ + trump = '.'; + } + } //if you have done a read.otu with a groupfile but don't want to use it anymore because you want to do single commands if ((commandName == "collect.single") || (commandName == "rarefaction.single") || (commandName == "summary.single")) { @@ -253,17 +313,45 @@ string GlobalData::getGroups() { return groups; } string GlobalData::getStep() { return step; } string GlobalData::getForm() { return form; } string GlobalData::getSorted() { return sorted; } +string GlobalData::getVertical() { return vertical; } +string GlobalData::getTrump() { return trump; } +string GlobalData::getSoft() { return soft; } +string GlobalData::getHard() { return hard; } string GlobalData::getScale() { return scale; } -void GlobalData::setListFile(string file) { listfile = file; inputFileName = file;} -void GlobalData::setRabundFile(string file) { rabundfile = file; inputFileName = file;} -void GlobalData::setSabundFile(string file) { sabundfile = file; inputFileName = file;} -void GlobalData::setPhylipFile(string file) { phylipfile = file; inputFileName = file;} -void GlobalData::setColumnFile(string file) { columnfile = file; inputFileName = file;} +string GlobalData::getCountEnds() { return countends; } +string GlobalData::getProcessors() { return processors; } +string GlobalData::getSize() { return size; } +string GlobalData::getCandidateFile() { return candidatefile;} +string GlobalData::getSearch() { return search; } +string GlobalData::getKSize() { return ksize; } +string GlobalData::getAlign() { return align; } +string GlobalData::getMatch() { return match; } +string GlobalData::getMismatch() { return mismatch; } +string GlobalData::getGapopen() { return gapopen; } +string GlobalData::getGapextend() { return gapextend; } +string GlobalData::getStartPos() { return startPos; } +string GlobalData::getEndPos() { return endPos; } +string GlobalData::getMaxAmbig() { return maxAmbig; } +string GlobalData::getMaxHomoPolymer() { return maxHomoPolymer; } +string GlobalData::getMinLength() { return minLength; } +string GlobalData::getMaxLength() { return maxLength; } + + +void GlobalData::setListFile(string file) { listfile = file; inputFileName = file; } +void GlobalData::setRabundFile(string file) { rabundfile = file; inputFileName = file; } +void GlobalData::setSabundFile(string file) { sabundfile = file; inputFileName = file; } +void GlobalData::setPhylipFile(string file) { phylipfile = file; inputFileName = file; } +void GlobalData::setColumnFile(string file) { columnfile = file; inputFileName = file; } +void GlobalData::setGroupFile(string file) { groupfile = file; } +void GlobalData::setSharedFile(string file) { sharedfile = file; inputFileName = file; fileroot = file; } void GlobalData::setNameFile(string file) { namefile = file; } void GlobalData::setFormat(string Format) { format = Format; } void GlobalData::setRandomTree(string Random) { randomtree = Random; } void GlobalData::setGroups(string g) { groups = g; } void GlobalData::setCalc(string Calc) { calc = Calc; } +void GlobalData::setCountEnds(string e) { countends = e; } +void GlobalData::setProcessors(string p) { processors = p; } + /*******************************************************/ @@ -272,8 +360,8 @@ GlobalData::GlobalData() { //option definitions should go here... helpRequest = ""; clear(); - gListVector == NULL; - gSparseMatrix == NULL; + gListVector = NULL; + gSparseMatrix = NULL; } /*******************************************************/ @@ -291,6 +379,7 @@ void GlobalData::clear() { fastafile = ""; treefile = ""; sharedfile = ""; + candidatefile = ""; cutoff = "10.00"; format = ""; precision = "100"; @@ -307,13 +396,36 @@ void GlobalData::clear() { step = "0.01"; form = "integral"; sorted = "T"; //F means don't sort, T means sort. + vertical = "F"; + trump = ""; + hard = ""; + soft = ""; scale = "log10"; + countends = "T"; //yes + processors = "1"; + size = "0"; + search = "kmer"; + ksize = "8"; + align = "needleman"; + match = "1.0"; + mismatch = "-1.0"; + gapopen = "-1.0"; + gapextend = "-2.0"; + startPos = "-1"; + endPos = "-1"; + maxAmbig = "-1"; + maxHomoPolymer = "-1"; + minLength = "-1"; + maxLength = "-1"; + } //*******************************************************/ /******************************************************/ void GlobalData::reset() { + label = ""; + line = ""; cutoff = "10.00"; precision = "100"; iters = "1000"; @@ -327,6 +439,27 @@ void GlobalData::reset() { abund = "10"; step = "0.01"; form = "integral"; + countends = "T"; + processors = "1"; + size = "0"; + search = "kmer"; + ksize = "8"; + align = "needleman"; + match = "1.0"; + mismatch = "-1.0"; + gapopen = "-1.0"; + gapextend = "-2.0"; + vertical = ""; + trump = ""; + hard = ""; + soft = ""; + startPos = "-1"; + endPos = "-1"; + maxAmbig = "-1"; + maxHomoPolymer = "-1"; + minLength = "-1"; + maxLength = "-1"; + } /*******************************************************/ @@ -341,6 +474,8 @@ GlobalData::~GlobalData() { /*******************************************************/ void GlobalData::parseTreeFile() { + //Why is THIS in GlobalData??? - PDS + //only takes names from the first tree and assumes that all trees use the same names. try { string filename = treefile;