added clearcut source to mothur, fixed mislabeled sharedcalcs

[mothur.git] / ace.h

diff --git a/ace.h b/ace.h
index 19188fa3d2269b0bfc6e03ecc44e25d8887910a6..26d93b10014183a3ad94b0d6f991b1e68946494a 100644 (file)
--- a/ace.h
+++ b/ace.h
@@ -13,7 +13,6 @@
 /* This class implements the Ace estimator on a single group. 
 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 Ace : public Calculator  {
        
 public:
-       Ace(int n=10) : abund(n), Calculator("ACE", 3) {};
+       Ace(int n) : abund(n), Calculator("ace", 3, false) {};
        EstOutput getValues(SAbundVector*);
-       EstOutput getValues(SharedRAbundVector*, SharedRAbundVector*) {return data;};
+       EstOutput getValues(vector<SharedRAbundVector*>) {return data;};
 private:
        int abund;
 };