This is mothur v 1.2.0 - the April ~24, 2009 release

[mothur.git] / summarysharedcommand.cpp

diff --git a/summarysharedcommand.cpp b/summarysharedcommand.cpp
index 05a5f7efa56c34e2ef452dd682aeacbbb4217ee3..eca2033ed6b0f675374e4e855933a8142a6435c5 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());
@@ -85,9 +85,8 @@ SummarySharedCommand::SummarySharedCommand(){
                                        sumCalculators.push_back(new MorHorn());
                                }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());
                                }
                                
                        }
@@ -123,14 +122,14 @@ int SummarySharedCommand::execute(){
                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;