X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=fullmatrix.cpp;h=8091554e946668fa47259f8157fb6bd489fb8b38;hb=1f78a8c454a636f19b4711bd52782ea1e3e81d3d;hp=43c6f2e30a6dc04458e5aab7c42a8ada3636dae5;hpb=8ab46c171b45ae3782d839539792d049017a361b;p=mothur.git diff --git a/fullmatrix.cpp b/fullmatrix.cpp index 43c6f2e..8091554 100644 --- 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; } } - + cout << "here" << endl; //read rest of matrix if (square == true) { readSquareMatrix(filehandle); } else { readLTMatrix(filehandle); } @@ -73,7 +74,7 @@ FullMatrix::FullMatrix(ifstream& filehandle) { /**************************************************************************/ int FullMatrix::readSquareMatrix(ifstream& filehandle) { try { - + cout << "square" << endl; Progress* reading; reading = new Progress("Reading matrix: ", numSeqs * numSeqs); @@ -116,6 +117,7 @@ int FullMatrix::readSquareMatrix(ifstream& filehandle) { /**************************************************************************/ int FullMatrix::readLTMatrix(ifstream& filehandle) { try { + cout << "lt" << endl; Progress* reading; reading = new Progress("Reading matrix: ", numSeqs * (numSeqs - 1) / 2);