else {
//valid paramters for this command
- string Array[] = {"fasta", "phylip", "calc", "countends", "cutoff", "processors"};
+ string Array[] = {"fasta", "phylip", "calc", "countends", "cutoff", "processors", "outputdir","inputdir"};
vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
OptionParser parser(option);
map<string, string> parameters = parser.getParameters();
ValidParameters validParameter;
+ map<string, string>::iterator it2;
//check to make sure all parameters are valid for command
- for (map<string, string>::iterator it2 = parameters.begin(); it2 != parameters.end(); it2++) {
+ for (it2 = parameters.begin(); it2 != parameters.end(); it2++) {
if (validParameter.isValidParameter(it2->first, myArray, it2->second) != true) { abort = true; }
}
+ //if the user changes the input directory command factory will send this info to us in the output parameter
+ string inputDir = validParameter.validFile(parameters, "inputdir", false);
+ if (inputDir == "not found"){ inputDir = ""; }
+ else {
+ string path;
+ it2 = parameters.find("fasta");
+ //user has given a template file
+ if(it2 != parameters.end()){
+ path = 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; }
+ }
+ }
+
//check for required parameters
fastafile = validParameter.validFile(parameters, "fasta", true);
- if (fastafile == "not found") { cout << "fasta is a required parameter for the dist.seqs command." << endl; abort = true; }
+ if (fastafile == "not found") { mothurOut("fasta is a required parameter for the dist.seqs command."); mothurOutEndLine(); abort = true; }
else if (fastafile == "not open") { abort = true; }
else{
ifstream inFASTA;
alignDB = SequenceDB(inFASTA);
inFASTA.close();
}
+
+ //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
+ }
//check for optional parameter and set defaults
// ...at some point should added some additional type checking...
}
catch(exception& e) {
- cout << "Standard Error: " << e.what() << " has occurred in the DistanceCommand class Function DistanceCommand. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+ errorOut(e, "DistanceCommand", "DistanceCommand");
exit(1);
}
- catch(...) {
- cout << "An unknown error has occurred in the DistanceCommand class function DistanceCommand. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
- exit(1);
- }
}
//**********************************************************************************************************************
void DistanceCommand::help(){
try {
- cout << "The dist.seqs command reads a file containing sequences and creates a distance file." << "\n";
- cout << "The dist.seqs command parameters are fasta, calc, countends, cutoff and processors. " << "\n";
- cout << "The fasta parameter is required." << "\n";
- cout << "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";
- cout << "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";
- cout << "The cutoff parameter allows you to specify maximum distance to keep. The default is 1.0." << "\n";
- cout << "The processors parameter allows you to specify number of processors to use. The default is 1." << "\n";
- cout << "The dist.seqs command should be in the following format: " << "\n";
- cout << "dist.seqs(fasta=yourFastaFile, calc=yourCalc, countends=yourEnds, cutoff= yourCutOff, processors=yourProcessors) " << "\n";
- cout << "Example dist.seqs(fasta=amazon.fasta, calc=eachgap, countends=F, cutoff= 2.0, processors=3)." << "\n";
- cout << "Note: No spaces between parameter labels (i.e. calc), '=' and parameters (i.e.yourCalc)." << "\n" << "\n";
+ mothurOut("The dist.seqs command reads a file containing sequences and creates a distance file.\n");
+ mothurOut("The dist.seqs command parameters are fasta, calc, countends, cutoff and processors. \n");
+ mothurOut("The fasta parameter is required.\n");
+ 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");
+ 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");
+ mothurOut("The cutoff parameter allows you to specify maximum distance to keep. The default is 1.0.\n");
+ mothurOut("The processors parameter allows you to specify number of processors to use. The default is 1.\n");
+ mothurOut("The dist.seqs command should be in the following format: \n");
+ mothurOut("dist.seqs(fasta=yourFastaFile, calc=yourCalc, countends=yourEnds, cutoff= yourCutOff, processors=yourProcessors) \n");
+ mothurOut("Example dist.seqs(fasta=amazon.fasta, calc=eachgap, countends=F, cutoff= 2.0, processors=3).\n");
+ mothurOut("Note: No spaces between parameter labels (i.e. calc), '=' and parameters (i.e.yourCalc).\n\n");
}
catch(exception& e) {
- cout << "Standard Error: " << e.what() << " has occurred in the DistanceCommand class Function help. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+ errorOut(e, "DistanceCommand", "help");
exit(1);
}
- catch(...) {
- cout << "An unknown error has occurred in the DistanceCommand class function help. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
- exit(1);
- }
}
-
-
//**********************************************************************************************************************
int DistanceCommand::execute(){
//doses the user want the phylip formatted file as well
if (isTrue(phylip) == true) {
- outputFile = getRootName(fastafile) + "phylip.dist";
+ outputFile = outputDir + getRootName(getSimpleName(fastafile)) + "phylip.dist";
remove(outputFile.c_str());
//output numSeqs to phylip formatted dist file
}else { //user wants column format
- outputFile = getRootName(fastafile) + "dist";
+ outputFile = outputDir + getRootName(getSimpleName(fastafile)) + "dist";
remove(outputFile.c_str());
}
- //# if defined (_WIN32)
- //figure out how to implement the fork and wait commands in windows
- // driver(distCalculator, seqDB, 0, numSeqs, distFile, phylipFile, cutoff);
- //# endif
-
-
#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
//if you don't need to fork anything
if(processors == 1){
}
catch(exception& e) {
- cout << "Standard Error: " << e.what() << " has occurred in the DistanceCommand class Function execute. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+ errorOut(e, "DistanceCommand", "execute");
exit(1);
}
- catch(...) {
- cout << "An unknown error has occurred in the DistanceCommand class function execute. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
- exit(1);
- }
}
/**************************************************************************************************/
void DistanceCommand::createProcesses(string filename) {
}else if (pid == 0){
driver(lines[process]->start, lines[process]->end, filename + toString(getpid()) + ".temp", cutoff);
exit(0);
- }else { cout << "unable to spawn the necessary processes." << endl; exit(0); }
+ }else { mothurOut("unable to spawn the necessary processes."); mothurOutEndLine(); exit(0); }
}
//force parent to wait until all the processes are done
#endif
}
catch(exception& e) {
- cout << "Standard Error: " << e.what() << " has occurred in the DistanceCommand class Function createProcesses. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+ errorOut(e, "DistanceCommand", "createProcesses");
exit(1);
}
- catch(...) {
- cout << "An unknown error has occurred in the DistanceCommand class function createProcesses. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
- exit(1);
- }
}
/**************************************************************************************************/
outFile << setprecision(4);
if(isTrue(phylip) && startLine == 0){ outFile << alignDB.getNumSeqs() << endl; }
+
for(int i=startLine;i<endLine;i++){
- if(isTrue(phylip)) { outFile << alignDB.get(i).getName() << '\t'; }
+ if(isTrue(phylip)) {
+ string name = alignDB.get(i).getName();
+ if (name.length() < 10) { //pad with spaces to make compatible
+ while (name.length() < 10) { name += " "; }
+ }
+ outFile << name << '\t';
+ }
for(int j=0;j<i;j++){
distCalculator->calcDist(alignDB.get(i), alignDB.get(j));
double dist = distCalculator->getDist();
if (isTrue(phylip) == true) { outFile << endl; }
if(i % 100 == 0){
- cout << i << '\t' << time(NULL) - startTime << endl;
+ mothurOut(toString(i) + "\t" + toString(time(NULL) - startTime)); mothurOutEndLine();
}
}
- cout << endLine-1 << '\t' << time(NULL) - startTime << endl;
+ mothurOut(toString(endLine-1) + "\t" + toString(time(NULL) - startTime)); mothurOutEndLine();
outFile.close();
return 1;
}
catch(exception& e) {
- cout << "Standard Error: " << e.what() << " has occurred in the DistanceCommand class Function driver. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+ errorOut(e, "DistanceCommand", "driver");
exit(1);
}
- catch(...) {
- cout << "An unknown error has occurred in the DistanceCommand class function driver. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
- exit(1);
- }
-
}
-/**************************************************************************************************/
+/**************************************************************************************************
void DistanceCommand::appendFiles(string temp, string filename) {
try{
ofstream output;
output.close();
}
catch(exception& e) {
- cout << "Standard Error: " << e.what() << " has occurred in the DistanceCommand class Function appendFiles. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+ errorOut(e, "DistanceCommand", "appendFiles");
exit(1);
}
- catch(...) {
- cout << "An unknown error has occurred in the DistanceCommand class function appendFiles. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
- exit(1);
- }
}
/**************************************************************************************************/
projects / mothur.git / blobdiff