fixes while testing 1.33.0

[mothur.git] / uvest.h

diff --git a/uvest.h b/uvest.h
index 8906976faa784ca5a124cc402546f34611d11d00..384e80c3e54102635022b62aec12e4a66ee81289 100644 (file)
--- a/uvest.h
+++ b/uvest.h
@@ -12,14 +12,8 @@
 /* This class implements the UVEst estimator on two groups. 
 It is used by sharedJAbund and SharedSorensonAbund. */
  
- 
-using namespace std;
-
-#include <vector>
-#include <iostream>
-#include <fstream>
-#include <cmath>
 
+#include "mothur.h"
 #include "sharedrabundvector.h"
 
 typedef vector<double> EstOutput;
@@ -27,7 +21,10 @@ typedef vector<double> EstOutput;
 /***********************************************************************/
 class UVEst {
        public:
-               EstOutput getUVest(SharedRAbundVector* shared1, SharedRAbundVector* shared2);           
+               UVEst() { m = MothurOut::getInstance(); }
+               EstOutput getUVest(vector<SharedRAbundVector*>);        
+       private:
+               MothurOut* m;
 };
 /***********************************************************************/