X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readphylip.cpp;h=6d7d4d0d7e322fc006a9e5ade0dcddbe453eee44;hb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;hp=5f92275eb9e6d4c8e3ee21241bbd6f626a295bc1;hpb=a218321731df14d231bbc08e79906f757cf1540d;p=mothur.git diff --git a/readphylip.cpp b/readphylip.cpp index 5f92275..6d7d4d0 100644 --- a/readphylip.cpp +++ b/readphylip.cpp @@ -38,7 +38,7 @@ void ReadPhylipMatrix::read(NameAssignment* nameMap){ } else{ list = new ListVector(nameMap->getListVector()); - if(nameMap->count(name)==0){ mothurOut("Error: Sequence '" + name + "' was not found in the names file, please correct"); mothurOutEndLine(); } + if(nameMap->count(name)==0){ m->mothurOut("Error: Sequence '" + name + "' was not found in the names file, please correct"); m->mothurOutEndLine(); } } char d; @@ -89,7 +89,7 @@ void ReadPhylipMatrix::read(NameAssignment* nameMap){ } else{ - if(nameMap->count(name)==0){ mothurOut("Error: Sequence '" + name + "' was not found in the names file, please correct"); mothurOutEndLine(); } + if(nameMap->count(name)==0){ m->mothurOut("Error: Sequence '" + name + "' was not found in the names file, please correct"); m->mothurOutEndLine(); } for(int j=0;j> distance; @@ -133,7 +133,7 @@ void ReadPhylipMatrix::read(NameAssignment* nameMap){ } else{ - if(nameMap->count(name)==0){ mothurOut("Error: Sequence '" + name + "' was not found in the names file, please correct"); mothurOutEndLine(); } + if(nameMap->count(name)==0){ m->mothurOut("Error: Sequence '" + name + "' was not found in the names file, please correct"); m->mothurOutEndLine(); } for(int j=0;j> distance; @@ -162,13 +162,13 @@ void ReadPhylipMatrix::read(NameAssignment* nameMap){ } if(nameMap->size() > 0){ //should probably tell them what is missing if we missed something - mothurOut("missed something\t" + toString(nameMap->size())); mothurOutEndLine(); + m->mothurOut("missed something\t" + toString(nameMap->size())); m->mothurOutEndLine(); } } */ } catch(exception& e) { - errorOut(e, "ReadPhylipMatrix", "read"); + m->errorOut(e, "ReadPhylipMatrix", "read"); exit(1); } }