added warning about merging with something above cutoff to cluster. working on chimeras

[mothur.git] / sharedochiai.h

diff --git a/sharedochiai.h b/sharedochiai.h
index 27de37555ef521615659b5bc844d498a02c76fbb..78ec0ae647d153c23a34eeba5499f1cf7299f7f3 100644 (file)
--- a/sharedochiai.h
+++ b/sharedochiai.h
@@ -1,5 +1,5 @@
-#ifndef SHAREDOCHIAI_H
-#define SHAREDOCHIAI_H
+#ifndef OCHIAI_H
+#define OCHIAI_H
 /*
  *  sharedochiai.h
  *  Mothur
@@ -13,12 +13,12 @@
 
 /***********************************************************************/
 
-class SharedOchiai : public Calculator  {
+class Ochiai : public Calculator  {
        
 public:
-       SharedOchiai() :  Calculator("SharedOchiai", 1) {};
+       Ochiai() :  Calculator("ochiai", 1, false) {};
        EstOutput getValues(SAbundVector*) {return data;};
-       EstOutput getValues(SharedRAbundVector*, SharedRAbundVector*);
+       EstOutput getValues(vector<SharedRAbundVector*>);
 private:
        
 };
@@ -26,4 +26,4 @@ private:
 /***********************************************************************/
 
 
-#endif
\ No newline at end of file
+#endif