X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=distancecommand.cpp;h=60e90500866673aa8e643e024c3c60b840140dce;hb=f663afa231c9bc1b5e18e0ea3bdd2b2ee784f5b2;hp=ec32ffeb9e2e28b7398f78c5dd5fd858de2326a0;hpb=89d6711c2beed6ee75fb00e5e57f1a91564d3e89;p=mothur.git diff --git a/distancecommand.cpp b/distancecommand.cpp index ec32ffe..60e9050 100644 --- a/distancecommand.cpp +++ b/distancecommand.cpp @@ -26,13 +26,14 @@ DistanceCommand::DistanceCommand(string option) { else { //valid paramters for this command - string Array[] = {"fasta", "output", "calc", "countends", "cutoff", "processors", "outputdir","inputdir"}; + string Array[] = {"fasta","oldfasta","column", "output", "calc", "countends", "cutoff", "processors", "outputdir","inputdir","compress"}; + vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); OptionParser parser(option); map parameters = parser.getParameters(); - ValidParameters validParameter; + ValidParameters validParameter("dist.seqs"); map::iterator it2; //check to make sure all parameters are valid for command @@ -48,10 +49,26 @@ DistanceCommand::DistanceCommand(string option) { it2 = parameters.find("fasta"); //user has given a template file if(it2 != parameters.end()){ - path = hasPath(it2->second); + path = m->hasPath(it2->second); //if the user has not given a path then, add inputdir. else leave path alone. if (path == "") { parameters["fasta"] = inputDir + it2->second; } } + + it2 = parameters.find("oldfasta"); + //user has given a template file + if(it2 != parameters.end()){ + path = m->hasPath(it2->second); + //if the user has not given a path then, add inputdir. else leave path alone. + if (path == "") { parameters["oldfasta"] = inputDir + it2->second; } + } + + it2 = parameters.find("column"); + //user has given a template file + if(it2 != parameters.end()){ + path = m->hasPath(it2->second); + //if the user has not given a path then, add inputdir. else leave path alone. + if (path == "") { parameters["column"] = inputDir + it2->second; } + } } //check for required parameters @@ -60,15 +77,23 @@ DistanceCommand::DistanceCommand(string option) { else if (fastafile == "not open") { abort = true; } else{ ifstream inFASTA; - openInputFile(fastafile, inFASTA); + m->openInputFile(fastafile, inFASTA); alignDB = SequenceDB(inFASTA); inFASTA.close(); } + oldfastafile = validParameter.validFile(parameters, "oldfasta", true); + if (oldfastafile == "not found") { oldfastafile = ""; } + else if (oldfastafile == "not open") { abort = true; } + + column = validParameter.validFile(parameters, "column", true); + if (column == "not found") { column = ""; } + else if (column == "not open") { abort = true; } + //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(fastafile); //if user entered a file with a path then preserve it + outputDir += m->hasPath(fastafile); //if user entered a file with a path then preserve it } //check for optional parameter and set defaults @@ -78,7 +103,7 @@ DistanceCommand::DistanceCommand(string option) { else { if (calc == "default") { calc = "onegap"; } } - splitAtDash(calc, Estimators); + m->splitAtDash(calc, Estimators); string temp; temp = validParameter.validFile(parameters, "countends", false); if(temp == "not found"){ temp = "T"; } @@ -90,13 +115,20 @@ DistanceCommand::DistanceCommand(string option) { temp = validParameter.validFile(parameters, "processors", false); if(temp == "not found"){ temp = "1"; } convert(temp, processors); + temp = validParameter.validFile(parameters, "compress", false); if(temp == "not found"){ temp = "F"; } + convert(temp, compress); + output = validParameter.validFile(parameters, "output", false); if(output == "not found"){ output = "column"; } + if (((column != "") && (oldfastafile == "")) || ((column == "") && (oldfastafile != ""))) { m->mothurOut("If you provide column or oldfasta, you must provide both."); m->mothurOutEndLine(); abort=true; } + + if ((column != "") && (oldfastafile != "") && (output != "column")) { m->mothurOut("You have provided column and oldfasta, indicating you want to append distances to your column file. Your output must be in column format to do so."); m->mothurOutEndLine(); abort=true; } + if ((output != "column") && (output != "lt") && (output != "square")) { m->mothurOut(output + " is not a valid output form. Options are column, lt and square. I will use column."); m->mothurOutEndLine(); output = "column"; } ValidCalculators validCalculator; - if (isTrue(countends) == true) { + if (m->isTrue(countends) == true) { for (int i=0; imothurOut("The dist.seqs command reads a file containing sequences and creates a distance file.\n"); - m->mothurOut("The dist.seqs command parameters are fasta, calc, countends, output, cutoff and processors. \n"); + m->mothurOut("The dist.seqs command parameters are fasta, oldfasta, column, calc, countends, output, compress, cutoff and processors. \n"); m->mothurOut("The fasta parameter is required.\n"); + m->mothurOut("The oldfasta and column parameters allow you to append the distances calculated to the column file.\n"); m->mothurOut("The calc parameter allows you to specify the method of calculating the distances. Your options are: nogaps, onegap or eachgap. The default is onegap.\n"); m->mothurOut("The countends parameter allows you to specify whether to include terminal gaps in distance. Your options are: T or F. The default is T.\n"); m->mothurOut("The cutoff parameter allows you to specify maximum distance to keep. The default is 1.0.\n"); m->mothurOut("The output parameter allows you to specify format of your distance matrix. Options are column, lt, and square. The default is column.\n"); m->mothurOut("The processors parameter allows you to specify number of processors to use. The default is 1.\n"); + m->mothurOut("The compress parameter allows you to indicate that you want the resulting distance file compressed. The default is false.\n"); m->mothurOut("The dist.seqs command should be in the following format: \n"); m->mothurOut("dist.seqs(fasta=yourFastaFile, calc=yourCalc, countends=yourEnds, cutoff= yourCutOff, processors=yourProcessors) \n"); m->mothurOut("Example dist.seqs(fasta=amazon.fasta, calc=eachgap, countends=F, cutoff= 2.0, processors=3).\n"); @@ -164,21 +198,36 @@ int DistanceCommand::execute(){ int startTime = time(NULL); + //save number of new sequence + numNewFasta = alignDB.getNumSeqs(); + + //sanity check the oldfasta and column file as well as add oldfasta sequences to alignDB + if ((oldfastafile != "") && (column != "")) { if (!(sanityCheck())) { return 0; } } + + if (m->control_pressed) { return 0; } + int numSeqs = alignDB.getNumSeqs(); cutoff += 0.005; string outputFile; if (output == "lt") { //does the user want lower triangle phylip formatted file - outputFile = outputDir + getRootName(getSimpleName(fastafile)) + "phylip.dist"; + outputFile = outputDir + m->getRootName(m->getSimpleName(fastafile)) + "phylip.dist"; remove(outputFile.c_str()); //output numSeqs to phylip formatted dist file }else if (output == "column") { //user wants column format - outputFile = outputDir + getRootName(getSimpleName(fastafile)) + "dist"; + outputFile = outputDir + m->getRootName(m->getSimpleName(fastafile)) + "dist"; + + //so we don't accidentally overwrite + if (outputFile == column) { + string tempcolumn = column + ".old"; + rename(column.c_str(), tempcolumn.c_str()); + } + remove(outputFile.c_str()); }else { //assume square - outputFile = outputDir + getRootName(getSimpleName(fastafile)) + "square.dist"; + outputFile = outputDir + m->getRootName(m->getSimpleName(fastafile)) + "square.dist"; remove(outputFile.c_str()); } @@ -193,10 +242,15 @@ int DistanceCommand::execute(){ MPI_Comm_rank(MPI_COMM_WORLD, &pid); //find out who we are //each process gets where it should start and stop in the file - start = int (sqrt(float(pid)/float(processors)) * numSeqs); - end = int (sqrt(float(pid+1)/float(processors)) * numSeqs); + if (output != "square") { + start = int (sqrt(float(pid)/float(processors)) * numSeqs); + end = int (sqrt(float(pid+1)/float(processors)) * numSeqs); + }else{ + start = int ((float(pid)/float(processors)) * numSeqs); + end = int ((float(pid+1)/float(processors)) * numSeqs); + } - if (output != "lt") { + if (output == "column") { MPI_File outMPI; int amode=MPI_MODE_CREATE|MPI_MODE_WRONLY; @@ -213,7 +267,8 @@ int DistanceCommand::execute(){ //do your part string outputMyPart; - driverMPI(start, end, outMPI, cutoff); + + driverMPI(start, end, outMPI, cutoff); if (m->control_pressed) { MPI_File_close(&outMPI); delete distCalculator; return 0; } @@ -221,19 +276,19 @@ int DistanceCommand::execute(){ for(int i = 1; i < processors; i++) { if (m->control_pressed) { MPI_File_close(&outMPI); delete distCalculator; return 0; } - char buf[4]; - MPI_Recv(buf, 4, MPI_CHAR, i, tag, MPI_COMM_WORLD, &status); + char buf[5]; + MPI_Recv(buf, 5, MPI_CHAR, i, tag, MPI_COMM_WORLD, &status); } }else { //you are a child process //do your part - driverMPI(start, end, outMPI, cutoff); + driverMPI(start, end, outMPI, cutoff); if (m->control_pressed) { MPI_File_close(&outMPI); delete distCalculator; return 0; } - char buf[4]; + char buf[5]; strcpy(buf, "done"); //tell parent you are done. - MPI_Send(buf, 4, MPI_CHAR, 0, tag, MPI_COMM_WORLD); + MPI_Send(buf, 5, MPI_CHAR, 0, tag, MPI_COMM_WORLD); } MPI_File_close(&outMPI); @@ -243,8 +298,10 @@ int DistanceCommand::execute(){ //do your part string outputMyPart; - long mySize; - driverMPI(start, end, outputFile, mySize); + unsigned long int mySize; + + if (output != "square"){ driverMPI(start, end, outputFile, mySize); } + else { driverMPI(start, end, outputFile, mySize, output); } if (m->control_pressed) { delete distCalculator; return 0; } @@ -263,7 +320,7 @@ int DistanceCommand::execute(){ //wait on chidren for(int b = 1; b < processors; b++) { - long fileSize; + unsigned long int fileSize; if (m->control_pressed) { MPI_File_close(&outMPI); delete distCalculator; return 0; } @@ -291,8 +348,9 @@ int DistanceCommand::execute(){ MPI_File_close(&outMPI); }else { //you are a child process //do your part - long size; - driverMPI(start, end, (outputFile + toString(pid) + ".temp"), size); + unsigned long int size; + if (output != "square"){ driverMPI(start, end, (outputFile + toString(pid) + ".temp"), size); } + else { driverMPI(start, end, (outputFile + toString(pid) + ".temp"), size, output); } if (m->control_pressed) { delete distCalculator; return 0; } @@ -300,18 +358,25 @@ int DistanceCommand::execute(){ MPI_Send(&size, 1, MPI_LONG, 0, tag, MPI_COMM_WORLD); } } + MPI_Barrier(MPI_COMM_WORLD); //make everyone wait - just in case #else #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) //if you don't need to fork anything if(processors == 1){ - driver(0, numSeqs, outputFile, cutoff); + if (output != "square") { driver(0, numSeqs, outputFile, cutoff); } + else { driver(0, numSeqs, outputFile, "square"); } }else{ //you have multiple processors for (int i = 0; i < processors; i++) { lines.push_back(new linePair()); - lines[i]->start = int (sqrt(float(i)/float(processors)) * numSeqs); - lines[i]->end = int (sqrt(float(i+1)/float(processors)) * numSeqs); + if (output != "square") { + lines[i]->start = int (sqrt(float(i)/float(processors)) * numSeqs); + lines[i]->end = int (sqrt(float(i+1)/float(processors)) * numSeqs); + }else{ + lines[i]->start = int ((float(i)/float(processors)) * numSeqs); + lines[i]->end = int ((float(i+1)/float(processors)) * numSeqs); + } } createProcesses(outputFile); @@ -322,13 +387,14 @@ int DistanceCommand::execute(){ //append and remove temp files for (; it != processIDS.end(); it++) { - appendFiles((outputFile + toString(it->second) + ".temp"), outputFile); + m->appendFiles((outputFile + toString(it->second) + ".temp"), outputFile); remove((outputFile + toString(it->second) + ".temp").c_str()); } } #else - ifstream inFASTA; - driver(0, numSeqs, outputFile, cutoff); + //ifstream inFASTA; + if (output != "square") { driver(0, numSeqs, outputFile, cutoff); } + else { driver(0, numSeqs, outputFile, "square"); } #endif #endif @@ -340,14 +406,35 @@ int DistanceCommand::execute(){ if (pid == 0) { //only one process should output to screen #endif - if (output == "square") { convertMatrix(outputFile); } + //if (output == "square") { convertMatrix(outputFile); } ifstream fileHandle; fileHandle.open(outputFile.c_str()); if(fileHandle) { - gobble(fileHandle); + m->gobble(fileHandle); if (fileHandle.eof()) { m->mothurOut(outputFile + " is blank. This can result if there are no distances below your cutoff."); m->mothurOutEndLine(); } } + + //append the old column file to the new one + if ((oldfastafile != "") && (column != "")) { + //we had to rename the column file so we didnt overwrite above, but we want to keep old name + if (outputFile == column) { + string tempcolumn = column + ".old"; + m->appendFiles(tempcolumn, outputFile); + remove(tempcolumn.c_str()); + }else{ + m->appendFiles(outputFile, column); + remove(outputFile.c_str()); + outputFile = column; + } + + if (outputDir != "") { + string newOutputName = outputDir + m->getSimpleName(outputFile); + rename(outputFile.c_str(), newOutputName.c_str()); + remove(outputFile.c_str()); + outputFile = newOutputName; + } + } #ifdef USE_MPI @@ -363,6 +450,14 @@ int DistanceCommand::execute(){ m->mothurOut(outputFile); m->mothurOutEndLine(); m->mothurOutEndLine(); m->mothurOut("It took " + toString(time(NULL) - startTime) + " to calculate the distances for " + toString(numSeqs) + " sequences."); m->mothurOutEndLine(); + + + if (m->isTrue(compress)) { + m->mothurOut("Compressing..."); m->mothurOutEndLine(); + m->mothurOut("(Replacing " + outputFile + " with " + outputFile + ".gz)"); m->mothurOutEndLine(); + system(("gzip -v " + outputFile).c_str()); + } + return 0; } @@ -386,7 +481,8 @@ void DistanceCommand::createProcesses(string filename) { processIDS[lines[process]->end] = pid; //create map from line number to pid so you can append files in correct order later process++; }else if (pid == 0){ - driver(lines[process]->start, lines[process]->end, filename + toString(getpid()) + ".temp", cutoff); + if (output != "square") { driver(lines[process]->start, lines[process]->end, filename + toString(getpid()) + ".temp", cutoff); } + else { driver(lines[process]->start, lines[process]->end, filename + toString(getpid()) + ".temp", "square"); } exit(0); }else { m->mothurOut("unable to spawn the necessary processes."); m->mothurOutEndLine(); exit(0); } } @@ -430,6 +526,10 @@ int DistanceCommand::driver(int startLine, int endLine, string dFileName, float if (m->control_pressed) { outFile.close(); return 0; } + //if there was a column file given and we are appending, we don't want to calculate the distances that are already in the column file + //the alignDB contains the new sequences and then the old, so if i an oldsequence and j is an old sequence then break out of this loop + if ((i >= numNewFasta) && (j >= numNewFasta)) { break; } + distCalculator->calcDist(alignDB.get(i), alignDB.get(j)); double dist = distCalculator->getDist(); @@ -437,12 +537,6 @@ int DistanceCommand::driver(int startLine, int endLine, string dFileName, float if (output == "column") { outFile << alignDB.get(i).getName() << ' ' << alignDB.get(j).getName() << ' ' << dist << endl; } } if (output == "lt") { outFile << dist << '\t'; } - - if (output == "square") { //make a square column you can convert to square phylip - outFile << alignDB.get(i).getName() << '\t' << alignDB.get(j).getName() << '\t' << dist << endl; - outFile << alignDB.get(j).getName() << '\t' << alignDB.get(i).getName() << '\t' << dist << endl; - } - } if (output == "lt") { outFile << endl; } @@ -463,6 +557,56 @@ int DistanceCommand::driver(int startLine, int endLine, string dFileName, float exit(1); } } +/**************************************************************************************************/ +/////// need to fix to work with calcs and sequencedb +int DistanceCommand::driver(int startLine, int endLine, string dFileName, string square){ + try { + + int startTime = time(NULL); + + //column file + ofstream outFile(dFileName.c_str(), ios::trunc); + outFile.setf(ios::fixed, ios::showpoint); + outFile << setprecision(4); + + if(startLine == 0){ outFile << alignDB.getNumSeqs() << endl; } + + for(int i=startLine;icontrol_pressed) { outFile.close(); return 0; } + + distCalculator->calcDist(alignDB.get(i), alignDB.get(j)); + double dist = distCalculator->getDist(); + + outFile << dist << '\t'; + } + + outFile << endl; + + if(i % 100 == 0){ + m->mothurOut(toString(i) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine(); + } + + } + m->mothurOut(toString(endLine-1) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine(); + + outFile.close(); + + return 1; + } + catch(exception& e) { + m->errorOut(e, "DistanceCommand", "driver"); + exit(1); + } +} #ifdef USE_MPI /**************************************************************************************************/ /////// need to fix to work with calcs and sequencedb @@ -479,16 +623,15 @@ int DistanceCommand::driverMPI(int startLine, int endLine, MPI_File& outMPI, flo if (m->control_pressed) { return 0; } + //if there was a column file given and we are appending, we don't want to calculate the distances that are already in the column file + //the alignDB contains the new sequences and then the old, so if i an oldsequence and j is an old sequence then break out of this loop + if ((i >= numNewFasta) && (j >= numNewFasta)) { break; } + distCalculator->calcDist(alignDB.get(i), alignDB.get(j)); double dist = distCalculator->getDist(); if(dist <= cutoff){ - if (output == "column") { outputString += (alignDB.get(i).getName() + ' ' + alignDB.get(j).getName() + ' ' + toString(dist) + '\n'); } - } - - if (output == "square") { //make a square column you can convert to square phylip - outputString += (alignDB.get(i).getName() + ' ' + alignDB.get(j).getName() + ' ' + toString(dist) + '\n'); - outputString += (alignDB.get(j).getName() + ' ' + alignDB.get(i).getName() + ' ' + toString(dist) + '\n'); + outputString += (alignDB.get(i).getName() + ' ' + alignDB.get(j).getName() + ' ' + toString(dist) + '\n'); } } @@ -521,7 +664,7 @@ int DistanceCommand::driverMPI(int startLine, int endLine, MPI_File& outMPI, flo } /**************************************************************************************************/ /////// need to fix to work with calcs and sequencedb -int DistanceCommand::driverMPI(int startLine, int endLine, string file, long& size){ +int DistanceCommand::driverMPI(int startLine, int endLine, string file, unsigned long int& size){ try { MPI_Status status; @@ -542,16 +685,16 @@ int DistanceCommand::driverMPI(int startLine, int endLine, string file, long& si string outputString = ""; size = 0; - if((output == "lt") && startLine == 0){ outputString += toString(alignDB.getNumSeqs()) + "\n"; } + if(startLine == 0){ outputString += toString(alignDB.getNumSeqs()) + "\n"; } for(int i=startLine;icontrol_pressed) { return 0; } @@ -559,10 +702,10 @@ int DistanceCommand::driverMPI(int startLine, int endLine, string file, long& si distCalculator->calcDist(alignDB.get(i), alignDB.get(j)); double dist = distCalculator->getDist(); - if (output == "lt") { outputString += toString(dist) + "\t"; } + outputString += toString(dist) + "\t"; } - if (output == "lt") { outputString += "\n"; } + outputString += "\n"; if(i % 100 == 0){ @@ -593,13 +736,87 @@ int DistanceCommand::driverMPI(int startLine, int endLine, string file, long& si exit(1); } } -#endif /**************************************************************************************************/ +/////// need to fix to work with calcs and sequencedb +int DistanceCommand::driverMPI(int startLine, int endLine, string file, unsigned long int& size, string square){ + try { + MPI_Status status; + + MPI_File outMPI; + int amode=MPI_MODE_CREATE|MPI_MODE_WRONLY; + + //char* filename = new char[file.length()]; + //memcpy(filename, file.c_str(), file.length()); + + char filename[1024]; + strcpy(filename, file.c_str()); + + MPI_File_open(MPI_COMM_SELF, filename, amode, MPI_INFO_NULL, &outMPI); + //delete filename; + + int startTime = time(NULL); + + string outputString = ""; + size = 0; + + if(startLine == 0){ outputString += toString(alignDB.getNumSeqs()) + "\n"; } + + for(int i=startLine;icontrol_pressed) { return 0; } + + distCalculator->calcDist(alignDB.get(i), alignDB.get(j)); + double dist = distCalculator->getDist(); + + outputString += toString(dist) + "\t"; + } + + outputString += "\n"; + + + if(i % 100 == 0){ + //m->mothurOut(toString(i) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine(); + cout << i << '\t' << (time(NULL) - startTime) << endl; + } + + + //send results to parent + int length = outputString.length(); + char* buf = new char[length]; + memcpy(buf, outputString.c_str(), length); + + MPI_File_write(outMPI, buf, length, MPI_CHAR, &status); + size += outputString.length(); + outputString = ""; + delete buf; + } + + //m->mothurOut(toString(endLine-1) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine(); + cout << (endLine-1) << '\t' << (time(NULL) - startTime) << endl; + MPI_File_close(&outMPI); + + return 1; + } + catch(exception& e) { + m->errorOut(e, "DistanceCommand", "driverMPI"); + exit(1); + } +} +#endif +/************************************************************************************************** int DistanceCommand::convertMatrix(string outputFile) { try{ //sort file by first column so the distances for each row are together - string outfile = getRootName(outputFile) + "sorted.dist.temp"; + string outfile = m->getRootName(outputFile) + "sorted.dist.temp"; //use the unix sort #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) @@ -613,10 +830,10 @@ int DistanceCommand::convertMatrix(string outputFile) { //output to new file distance for each row and save positions in file where new row begins ifstream in; - openInputFile(outfile, in); + m->openInputFile(outfile, in); ofstream out; - openOutputFile(outputFile, out); + m->openOutputFile(outputFile, out); out.setf(ios::fixed, ios::floatfield); out.setf(ios::showpoint); @@ -634,12 +851,12 @@ int DistanceCommand::convertMatrix(string outputFile) { rowDists[first] = 0.00; //distance to yourself is 0.0 in.seekg(0); - //openInputFile(outfile, in); + //m->openInputFile(outfile, in); while(!in.eof()) { if (m->control_pressed) { in.close(); remove(outfile.c_str()); out.close(); return 0; } - in >> first >> second >> dist; gobble(in); + in >> first >> second >> dist; m->gobble(in); if (first != currentRow) { //print out last row @@ -682,12 +899,12 @@ int DistanceCommand::convertMatrix(string outputFile) { exit(1); } } -/**************************************************************************************************/ +/************************************************************************************************** int DistanceCommand::convertToLowerTriangle(string outputFile) { try{ //sort file by first column so the distances for each row are together - string outfile = getRootName(outputFile) + "sorted.dist.temp"; + string outfile = m->getRootName(outputFile) + "sorted.dist.temp"; //use the unix sort #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) @@ -701,10 +918,10 @@ int DistanceCommand::convertToLowerTriangle(string outputFile) { //output to new file distance for each row and save positions in file where new row begins ifstream in; - openInputFile(outfile, in); + m->openInputFile(outfile, in); ofstream out; - openOutputFile(outputFile, out); + m->openOutputFile(outputFile, out); out.setf(ios::fixed, ios::floatfield); out.setf(ios::showpoint); @@ -724,12 +941,12 @@ int DistanceCommand::convertToLowerTriangle(string outputFile) { rowDists[first] = 0.00; //distance to yourself is 0.0 in.seekg(0); - //openInputFile(outfile, in); + //m->openInputFile(outfile, in); while(!in.eof()) { if (m->control_pressed) { in.close(); remove(outfile.c_str()); out.close(); return 0; } - in >> first >> second >> dist; gobble(in); + in >> first >> second >> dist; m->gobble(in); if (first != currentRow) { //print out last row @@ -776,29 +993,98 @@ int DistanceCommand::convertToLowerTriangle(string outputFile) { exit(1); } } -/************************************************************************************************** -void DistanceCommand::appendFiles(string temp, string filename) { +/**************************************************************************************************/ +//its okay if the column file does not contain all the names in the fasta file, since some distance may have been above a cutoff, +//but no sequences can be in the column file that are not in oldfasta. also, if a distance is above the cutoff given then remove it. +//also check to make sure the 2 files have the same alignment length. +bool DistanceCommand::sanityCheck() { try{ - ofstream output; - ifstream input; - - //open output file in append mode - openOutputFileAppend(filename, output); - openInputFile(temp, input); + bool good = true; + + //make sure the 2 fasta files have the same alignment length + ifstream in; + m->openInputFile(fastafile, in); + int fastaAlignLength = 0; + if (in) { + Sequence tempIn(in); + fastaAlignLength = tempIn.getAligned().length(); + } + in.close(); + + ifstream in2; + m->openInputFile(oldfastafile, in2); + int oldfastaAlignLength = 0; + if (in2) { + Sequence tempIn2(in2); + oldfastaAlignLength = tempIn2.getAligned().length(); + } + in2.close(); + + if (fastaAlignLength != oldfastaAlignLength) { m->mothurOut("fasta files do not have the same alignment length."); m->mothurOutEndLine(); return false; } + + //read fasta file and save names as well as adding them to the alignDB + set namesOldFasta; + + ifstream inFasta; + m->openInputFile(oldfastafile, inFasta); + + while (!inFasta.eof()) { + if (m->control_pressed) { inFasta.close(); return good; } + + Sequence temp(inFasta); + + if (temp.getName() != "") { + namesOldFasta.insert(temp.getName()); //save name + alignDB.push_back(temp); //add to DB + } + + m->gobble(inFasta); + } + + inFasta.close(); + + //read through the column file checking names and removing distances above the cutoff + ifstream inDist; + m->openInputFile(column, inDist); - while(char c = input.get()){ - if(input.eof()) { break; } - else { output << c; } + ofstream outDist; + string outputFile = column + ".temp"; + m->openOutputFile(outputFile, outDist); + + string name1, name2; + float dist; + while (!inDist.eof()) { + if (m->control_pressed) { inDist.close(); outDist.close(); remove(outputFile.c_str()); return good; } + + inDist >> name1 >> name2 >> dist; m->gobble(inDist); + + //both names are in fasta file and distance is below cutoff + if ((namesOldFasta.count(name1) == 0) || (namesOldFasta.count(name2) == 0)) { good = false; break; } + else{ + if (dist <= cutoff) { + outDist << name1 << '\t' << name2 << '\t' << dist << endl; + } + } + } + + inDist.close(); + outDist.close(); + + if (good) { + remove(column.c_str()); + rename(outputFile.c_str(), column.c_str()); + }else{ + remove(outputFile.c_str()); //temp file is bad because file mismatch above } - input.close(); - output.close(); } catch(exception& e) { - m->errorOut(e, "DistanceCommand", "appendFiles"); + m->errorOut(e, "DistanceCommand", "m->appendFiles"); exit(1); } } /**************************************************************************************************/ + +