#include "sharedsobs.h"
#include "sharednseqs.h"
#include "sharedjsd.h"
+#include "sharedrjsd.h"
+#include "shannonrange.h"
/********************************************************************/
}else if (Estimators[i] == "jack") { Calculator* temp = new Jackknife(); m->mothurOut(temp->getName() + ": "); temp->citation(); delete temp;
}else if (Estimators[i] == "shannon") { Calculator* temp = new Shannon(); m->mothurOut(temp->getName() + ": "); temp->citation(); delete temp;
}else if (Estimators[i] == "shannoneven") { Calculator* temp = new ShannonEven(); m->mothurOut(temp->getName() + ": "); temp->citation(); delete temp;
+ }else if (Estimators[i] == "shannonrange") { Calculator* temp = new RangeShannon(0); m->mothurOut(temp->getName() + ": "); temp->citation(); delete temp;
}else if (Estimators[i] == "npshannon") { Calculator* temp = new NPShannon(); m->mothurOut(temp->getName() + ": "); temp->citation(); delete temp;
}else if (Estimators[i] == "heip") { Calculator* temp = new Heip(); m->mothurOut(temp->getName() + ": "); temp->citation(); delete temp;
}else if (Estimators[i] == "sharedobserved") { Calculator* temp = new SharedSobs(); m->mothurOut(temp->getName() + ": "); temp->citation(); delete temp;
}else if (Estimators[i] == "kulczynski") { Calculator* temp = new Kulczynski(); m->mothurOut(temp->getName() + ": "); temp->citation(); delete temp;
}else if (Estimators[i] == "jsd") { Calculator* temp = new JSD(); m->mothurOut(temp->getName() + ": "); temp->citation(); delete temp;
+ }else if (Estimators[i] == "rjsd") { Calculator* temp = new RJSD(); m->mothurOut(temp->getName() + ": "); temp->citation(); delete temp;
}else { m->mothurOut("[ERROR]: Missing else if for " + Estimators[i] + " in printCitations."); m->mothurOutEndLine(); }
}else { m->mothurOut(Estimators[i] + " is not a valid calculator, no citation will be given."); m->mothurOutEndLine(); }
}
single["shannon"] = "shannon";
single["npshannon"] = "npshannon";
single["shannoneven"] = "shannoneven";
+ single["shannonrange"] = "shannonrange";
single["smithwilson"] = "smithwilson";
single["heip"] = "heip";
single["simpson"] = "simpson";
shared["memchord"] = "memchord";
shared["memeuclidean"] = "memeuclidean";
shared["mempearson"] = "mempearson";
- shared["jsd"] = "jsd";
+ shared["jsd"] = "jsd";
+ shared["rjsd"] = "rjsd";
shared["default"] = "default";
}
catch(exception& e) {
rarefaction["heip"] = "heip";
rarefaction["npshannon"] = "npshannon";
rarefaction["shannoneven"] = "shannoneven";
+ rarefaction["shannonrange"] = "shannonrange";
rarefaction["simpson"] = "simpson";
rarefaction["invsimpson"] = "invsimpson";
rarefaction["simpsoneven"] = "simpsoneven";
summary["smithwilson"] = "smithwilson";
summary["invsimpson"] = "invsimpson";
summary["npshannon"] = "npshannon";
+ summary["shannonrange"] = "shannonrange";
summary["simpson"] = "simpson";
summary["simpsoneven"] = "simpsoneven";
summary["bergerparker"] = "bergerparker";
sharedsummary["memchord"] = "memchord";
sharedsummary["memeuclidean"] = "memeuclidean";
sharedsummary["mempearson"] = "mempearson";
- sharedsummary["jsd"] = "jsd";
+ sharedsummary["jsd"] = "jsd";
+ sharedsummary["rjsd"] = "rjsd";
sharedsummary["default"] = "default";
}
catch(exception& e) {
treegroup["gower"] = "gower";
treegroup["memchi2"] = "memchi2";
treegroup["memchord"] = "memchord";
+ treegroup["jsd"] = "jsd";
+ treegroup["rjsd"] = "rjsd";
treegroup["memeuclidean"] = "memeuclidean";
treegroup["mempearson"] = "mempearson";
matrix["structchi2"] = "structchi2";
matrix["soergel"] = "soergel";
matrix["spearman"] = "spearman";
- matrix["speciesprofile"] = "speciesprofile";
+ matrix["speciesprofile"] = "speciesprofile";
matrix["hamming"] = "hamming";
matrix["gower"] = "gower";
matrix["memchi2"] = "memchi2";
matrix["memchord"] = "memchord";
matrix["memeuclidean"] = "memeuclidean";
- matrix["mempearson"] = "mempearson";
- matrix["jsd"] = "jsd";
+ matrix["mempearson"] = "mempearson";
+ matrix["rjsd"] = "rjsd";
+ matrix["jsd"] = "jsd";
}
catch(exception& e) {