cutoff = "1.0";
}
+ //set default value for cutoff
+ if (commandName == "distance") { cutoff = "1.0"; }
+
string key, value;
//reads in parameters and values
if((optionText != "") && (commandName != "help")){
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 == "nexus" ) { nexusfile = value; inputFileName = value; fileroot = value; format = "nexus"; }
+ if (key == "clustal" ) { clustalfile = value; inputFileName = value; fileroot = value; format = "clustal"; }
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; }
if (key == "step") { step = value; }
if (key == "form") { form = value; }
if (key == "sorted") { sorted = value; }
- if (key == "scaler") { scaler = value; }
+ if (key == "vertical") { vertical = value; }
+ if (key == "trump") { trump = value; }
+ if (key == "filter") { filter = value; }
+ if (key == "soft") { soft = value; }
+ if (key == "scale") { scale = value; }
+ if (key == "ends" ) { ends = value; }
+ if (key == "processors" ) { processors = value; }
+
+
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 == "nexus" ) { nexusfile = value; inputFileName = value; fileroot = value; format = "nexus"; }
+ if (key == "clustal" ) { clustalfile = value; inputFileName = value; fileroot = value; format = "clustal"; }
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; }
if (key == "step") { step = value; }
if (key == "form") { form = value; }
if (key == "sorted") { sorted = value; }
- if (key == "scaler") { scaler = value; }
-
+ if (key == "vertical") { vertical = value; }
+ if (key == "trump") { trump = value; }
+ if (key == "filter") { filter = value; }
+ if (key == "soft") { soft = value; }
+ if (key == "scale") { scale = value; }
+ if (key == "ends" ) { ends = value; }
+ if (key == "processors" ) { processors = value; }
+
if (key == "line") {//stores lines to be used in a vector
lines.clear();
//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);
splitAtDash(calc, Estimators);
}
if (commandName == "collect.shared") {
- if ((calc == "default") || (calc == "")) { calc = "sharedsobs-sharedchao-sharedace-jabund-sorensonabund-jclass-sorclass-jest-sorest-thetayc-thetan"; }
+
+ if ((calc == "default") || (calc == "")) { calc = "sharedsobs-sharedchao-sharedace-jabund-sorabund-jclass-sorclass-jest-sorest-thetayc-thetan"; }
Estimators.clear();
splitAtDash(calc, Estimators);
}
splitAtDash(calc, Estimators);
}
if (commandName == "summary.shared") {
- if ((calc == "default") || (calc == "")) { calc = "sharedsobs-sharedchao-sharedace-jabund-sorensonabund-jclass-sorclass-jest-sorest-thetayc-thetan"; }
+ if ((calc == "default") || (calc == "")) { calc = "sharedsobs-sharedchao-sharedace-jabund-sorabund-jclass-sorclass-jest-sorest-thetayc-thetan"; }
Estimators.clear();
splitAtDash(calc, Estimators);
}
Estimators.clear();
splitAtDash(calc, Estimators);
}
+ if (commandName == "distance") {
+ if ((calc == "default") || (calc == "")) { calc = "onegap"; }
+ Estimators.clear();
+ splitAtDash(calc, Estimators);
+ }
if (commandName == "venn") {
if ((calc == "default") || (calc == "")) {
if (format == "list") { calc = "sobs"; }
Estimators.clear();
splitAtDash(calc, Estimators);
}
- if (commandName == "tree.groups") {
+ if ((commandName == "tree.shared") || (commandName == "bootstrap.shared")) {
if (calc != "") {
Estimators.clear();
splitAtDash(calc, Estimators);
string GlobalData::getTreeFile() { return treefile; }
string GlobalData::getSharedFile() { return sharedfile; }
string GlobalData::getFastaFile() { return fastafile; }
+string GlobalData::getNexusFile() { return nexusfile; }
+string GlobalData::getClustalFile() { return clustalfile; }
string GlobalData::getCutOff() { return cutoff; }
string GlobalData::getFormat() { return format; }
string GlobalData::getPrecision() { return precision; }
string GlobalData::getStep() { return step; }
string GlobalData::getForm() { return form; }
string GlobalData::getSorted() { return sorted; }
-string GlobalData::getScaler() { return scaler; }
-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::getTrump() { return trump; }
+string GlobalData::getSoft() { return soft; }
+string GlobalData::getFilter() { return filter; }
+string GlobalData::getScale() { return scale; }
+string GlobalData::getEnds() { return ends; }
+string GlobalData::getProcessors() { return processors; }
+
+void GlobalData::setListFile(string file) { listfile = file; inputFileName = file;}
+void GlobalData::setGroupFile(string file) { groupfile = 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::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::setEnds(string e) { ends = e; }
+void GlobalData::setProcessors(string p) { processors = p; }
+
/*******************************************************/
//option definitions should go here...
helpRequest = "";
clear();
+ gListVector == NULL;
+ gSparseMatrix == NULL;
}
/*******************************************************/
groupfile = "";
orderfile = "";
fastafile = "";
+ nexusfile = "";
+ clustalfile = "";
treefile = "";
sharedfile = "";
cutoff = "10.00";
abund = "10";
step = "0.01";
form = "integral";
- sorted = "1"; //0 means don't sort, 1 means sort.
- scaler = "log10";
+ sorted = "T"; //F means don't sort, T means sort.
+ vertical = "";
+ trump = "";
+ filter = "";
+ soft = "";
+ scale = "log10";
+ ends = "T"; //yes
+ processors = "1";
+
}
//*******************************************************/
iters = "1000";
groups = "";
jumble = "1"; //0 means don't jumble, 1 means jumble.
- sorted = "1"; //0 means don't sort, 1 means sort.
+ sorted = "T"; //F means don't sort, T means sort.
randomtree = ""; //"" means user will enter some user trees, "outputfile" means they just want the random tree distribution to be outputted to outputfile.
freq = "100";
method = "furthest";
abund = "10";
step = "0.01";
form = "integral";
+ ends = "T";
+ processors = "1";
}
/*******************************************************/
//use nexus translation rather than parsing tree to save time
if ((holder == "translate") || (holder == "Translate")) {
-cout << "there is a translate " << endl;
+
string number, name, h;
h = ""; // so it enters the loop the first time
while((h != ";") && (number != ";")) {