fixes while testing 1.12.0

[mothur.git] / fullmatrix.cpp

diff --git a/fullmatrix.cpp b/fullmatrix.cpp
index 43c6f2e30a6dc04458e5aab7c42a8ada3636dae5..fe61307552b67bdc4567d00025e1a1401a9e70f3 100644 (file)
--- a/fullmatrix.cpp
+++ b/fullmatrix.cpp
@@ -18,8 +18,9 @@ FullMatrix::FullMatrix(ifstream& filehandle) {
                groupmap = globaldata->gGroupmap;
                
                string name, group;
-               filehandle >> numSeqs >> name;
                
+               filehandle >> numSeqs >> name;
+       
                //make the matrix filled with zeros
                matrix.resize(numSeqs); 
                for(int i = 0; i < numSeqs; i++) {
@@ -55,7 +56,7 @@ FullMatrix::FullMatrix(ifstream& filehandle) {
                                break;
                        }
                }
-               
+       
                //read rest of matrix
                if (square == true) {  readSquareMatrix(filehandle); }
                else {  readLTMatrix(filehandle); }
@@ -116,6 +117,7 @@ int FullMatrix::readSquareMatrix(ifstream& filehandle) {
 /**************************************************************************/
 int FullMatrix::readLTMatrix(ifstream& filehandle) {
        try {
+               
                Progress* reading;
                reading = new Progress("Reading matrix:     ", numSeqs * (numSeqs - 1) / 2);