X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readdistcommand.cpp;h=8bf6996333b246814a28009d309ab8f3b6bf8718;hb=2009a1a1f47e7467094d844e7c07ab8ddf7bb447;hp=8dadc7e705c8fe78a9f4b47a3ed1479607745390;hpb=e150b0b0664caec517485ee6d69dcdade6dcae77;p=mothur.git diff --git a/readdistcommand.cpp b/readdistcommand.cpp index 8dadc7e..8bf6996 100644 --- a/readdistcommand.cpp +++ b/readdistcommand.cpp @@ -121,7 +121,7 @@ ReadDistCommand::ReadDistCommand(string option) { //get user cutoff and precision or use defaults string temp; temp = validParameter.validFile(parameters, "precision", false); if (temp == "not found") { temp = "100"; } - convert(temp, precision); + m->mothurConvert(temp, precision); temp = validParameter.validFile(parameters, "sim", false); if (temp == "not found") { temp = "F"; } sim = m->isTrue(temp); @@ -197,7 +197,7 @@ int ReadDistCommand::execute(){ m->openOutputFile(newGroupFile, outGroups); for (int i = 0; i < matrix->getNumSeqs(); i++) { - if (m->control_pressed) { delete groupMap; delete matrix; outGroups.close(); remove(newGroupFile.c_str()); return 0; } + if (m->control_pressed) { delete groupMap; delete matrix; outGroups.close(); m->mothurRemove(newGroupFile); return 0; } Names temp = matrix->getRowInfo(i); outGroups << temp.seqName << '\t' << temp.groupName << endl; @@ -214,7 +214,7 @@ int ReadDistCommand::execute(){ groupMap = new GroupMap(groupfile); groupMap->readMap(); - if (m->control_pressed) { delete groupMap; delete matrix; remove(newGroupFile.c_str()); return 0; } + if (m->control_pressed) { delete groupMap; delete matrix; m->mothurRemove(newGroupFile); return 0; } globaldata->gGroupmap = groupMap; }