more calculator edits and added coverage and whittaker

[mothur.git] / summarysharedcommand.cpp

diff --git a/summarysharedcommand.cpp b/summarysharedcommand.cpp
index eea7b25c4ade2bd6a98f5cea0eaabd9b1787ede8..e6a7d9a7363a5d9a71d32fad38d6172248b0934a 100644 (file)
--- a/summarysharedcommand.cpp
+++ b/summarysharedcommand.cpp
@@ -21,7 +21,7 @@
 #include "sharedthetayc.h"
 #include "sharedthetan.h"
 #include "sharedkstest.h"
-#include "sharedbdiversity.h"
+#include "whittaker.h"
 #include "sharedochiai.h"
 #include "sharedanderbergs.h"
 #include "sharedkulczynski.h"
@@ -53,7 +53,7 @@ SummarySharedCommand::SummarySharedCommand(){
                                        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());
@@ -86,8 +86,8 @@ SummarySharedCommand::SummarySharedCommand(){
                                }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());
                                }
                                
                        }