X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=collectsharedcommand.cpp;h=bc0609ef539e119addffbb531d7f8f54f44f747b;hb=477e76a8a79b60f6cd4253324dd830bdea25e3e9;hp=ad392e7535ece7e6617f63e5573c7e577cfe47da;hpb=e4827e0945cbda536064e5a345996b2a7dfcbb81;p=mothur.git diff --git a/collectsharedcommand.cpp b/collectsharedcommand.cpp index ad392e7..bc0609e 100644 --- a/collectsharedcommand.cpp +++ b/collectsharedcommand.cpp @@ -20,7 +20,7 @@ #include "sharedthetayc.h" #include "sharedthetan.h" #include "sharedkstest.h" -#include "sharedbdiversity.h" +#include "whittaker.h" #include "sharednseqs.h" #include "sharedochiai.h" #include "sharedanderbergs.h" @@ -54,7 +54,7 @@ CollectSharedCommand::CollectSharedCommand(){ cDisplays.push_back(new CollectDisplay(new SharedAce(), new SharedOneColumnFile(fileNameRoot+"shared.ace"))); }else if (globaldata->Estimators[i] == "jabund") { cDisplays.push_back(new CollectDisplay(new JAbund(), new SharedOneColumnFile(fileNameRoot+"jabund"))); - }else if (globaldata->Estimators[i] == "sorensonabund") { + }else if (globaldata->Estimators[i] == "sorabund") { cDisplays.push_back(new CollectDisplay(new SorAbund(), new SharedOneColumnFile(fileNameRoot+"sorabund"))); }else if (globaldata->Estimators[i] == "jclass") { cDisplays.push_back(new CollectDisplay(new Jclass(), new SharedOneColumnFile(fileNameRoot+"jclass"))); @@ -70,8 +70,8 @@ CollectSharedCommand::CollectSharedCommand(){ cDisplays.push_back(new CollectDisplay(new ThetaN(), new SharedOneColumnFile(fileNameRoot+"thetan"))); }else if (globaldata->Estimators[i] == "kstest") { cDisplays.push_back(new CollectDisplay(new KSTest(), new SharedOneColumnFile(fileNameRoot+"kstest"))); - }else if (globaldata->Estimators[i] == "bdiversity") { - cDisplays.push_back(new CollectDisplay(new BDiversity(), new SharedOneColumnFile(fileNameRoot+"bdiversity"))); + }else if (globaldata->Estimators[i] == "whittaker") { + cDisplays.push_back(new CollectDisplay(new Whittaker(), new SharedOneColumnFile(fileNameRoot+"whittaker"))); }else if (globaldata->Estimators[i] == "sharednseqs") { cDisplays.push_back(new CollectDisplay(new SharedNSeqs(), new SharedOneColumnFile(fileNameRoot+"shared.nseqs"))); }else if (globaldata->Estimators[i] == "ochiai") {