X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=flowdata.cpp;h=7d61f8c265e060f2dc0002c94f69edfd054f89ae;hp=b2e856c28e5c939a00102e19d34a97799c11ae08;hb=615301e57c25e241356a9c2380648d117709458d;hpb=7d9e2bc58855132983da7ac9342880bc95055f77 diff --git a/flowdata.cpp b/flowdata.cpp index b2e856c..7d61f8c 100644 --- a/flowdata.cpp +++ b/flowdata.cpp @@ -68,9 +68,7 @@ string FlowData::getSequenceName(ifstream& flowFile) { flowFile >> name; if (name.length() != 0) { - for (int i = 0; i < name.length(); i++) { - if (name[i] == ':') { name[i] = '_'; m->changedSeqNames = true; } - } + m->checkName(name); }else{ m->mothurOut("Error in reading your flowfile, at position " + toString(flowFile.tellg()) + ". Blank name."); m->mothurOutEndLine(); m->control_pressed = true; } return name; @@ -192,6 +190,27 @@ void FlowData::capFlows(int mF){ //********************************************************************************************************************** +bool FlowData::hasGoodHomoP(){ + + try{ + + float maxIntensity = (float) maxHomoP + 0.49; + + for(int i=0;i maxIntensity){ + return 0; + } + } + return 1; + } + catch(exception& e) { + m->errorOut(e, "FlowData", "hasMinFlows"); + exit(1); + } +} + +//********************************************************************************************************************** + bool FlowData::hasMinFlows(int minFlows){ try{