removed "shared" from some of the calculator names and classes

[mothur.git] / sharedsorest.h

diff --git a/sharedsorest.h b/sharedsorest.h
index 1795f66bf39222e8232e343213f03ac8ee247a2a..58de55225bc96227f82b21a7666bc5d8554e5b3c 100644 (file)
--- a/sharedsorest.h
+++ b/sharedsorest.h
@@ -1,5 +1,5 @@
-#ifndef SHAREDSOREST_H
-#define SHAREDSOREST_H
+#ifndef SOREST_H
+#define SOREST_H
 /*
  *  sharedsorest.h
  *  Dotur
@@ -13,15 +13,14 @@
 It is a child of the calculator class. */
 
 
-#include <Carbon/Carbon.h>
 #include "calculator.h"
 
 /***********************************************************************/
 
-class SharedSorEst : public Calculator  {
+class SorEst : public Calculator  {
        
 public:
-       SharedSorEst() :  Calculator("SharedSorEst", 3) {};
+       SorEst() :  Calculator("SorEst", 3) {};
        EstOutput getValues(SAbundVector*) {return data;};
        EstOutput getValues(SharedRAbundVector*, SharedRAbundVector*);
 private: