X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=fullmatrix.cpp;fp=fullmatrix.cpp;h=fe61307552b67bdc4567d00025e1a1401a9e70f3;hb=e0fbf58358a72f20352cf2a43922ab6b5bdf0cf8;hp=8091554e946668fa47259f8157fb6bd489fb8b38;hpb=fbaa6c7ac44f857c1ece7c8199e9e7e09b4bbe74;p=mothur.git diff --git a/fullmatrix.cpp b/fullmatrix.cpp index 8091554..fe61307 100644 --- a/fullmatrix.cpp +++ b/fullmatrix.cpp @@ -56,7 +56,7 @@ FullMatrix::FullMatrix(ifstream& filehandle) { break; } } - cout << "here" << endl; + //read rest of matrix if (square == true) { readSquareMatrix(filehandle); } else { readLTMatrix(filehandle); } @@ -74,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); @@ -117,7 +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);