added concensus command and updated calcs

[mothur.git] / sharedjest.h

diff --git a/sharedjest.h b/sharedjest.h
index 19f36f958e1d87f5235bf75756a7dde96e971a23..8a943c900a0bcd6d92edfbe3428cd92e308b606b 100644 (file)
--- a/sharedjest.h
+++ b/sharedjest.h
@@ -1,5 +1,5 @@
-#ifndef SHAREDJEST_H
-#define SHAREDJEST_H
+#ifndef JEST_H
+#define JEST_H
 /*
  *  sharedjest.h
  *  Dotur
@@ -13,19 +13,16 @@
 It is a child of the calculator class. */
 
 
-#include <Carbon/Carbon.h>
 #include "calculator.h"
 
-
-
 /***********************************************************************/
 
-class SharedJest : public Calculator  {
+class Jest : public Calculator  {
        
 public:
-       SharedJest() :  Calculator("SharedJest", 3) {};
+       Jest() :  Calculator("Jest", 3, false) {};
        EstOutput getValues(SAbundVector*) {return data;};
-       EstOutput getValues(SharedRAbundVector*, SharedRAbundVector*);
+       EstOutput getValues(vector<SharedRAbundVector*>);
 private:
        
 };