X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=groupmap.cpp;fp=groupmap.cpp;h=47fbc36ee55ec4e2ff3fd9b934621eeef9a79a64;hb=260ae19c36cb11a53ddc5a75b5e507f8dd8b31d6;hp=d57646e3e3dad937d3ca0fa81b26f402cfa1ad4d;hpb=d84bb41d7dadcfa2c67ce5edb9b94060e5659fa7;p=mothur.git diff --git a/groupmap.cpp b/groupmap.cpp index d57646e..47fbc36 100644 --- a/groupmap.cpp +++ b/groupmap.cpp @@ -14,7 +14,7 @@ GroupMap::GroupMap(string filename) { m = MothurOut::getInstance(); groupFileName = filename; - openInputFile(filename, fileHandle); + m->openInputFile(filename, fileHandle); index = 0; } @@ -27,7 +27,7 @@ int GroupMap::readMap() { int error = 0; while(fileHandle){ - fileHandle >> seqName; gobble(fileHandle); //read from first column + fileHandle >> seqName; m->gobble(fileHandle); //read from first column fileHandle >> seqGroup; //read from second column if (m->control_pressed) { fileHandle.close(); return 1; } @@ -41,7 +41,7 @@ int GroupMap::readMap() { groupmap[seqName] = seqGroup; //store data in map seqsPerGroup[seqGroup]++; //increment number of seqs in that group } - gobble(fileHandle); + m->gobble(fileHandle); } fileHandle.close(); return error;