#include "sharedthetayc.h"
#include "sharedthetan.h"
#include "sharedkstest.h"
-#include "sharedbdiversity.h"
+#include "whittaker.h"
#include "sharedochiai.h"
#include "sharedanderbergs.h"
#include "sharedkulczynski.h"
sumCalculators.push_back(new SharedAce());
}else if (globaldata->Estimators[i] == "jabund") {
sumCalculators.push_back(new JAbund());
- }else if (globaldata->Estimators[i] == "sorensonabund") {
+ }else if (globaldata->Estimators[i] == "sorabund") {
sumCalculators.push_back(new SorAbund());
}else if (globaldata->Estimators[i] == "jclass") {
sumCalculators.push_back(new Jclass());
}else if (globaldata->Estimators[i] == "braycurtis") {
sumCalculators.push_back(new BrayCurtis());
}
- else if (globaldata->Estimators[i] == "bdiversity") {
- sumCalculators.push_back(new BDiversity());
+ else if (globaldata->Estimators[i] == "whittaker") {
+ sumCalculators.push_back(new Whittaker());
}
}
if (sumCalculators.size() == 0) { return 0; }
if (format == "sharedfile") {
- read = new ReadPhilFile(globaldata->inputFileName);
+ read = new ReadOTUFile(globaldata->inputFileName);
read->read(&*globaldata);
input = globaldata->ginput;
order = input->getSharedOrderVector();
}else {
//you are using a list and a groupfile
- read = new ReadPhilFile(globaldata->inputFileName);
+ read = new ReadOTUFile(globaldata->inputFileName);
read->read(&*globaldata);
input = globaldata->ginput;