]> git.donarmstrong.com Git - mothur.git/blobdiff - readmatrix.cpp
fixed memory leak of groupmap in reads
[mothur.git] / readmatrix.cpp
index 72dd799ec6d2e419dd843db6288de313fa0b4078..9a98d5c393390104abfacffde8ceae948d277ac3 100644 (file)
@@ -9,15 +9,11 @@
 
 using namespace std;
 
-#include <string>
-#include <map>
 #include "utilities.hpp"
 #include "sparsematrix.hpp"
 #include "progress.hpp"
 #include "listvector.hpp"
 #include "rabundvector.hpp"
-#include <exception>
-
 #include "readmatrix.hpp"
 
 
@@ -73,7 +69,7 @@ void ReadPhylipMatrix::read(NameAssignment* nameMap){
        
                        if(square == 0){
 
-                               reading = new Progress("Reading matrix:    ", nseqs * (nseqs - 1) / 2);
+                               reading = new Progress("Reading matrix:     ", nseqs * (nseqs - 1) / 2);
                
                                int     index = 0;
                
@@ -115,7 +111,7 @@ void ReadPhylipMatrix::read(NameAssignment* nameMap){
                        }
                        else{
 
-                               reading = new Progress("Reading matrix:    ", nseqs * nseqs);
+                               reading = new Progress("Reading matrix:     ", nseqs * nseqs);
                        
                                int index = nseqs;
                
@@ -206,7 +202,7 @@ void ReadColumnMatrix::read(NameAssignment* nameMap){
 
                        list = new ListVector(nameMap->getListVector());
                
-                       Progress* reading = new Progress("Reading matrix:    ", nseqs * nseqs);
+                       Progress* reading = new Progress("Reading matrix:     ", nseqs * nseqs);
        
                        int lt = 1;
                        int refRow = 0; //we'll keep track of one cell - Cell(refRow,refCol) - and see if it's transpose