added concensus command and updated calcs

[mothur.git] / shannon.h

diff --git a/shannon.h b/shannon.h
index 223bc90adf00529da4639e9e0701b393d610d478..1930239507b5506a7f05f9fe24a3bca4309eb346 100644 (file)
--- a/shannon.h
+++ b/shannon.h
@@ -13,7 +13,6 @@
 It is a child of the calculator class. */
 
 
-#include <Carbon/Carbon.h>
 #include "calculator.h"
 
 /***********************************************************************/
@@ -21,9 +20,9 @@ It is a child of the calculator class. */
 class Shannon : public Calculator  {
        
 public:
-       Shannon() : Calculator("Shannon", 3) {};
+       Shannon() : Calculator("Shannon", 3, false) {};
        EstOutput getValues(SAbundVector* rank);
-       EstOutput getValues(SharedRAbundVector*, SharedRAbundVector*) {return data;};
+       EstOutput getValues(vector<SharedRAbundVector*>) {return data;};
 private:
        
 };