X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=taxonomyequalizer.cpp;h=d3b24d1297f280f0b4f11a30724a3c9d61d8427f;hb=134a9c1275862a6b3ea10a2c0f11965c0a535854;hp=1d2832d5fc3a3ba31861d75d93dd202caf82261e;hpb=202846c98b9eff0eca7b20a570bfffa8ee4a5f4e;p=mothur.git diff --git a/taxonomyequalizer.cpp b/taxonomyequalizer.cpp index 1d2832d..d3b24d1 100644 --- a/taxonomyequalizer.cpp +++ b/taxonomyequalizer.cpp @@ -16,7 +16,7 @@ TaxEqualizer::TaxEqualizer(string tfile, int c, string o) : cutoff(c), outputDir containsConfidence = false; ifstream inTax; - openInputFile(tfile, inTax); + m->openInputFile(tfile, inTax); highestLevel = getHighestLevel(inTax); @@ -32,11 +32,11 @@ TaxEqualizer::TaxEqualizer(string tfile, int c, string o) : cutoff(c), outputDir inTax.close(); ifstream in; - openInputFile(tfile, in); + m->openInputFile(tfile, in); ofstream out; - equalizedFile = outputDir + getRootName(getSimpleName(tfile)) + "equalized.taxonomy"; - openOutputFile(equalizedFile, out); + equalizedFile = outputDir + m->getRootName(m->getSimpleName(tfile)) + "equalized.taxonomy"; + m->openOutputFile(equalizedFile, out); string name, tax; @@ -44,7 +44,7 @@ TaxEqualizer::TaxEqualizer(string tfile, int c, string o) : cutoff(c), outputDir if (m->control_pressed) { break; } - in >> name >> tax; gobble(in); + in >> name >> tax; m->gobble(in); if (containsConfidence) { removeConfidences(tax); } @@ -78,7 +78,7 @@ int TaxEqualizer::getHighestLevel(ifstream& in) { string name, tax; while (in) { - in >> name >> tax; gobble(in); + in >> name >> tax; m->gobble(in); //count levels in this taxonomy int thisLevel = 0;