fixed bug with line and label parameters and added all as option for both

[mothur.git] / fullmatrix.h

diff --git a/fullmatrix.h b/fullmatrix.h
index f3ad0e73dfb2615e4fbeb5bbd96f1a025c6a0ae6..0ab1d7175dce3b9bdef4758b83dffc26ace8079b 100644 (file)
--- a/fullmatrix.h
+++ b/fullmatrix.h
@@ -16,6 +16,12 @@
 
 using namespace std;
 
+struct Names {
+       string  groupname;
+       string          seqName;
+};
+
+
 class FullMatrix {
        
        public:
@@ -27,12 +33,11 @@ class FullMatrix {
                void printMatrix(ostream&);
        
        private:
-               void sortGroups();  //this function sorts the sequences within the matrix.
-               void quicksort(int, int, int);//row of matrix, low, high and row number
+               void sortGroups(int, int);  //this function sorts the sequences within the matrix.
                void readSquareMatrix(ifstream&);  
                void readLTMatrix(ifstream&);
                vector< vector<float> > matrix;  //a 2D distance matrix of all the sequences and their distances to eachother.
-               map<int, string> index; // row in vector, sequence group.  need to know this so when we sort it can be updated.
+               map<int, Names> index; // row in vector, sequence group.  need to know this so when we sort it can be updated.
                GroupMap* groupmap;  //maps sequences to groups they belong to.
                GlobalData* globaldata;
                int numSeqs;