added name parameter to phylotype command

[mothur.git] / fullmatrix.h

diff --git a/fullmatrix.h b/fullmatrix.h
index 890d07a846006e5e81570402b0fd4e61879e0b68..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(){};
        
@@ -35,11 +35,12 @@ public:
        int getNumGroups();
        void printMatrix(ostream&);
        float get(int, int);
+       Names getRowInfo(int row)  {  return index[row];  }
        
 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;
@@ -52,6 +53,7 @@ private:
        int numGroups;
        int numUserGroups;
        GlobalData* globaldata;
+       MothurOut* m;
 };
 
 #endif