it = parameters.find("blast");
//user has given a template file
if(it != parameters.end()){
- path = hasPath(it->second);
+ path = m->hasPath(it->second);
//if the user has not given a path then, add inputdir. else leave path alone.
if (path == "") { parameters["blast"] = inputDir + it->second; }
}
it = parameters.find("name");
//user has given a template file
if(it != parameters.end()){
- path = hasPath(it->second);
+ path = m->hasPath(it->second);
//if the user has not given a path then, add inputdir. else leave path alone.
if (path == "") { parameters["name"] = inputDir + it->second; }
}
//if the user changes the output directory command factory will send this info to us in the output parameter
outputDir = validParameter.validFile(parameters, "outputdir", false); if (outputDir == "not found"){
outputDir = "";
- outputDir += hasPath(blastfile); //if user entered a file with a path then preserve it
+ outputDir += m->hasPath(blastfile); //if user entered a file with a path then preserve it
}
namefile = validParameter.validFile(parameters, "name", true);
convert(temp, penalty);
temp = validParameter.validFile(parameters, "min", false); if (temp == "not found") { temp = "true"; }
- minWanted = isTrue(temp);
+ minWanted = m->isTrue(temp);
temp = validParameter.validFile(parameters, "merge", false); if (temp == "not found") { temp = "true"; }
- merge = isTrue(temp);
+ merge = m->isTrue(temp);
temp = validParameter.validFile(parameters, "hcluster", false); if (temp == "not found") { temp = "false"; }
- hclusterWanted = isTrue(temp);
+ hclusterWanted = m->isTrue(temp);
temp = validParameter.validFile(parameters, "hard", false); if (temp == "not found") { temp = "F"; }
- hard = isTrue(temp);
+ hard = m->isTrue(temp);
}
}
nameMap->readMap();
}else{ nameMap= new NameAssignment(); }
- string fileroot = outputDir + getRootName(getSimpleName(blastfile));
+ string fileroot = outputDir + m->getRootName(m->getSimpleName(blastfile));
string tag = "";
time_t start;
float previousDist = 0.00000;
else { tag = "an"; }
//open output files
- openOutputFile(fileroot+ tag + ".list", listFile);
- openOutputFile(fileroot+ tag + ".rabund", rabundFile);
- openOutputFile(fileroot+ tag + ".sabund", sabundFile);
+ m->openOutputFile(fileroot+ tag + ".list", listFile);
+ m->openOutputFile(fileroot+ tag + ".rabund", rabundFile);
+ m->openOutputFile(fileroot+ tag + ".sabund", sabundFile);
if (m->control_pressed) {
delete nameMap; delete read; delete list; delete rabund;
float dist = distMatrix->getSmallDist();
float rndDist;
if (hard) {
- rndDist = ceilDist(dist, precision);
+ rndDist = m->ceilDist(dist, precision);
}else{
- rndDist = roundDist(dist, precision);
+ rndDist = m->roundDist(dist, precision);
}
if(previousDist <= 0.0000 && dist != previousDist){
vector<seqDist> seqs; seqs.resize(1); // to start loop
//ifstream inHcluster;
- //openInputFile(distFile, inHcluster);
+ //m->openInputFile(distFile, inHcluster);
if (m->control_pressed) {
delete nameMap; delete list; delete rabund; delete hcluster;
float rndDist;
if (hard) {
- rndDist = ceilDist(seqs[i].dist, precision);
+ rndDist = m->ceilDist(seqs[i].dist, precision);
}else{
- rndDist = roundDist(seqs[i].dist, precision);
+ rndDist = m->roundDist(seqs[i].dist, precision);
}
if((previousDist <= 0.0000) && (seqs[i].dist != previousDist)){
int count = 0;
if (hclusterWanted) {
- openInputFile(overlapFile, inOverlap);
+ m->openInputFile(overlapFile, inOverlap);
if (inOverlap.eof()) { done = true; }
}else { if (overlapMatrix.size() == 0) { done = true; } }
if (!inOverlap.eof()) {
string firstName, secondName;
float overlapDistance;
- inOverlap >> firstName >> secondName >> overlapDistance; gobble(inOverlap);
+ inOverlap >> firstName >> secondName >> overlapDistance; m->gobble(inOverlap);
- map<string,int>::iterator itA = nameMap->find(firstName);
- map<string,int>::iterator itB = nameMap->find(secondName);
- if(itA == nameMap->end()){ cerr << "AAError: Sequence '" << firstName << "' was not found in the names file, please correct\n"; exit(1); }
- if(itB == nameMap->end()){ cerr << "ABError: Sequence '" << secondName << "' was not found in the names file, please correct\n"; exit(1); }
+ //commented out because we check this in readblast already
+ //map<string,int>::iterator itA = nameMap->find(firstName);
+ //map<string,int>::iterator itB = nameMap->find(secondName);
+ //if(itA == nameMap->end()){ cerr << "AAError: Sequence '" << firstName << "' was not found in the names file, please correct\n"; exit(1); }
+ //if(itB == nameMap->end()){ cerr << "ABError: Sequence '" << secondName << "' was not found in the names file, please correct\n"; exit(1); }
- overlapNode.seq1 = itA->second;
- overlapNode.seq2 = itB->second;
+ //overlapNode.seq1 = itA->second;
+ //overlapNode.seq2 = itB->second;
+ overlapNode.seq1 = nameMap->get(firstName);
+ overlapNode.seq2 = nameMap->get(secondName);
overlapNode.dist = overlapDistance;
}else { inOverlap.close(); break; }
}
string name2 = nameMap->get(overlapNode.seq2);
//use binInfo to find out if they are already in the same bin
- map<string, int>::iterator itBin1 = binInfo.find(name1);
- map<string, int>::iterator itBin2 = binInfo.find(name2);
+ //map<string, int>::iterator itBin1 = binInfo.find(name1);
+ //map<string, int>::iterator itBin2 = binInfo.find(name2);
- if(itBin1 == binInfo.end()){ cerr << "AAError: Sequence '" << name1 << "' does not have any bin info.\n"; exit(1); }
- if(itBin2 == binInfo.end()){ cerr << "ABError: Sequence '" << name2 << "' does not have any bin info.\n"; exit(1); }
+ //if(itBin1 == binInfo.end()){ cerr << "AAError: Sequence '" << name1 << "' does not have any bin info.\n"; exit(1); }
+ //if(itBin2 == binInfo.end()){ cerr << "ABError: Sequence '" << name2 << "' does not have any bin info.\n"; exit(1); }
- int binKeep = itBin1->second;
- int binRemove = itBin2->second;
+ //int binKeep = itBin1->second;
+ //int binRemove = itBin2->second;
+
+ int binKeep = binInfo[name1];
+ int binRemove = binInfo[name2];
//if not merge bins and update binInfo
if(binKeep != binRemove) {
void MGClusterCommand::sortHclusterFiles(string unsortedDist, string unsortedOverlap) {
try {
//sort distFile
- string sortedDistFile = sortFile(unsortedDist, outputDir);
+ string sortedDistFile = m->sortFile(unsortedDist, outputDir);
remove(unsortedDist.c_str()); //delete unsorted file
distFile = sortedDistFile;
//sort overlap file
- string sortedOverlapFile = sortFile(unsortedOverlap, outputDir);
+ string sortedOverlapFile = m->sortFile(unsortedOverlap, outputDir);
remove(unsortedOverlap.c_str()); //delete unsorted file
overlapFile = sortedOverlapFile;
}