added a few evenness calculators and fixed a couple of bugs in filter.seqs and pre...

[mothur.git] / fullmatrix.h

diff --git a/fullmatrix.h b/fullmatrix.h
index 7cb8b15fedf8c39f06aeaee5ca3fb6e9f3274499..e2c0e31b5fa8e4ed81ced8ba88b61fc4620adbf3 100644 (file)
--- a/fullmatrix.h
+++ b/fullmatrix.h
@@ -23,7 +23,7 @@ struct Names {
 class FullMatrix {
        
 public:
-       FullMatrix(){};
+       FullMatrix(){ m = MothurOut::getInstance(); }
        FullMatrix(ifstream&);
        ~FullMatrix(){};
        
@@ -39,8 +39,8 @@ public:
        
 private:
        vector< vector<float> > matrix;  //a 2D distance matrix of all the sequences and their distances to eachother.
-       void readSquareMatrix(ifstream&);  
-       void readLTMatrix(ifstream&);
+       int readSquareMatrix(ifstream&);  
+       int readLTMatrix(ifstream&);
        vector<Names> index; // row in vector, sequence group.  need to know this so when we sort it can be updated.
        vector<int> sizes;
        vector<string> groups;
@@ -53,6 +53,7 @@ private:
        int numGroups;
        int numUserGroups;
        GlobalData* globaldata;
+       MothurOut* m;
 };
 
 #endif