X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=treegroupscommand.cpp;h=9594767f81ad234a969db760d7cc0be6e1575111;hb=afcbef163b4f32d0ff25a834cb9af8eef8d06ffa;hp=0f106c493d1d55f7e742ed1195e1557f435d6e49;hpb=786d5631d9cd5baa6ed6ef16f8b4b384cbc7470f;p=mothur.git diff --git a/treegroupscommand.cpp b/treegroupscommand.cpp index 0f106c4..9594767 100644 --- a/treegroupscommand.cpp +++ b/treegroupscommand.cpp @@ -22,12 +22,11 @@ //********************************************************************************************************************** -TreeGroupCommand::TreeGroupCommand(string option){ +TreeGroupCommand::TreeGroupCommand(string option) { try { globaldata = GlobalData::getInstance(); abort = false; allLines = 1; - lines.clear(); labels.clear(); Groups.clear(); Estimators.clear(); @@ -37,74 +36,95 @@ TreeGroupCommand::TreeGroupCommand(string option){ else { //valid paramters for this command - string Array[] = {"line","label","calc","groups", "phylip", "column", "name", "precision","cutoff"}; + string Array[] = {"label","calc","groups", "phylip", "column", "name", "precision","cutoff","outputdir","inputdir"}; vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); OptionParser parser(option); map parameters = parser. getParameters(); ValidParameters validParameter; + map::iterator it; //check to make sure all parameters are valid for command - for (map::iterator it = parameters.begin(); it != parameters.end(); it++) { + for (it = parameters.begin(); it != parameters.end(); it++) { if (validParameter.isValidParameter(it->first, myArray, it->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; + it = parameters.find("phylip"); + //user has given a template file + if(it != parameters.end()){ + path = m->hasPath(it->second); + //if the user has not given a path then, add inputdir. else leave path alone. + if (path == "") { parameters["phylip"] = inputDir + it->second; } + } + + it = parameters.find("column"); + //user has given a template file + if(it != parameters.end()){ + path = m->hasPath(it->second); + //if the user has not given a path then, add inputdir. else leave path alone. + if (path == "") { parameters["column"] = inputDir + it->second; } + } + + it = parameters.find("name"); + //user has given a template file + if(it != parameters.end()){ + 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; } + } + } + + format = globaldata->getFormat(); + //required parameters phylipfile = validParameter.validFile(parameters, "phylip", true); if (phylipfile == "not open") { abort = true; } else if (phylipfile == "not found") { phylipfile = ""; } - else { format = "phylip"; } + else { format = "phylip"; globaldata->setPhylipFile(phylipfile); } columnfile = validParameter.validFile(parameters, "column", true); if (columnfile == "not open") { abort = true; } else if (columnfile == "not found") { columnfile = ""; } - else { format = "column"; } + else { format = "column"; globaldata->setColumnFile(columnfile); } namefile = validParameter.validFile(parameters, "name", true); if (namefile == "not open") { abort = true; } else if (namefile == "not found") { namefile = ""; } else { globaldata->setNameFile(namefile); } - format = globaldata->getFormat(); - //error checking on files - if ((globaldata->getSharedFile() == "") && ((phylipfile == "") && (columnfile == ""))) { cout << "You must run the read.otu command or provide a distance file before running the tree.shared command." << endl; abort = true; } - else if ((phylipfile != "") && (columnfile != "")) { cout << "When running the tree.shared command with a distance file you may not use both the column and the phylip parameters." << endl; abort = true; } + if ((globaldata->getSharedFile() == "") && ((phylipfile == "") && (columnfile == ""))) { m->mothurOut("You must run the read.otu command or provide a distance file before running the tree.shared command."); m->mothurOutEndLine(); abort = true; } + else if ((phylipfile != "") && (columnfile != "")) { m->mothurOut("When running the tree.shared command with a distance file you may not use both the column and the phylip parameters."); m->mothurOutEndLine(); abort = true; } if (columnfile != "") { - if (namefile == "") { cout << "You need to provide a namefile if you are going to use the column format." << endl; abort = true; } + if (namefile == "") { m->mothurOut("You need to provide a namefile if you are going to use the column format."); m->mothurOutEndLine(); abort = true; } } //check for optional parameter and set defaults // ...at some point should added some additional type checking... - line = validParameter.validFile(parameters, "line", false); - if (line == "not found") { line = ""; } - else { - if(line != "all") { splitAtDash(line, lines); allLines = 0; } - else { allLines = 1; } - } - label = validParameter.validFile(parameters, "label", false); if (label == "not found") { label = ""; } else { - if(label != "all") { splitAtDash(label, labels); allLines = 0; } + if(label != "all") { m->splitAtDash(label, labels); allLines = 0; } else { allLines = 1; } } - //make sure user did not use both the line and label parameters - if ((line != "") && (label != "")) { cout << "You cannot use both the line and label parameters at the same time. " << endl; abort = true; } - //if the user has not specified any line or labels use the ones from read.otu - else if((line == "") && (label == "")) { + //if the user has not specified any labels use the ones from read.otu + if(label == "") { allLines = globaldata->allLines; labels = globaldata->labels; - lines = globaldata->lines; } groups = validParameter.validFile(parameters, "groups", false); if (groups == "not found") { groups = ""; } else { - splitAtDash(groups, Groups); + m->splitAtDash(groups, Groups); globaldata->Groups = Groups; } @@ -113,7 +133,7 @@ TreeGroupCommand::TreeGroupCommand(string option){ else { if (calc == "default") { calc = "jclass-thetayc"; } } - splitAtDash(calc, Estimators); + m->splitAtDash(calc, Estimators); string temp; temp = validParameter.validFile(parameters, "precision", false); if (temp == "not found") { temp = "100"; } @@ -122,6 +142,12 @@ TreeGroupCommand::TreeGroupCommand(string option){ temp = validParameter.validFile(parameters, "cutoff", false); if (temp == "not found") { temp = "10"; } convert(temp, cutoff); cutoff += (5 / (precision * 10.0)); + + //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 += m->hasPath(globaldata->inputFileName); //if user entered a file with a path then preserve it + } if (abort == false) { @@ -161,55 +187,50 @@ TreeGroupCommand::TreeGroupCommand(string option){ } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the TreeGroupCommand class Function TreeGroupCommand. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "TreeGroupCommand", "TreeGroupCommand"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the TreeGroupCommand class function TreeGroupCommand. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } //********************************************************************************************************************** void TreeGroupCommand::help(){ try { - cout << "The tree.shared command creates a .tre to represent the similiarity between groups or sequences." << "\n"; - cout << "The tree.shared command can only be executed after a successful read.otu command or by providing a distance file." << "\n"; - cout << "The tree.shared command parameters are groups, calc, phylip, column, name, cutoff, precision, line and label. You may not use line and label at the same time." << "\n"; - cout << "The groups parameter allows you to specify which of the groups in your groupfile you would like included used." << "\n"; - cout << "The group names are separated by dashes. The line and label allow you to select what distance levels you would like trees created for, and are also separated by dashes." << "\n"; - cout << "The phylip or column parameter are required if you do not run the read.otu command first, and only one may be used. If you use a column file the name filename is required. " << "\n"; - cout << "If you do not provide a cutoff value 10.00 is assumed. If you do not provide a precision value then 100 is assumed." << "\n"; - cout << "The tree.shared command should be in the following format: tree.shared(groups=yourGroups, calc=yourCalcs, line=yourLines, label=yourLabels)." << "\n"; - cout << "Example tree.shared(groups=A-B-C, line=1-3-5, calc=jabund-sorabund)." << "\n"; - cout << "The default value for groups is all the groups in your groupfile." << "\n"; - cout << "The default value for calc is jclass-thetayc." << "\n"; - cout << "The tree.shared command outputs a .tre file for each calculator you specify at each distance you choose." << "\n"; + m->mothurOut("The tree.shared command creates a .tre to represent the similiarity between groups or sequences.\n"); + m->mothurOut("The tree.shared command can only be executed after a successful read.otu command or by providing a distance file.\n"); + m->mothurOut("The tree.shared command parameters are groups, calc, phylip, column, name, cutoff, precision and label.\n"); + m->mothurOut("The groups parameter allows you to specify which of the groups in your groupfile you would like included used.\n"); + m->mothurOut("The group names are separated by dashes. The label allow you to select what distance levels you would like trees created for, and are also separated by dashes.\n"); + m->mothurOut("The phylip or column parameter are required if you do not run the read.otu command first, and only one may be used. If you use a column file the name filename is required. \n"); + m->mothurOut("If you do not provide a cutoff value 10.00 is assumed. If you do not provide a precision value then 100 is assumed.\n"); + m->mothurOut("The tree.shared command should be in the following format: tree.shared(groups=yourGroups, calc=yourCalcs, label=yourLabels).\n"); + m->mothurOut("Example tree.shared(groups=A-B-C, calc=jabund-sorabund).\n"); + m->mothurOut("The default value for groups is all the groups in your groupfile.\n"); + m->mothurOut("The default value for calc is jclass-thetayc.\n"); + m->mothurOut("The tree.shared command outputs a .tre file for each calculator you specify at each distance you choose.\n"); validCalculator->printCalc("treegroup", cout); - cout << "Or the tree.shared command can be in the following format: tree.shared(phylip=yourPhylipFile)." << "\n"; - cout << "Example tree.shared(phylip=abrecovery.dist)." << "\n"; - cout << "Note: No spaces between parameter labels (i.e. groups), '=' and parameters (i.e.yourGroups)." << "\n" << "\n"; + m->mothurOut("Or the tree.shared command can be in the following format: tree.shared(phylip=yourPhylipFile).\n"); + m->mothurOut("Example tree.shared(phylip=abrecovery.dist).\n"); + m->mothurOut("Note: No spaces between parameter labels (i.e. groups), '=' and parameters (i.e.yourGroups).\n\n"); } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the TreeGroupCommand class Function help. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "TreeGroupCommand", "help"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the TreeGroupCommand class function help. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } //********************************************************************************************************************** TreeGroupCommand::~TreeGroupCommand(){ - delete input; - if (format == "sharedfile") {delete read;} - else { delete readMatrix; delete matrix; delete list; } - delete tmap; - delete validCalculator; + globaldata->Groups.clear(); + if (abort == false) { + + if (format == "sharedfile") { delete read; delete input; globaldata->ginput = NULL; } + else { delete readMatrix; delete matrix; delete list; } + delete tmap; globaldata->gTreemap = NULL; + delete validCalculator; + } } @@ -222,22 +243,39 @@ int TreeGroupCommand::execute(){ if (format == "sharedfile") { //if the users entered no valid calculators don't execute command - if (treeCalculators.size() == 0) { cout << "You have given no valid calculators." << endl; return 0; } - + if (treeCalculators.size() == 0) { m->mothurOut("You have given no valid calculators."); m->mothurOutEndLine(); return 0; } + + if (globaldata->gGroupmap != NULL) { delete globaldata->gGroupmap; globaldata->gGroupmap = NULL; } //you have groups read = new ReadOTUFile(globaldata->inputFileName); read->read(&*globaldata); input = globaldata->ginput; lookup = input->getSharedRAbundVectors(); - lastLookup = lookup; + lastLabel = lookup[0]->getLabel(); - if (lookup.size() < 2) { cout << "You have not provided enough valid groups. I cannot run the command." << endl; return 0; } - + if (lookup.size() < 2) { m->mothurOut("You have not provided enough valid groups. I cannot run the command."); m->mothurOutEndLine(); return 0; } + + //used in tree constructor globaldata->runParse = false; + //create treemap class from groupmap for tree class to use + tmap = new TreeMap(); + tmap->makeSim(globaldata->gGroupmap); + globaldata->gTreemap = tmap; + + //clear globaldatas old tree names if any + globaldata->Treenames.clear(); + + //fills globaldatas tree names + globaldata->Treenames = globaldata->Groups; + + if (m->control_pressed) { return 0; } + //create tree file makeSimsShared(); + + if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } return 0; } }else{ //read in dist file filename = globaldata->inputFileName; @@ -249,7 +287,7 @@ int TreeGroupCommand::execute(){ if(namefile != ""){ nameMap = new NameAssignment(namefile); - nameMap->readMap(1,2); + nameMap->readMap(); } else{ nameMap = NULL; @@ -261,6 +299,9 @@ int TreeGroupCommand::execute(){ //make treemap tmap = new TreeMap(); + + if (m->control_pressed) { return 0; } + tmap->makeSim(list); globaldata->gTreemap = tmap; @@ -272,34 +313,45 @@ int TreeGroupCommand::execute(){ //fills globaldatas tree names globaldata->Treenames = globaldata->Groups; + //used in tree constructor globaldata->runParse = false; + if (m->control_pressed) { return 0; } + makeSimsDist(); + + if (m->control_pressed) { return 0; } //create a new filename - outputFile = getRootName(globaldata->inputFileName) + "tre"; + outputFile = outputDir + m->getRootName(m->getSimpleName(globaldata->inputFileName)) + "tre"; + outputNames.push_back(outputFile); createTree(); - cout << "Tree complete. " << endl; + + if (m->control_pressed) { return 0; } + + m->mothurOut("Tree complete. "); m->mothurOutEndLine(); + } //reset groups parameter globaldata->Groups.clear(); + + m->mothurOutEndLine(); + m->mothurOut("Output File Names: "); m->mothurOutEndLine(); + for (int i = 0; i < outputNames.size(); i++) { m->mothurOut(outputNames[i]); m->mothurOutEndLine(); } + m->mothurOutEndLine(); return 0; } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the TreeGroupCommand class Function execute. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "TreeGroupCommand", "execute"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the TreeGroupCommand class function execute. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } //********************************************************************************************************************** -void TreeGroupCommand::createTree(){ +int TreeGroupCommand::createTree(){ try { //create tree t = new Tree(); @@ -308,7 +360,9 @@ void TreeGroupCommand::createTree(){ //there are numGroups - 1 merges to do for (int i = 0; i < (numGroups - 1); i++) { float largest = -1000.0; - + + if (m->control_pressed) { delete t; return 1; } + int row, column; //find largest value in sims matrix by searching lower triangle for (int j = 1; j < simMatrix.size(); j++) { @@ -362,19 +416,21 @@ void TreeGroupCommand::createTree(){ //assemble tree t->assembleTree(); + if (m->control_pressed) { delete t; return 1; } + //print newick file t->createNewickFile(outputFile); //delete tree delete t; + + if (m->control_pressed) { remove(outputFile.c_str()); outputNames.pop_back(); return 1; } + + return 0; } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the TreeGroupCommand class Function createTree. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } - catch(...) { - cout << "An unknown error has occurred in the TreeGroupCommand class function createTree. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "TreeGroupCommand", "createTree"); exit(1); } } @@ -398,16 +454,12 @@ void TreeGroupCommand::printSims(ostream& out) { } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the TreeGroupCommand class Function printSims. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "TreeGroupCommand", "printSims"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the TreeGroupCommand class function printSims. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } /***********************************************************/ -void TreeGroupCommand::makeSimsDist() { +int TreeGroupCommand::makeSimsDist() { try { numGroups = list->size(); @@ -418,9 +470,9 @@ void TreeGroupCommand::makeSimsDist() { //initialize simMatrix simMatrix.clear(); simMatrix.resize(numGroups); - for (int m = 0; m < simMatrix.size(); m++) { + for (int k = 0; k < simMatrix.size(); k++) { for (int j = 0; j < simMatrix.size(); j++) { - simMatrix[m].push_back(0.0); + simMatrix[k].push_back(0.0); } } @@ -429,104 +481,98 @@ void TreeGroupCommand::makeSimsDist() { for(MatData currentCell = matrix->begin(); currentCell != matrix->end(); currentCell++){ //similairity = -(distance-1) simMatrix[currentCell->row][currentCell->column] = -(currentCell->dist -1.0); - simMatrix[currentCell->column][currentCell->row] = -(currentCell->dist -1.0); + simMatrix[currentCell->column][currentCell->row] = -(currentCell->dist -1.0); + + if (m->control_pressed) { return 1; } + } - + return 0; } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the TreeGroupCommand class Function makeSimsDist. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "TreeGroupCommand", "makeSimsDist"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the TreeGroupCommand class function makeSimsDist. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } /***********************************************************/ -void TreeGroupCommand::makeSimsShared() { +int TreeGroupCommand::makeSimsShared() { try { - int count = 1; - - //clear globaldatas old tree names if any - globaldata->Treenames.clear(); - - //fills globaldatas tree names - globaldata->Treenames = globaldata->Groups; - - //create treemap class from groupmap for tree class to use - tmap = new TreeMap(); - tmap->makeSim(globaldata->gGroupmap); - globaldata->gTreemap = tmap; - set processedLabels; set userLabels = labels; - set userLines = lines; - + //as long as you are not at the end of the file or done wih the lines you want - while((lookup[0] != NULL) && ((allLines == 1) || (userLabels.size() != 0) || (userLines.size() != 0))) { + while((lookup[0] != NULL) && ((allLines == 1) || (userLabels.size() != 0))) { + if (m->control_pressed) { for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; } for(int i = 0 ; i < treeCalculators.size(); i++) { delete treeCalculators[i]; } return 1; } - if(allLines == 1 || lines.count(count) == 1 || labels.count(lookup[0]->getLabel()) == 1){ - cout << lookup[0]->getLabel() << '\t' << count << endl; + if(allLines == 1 || labels.count(lookup[0]->getLabel()) == 1){ + m->mothurOut(lookup[0]->getLabel()); m->mothurOutEndLine(); process(lookup); processedLabels.insert(lookup[0]->getLabel()); userLabels.erase(lookup[0]->getLabel()); - userLines.erase(count); } - if ((anyLabelsToProcess(lookup[0]->getLabel(), userLabels, "") == true) && (processedLabels.count(lastLookup[0]->getLabel()) != 1)) { - cout << lastLookup[0]->getLabel() << '\t' << count << endl; - process(lastLookup); + if ((m->anyLabelsToProcess(lookup[0]->getLabel(), userLabels, "") == true) && (processedLabels.count(lastLabel) != 1)) { + string saveLabel = lookup[0]->getLabel(); + + for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; } + lookup = input->getSharedRAbundVectors(lastLabel); + + m->mothurOut(lookup[0]->getLabel()); m->mothurOutEndLine(); + process(lookup); - processedLabels.insert(lastLookup[0]->getLabel()); - userLabels.erase(lastLookup[0]->getLabel()); + processedLabels.insert(lookup[0]->getLabel()); + userLabels.erase(lookup[0]->getLabel()); + + //restore real lastlabel to save below + lookup[0]->setLabel(saveLabel); } - //prevent memory leak - if (count != 1) { for (int i = 0; i < lastLookup.size(); i++) { delete lastLookup[i]; } } - lastLookup = lookup; + lastLabel = lookup[0]->getLabel(); //get next line to process + for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; } lookup = input->getSharedRAbundVectors(); - count++; } + if (m->control_pressed) { for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; } for(int i = 0 ; i < treeCalculators.size(); i++) { delete treeCalculators[i]; } return 1; } + //output error messages about any remaining user labels set::iterator it; bool needToRun = false; for (it = userLabels.begin(); it != userLabels.end(); it++) { - cout << "Your file does not include the label "<< *it; - if (processedLabels.count(lastLookup[0]->getLabel()) != 1) { - cout << ". I will use " << lastLookup[0]->getLabel() << "." << endl; + m->mothurOut("Your file does not include the label " + *it); + if (processedLabels.count(lastLabel) != 1) { + m->mothurOut(". I will use " + lastLabel + "."); m->mothurOutEndLine(); needToRun = true; }else { - cout << ". Please refer to " << lastLookup[0]->getLabel() << "." << endl; + m->mothurOut(". Please refer to " + lastLabel + "."); m->mothurOutEndLine(); } } - //run last line if you need to + //run last label if you need to if (needToRun == true) { - cout << lastLookup[0]->getLabel() << '\t' << count << endl; - process(lastLookup); + for (int i = 0; i < lookup.size(); i++) { if (lookup[i] != NULL) { delete lookup[i]; } } + lookup = input->getSharedRAbundVectors(lastLabel); + + m->mothurOut(lookup[0]->getLabel()); m->mothurOutEndLine(); + process(lookup); + for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; } } - for (int i = 0; i < lastLookup.size(); i++) { delete lastLookup[i]; } for(int i = 0 ; i < treeCalculators.size(); i++) { delete treeCalculators[i]; } + + return 0; } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the TreeGroupCommand class Function makeSimsShared. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "TreeGroupCommand", "makeSimsShared"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the TreeGroupCommand class function makeSimsShared. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } /***********************************************************/ -void TreeGroupCommand::process(vector thisLookup) { +int TreeGroupCommand::process(vector thisLookup) { try{ EstOutput data; vector subset; @@ -537,9 +583,9 @@ void TreeGroupCommand::process(vector thisLookup) { //initialize simMatrix simMatrix.clear(); simMatrix.resize(numGroups); - for (int m = 0; m < simMatrix.size(); m++) { + for (int k = 0; k < simMatrix.size(); k++) { for (int j = 0; j < simMatrix.size(); j++) { - simMatrix[m].push_back(0.0); + simMatrix[k].push_back(0.0); } } @@ -548,7 +594,8 @@ void TreeGroupCommand::process(vector thisLookup) { for (int g = 0; g < numGroups; g++) { index[g] = g; } //create a new filename - outputFile = getRootName(globaldata->inputFileName) + treeCalculators[i]->getName() + "." + thisLookup[0]->getLabel() + ".tre"; + outputFile = outputDir + m->getRootName(m->getSimpleName(globaldata->inputFileName)) + treeCalculators[i]->getName() + "." + thisLookup[0]->getLabel() + ".tre"; + outputNames.push_back(outputFile); for (int k = 0; k < thisLookup.size(); k++) { for (int l = k; l < thisLookup.size(); l++) { @@ -560,26 +607,30 @@ void TreeGroupCommand::process(vector thisLookup) { subset.push_back(thisLookup[k]); subset.push_back(thisLookup[l]); data = treeCalculators[i]->getValues(subset); //saves the calculator outputs + //cout << thisLookup[k]->getGroup() << '\t' << thisLookup[l]->getGroup() << '\t' << (1.0 - data[0]) << endl; + if (m->control_pressed) { return 1; } + //save values in similarity matrix simMatrix[k][l] = data[0]; simMatrix[l][k] = data[0]; } } } - + + if (m->control_pressed) { return 1; } //creates tree from similarity matrix and write out file createTree(); + + if (m->control_pressed) { return 1; } } + + return 0; } catch(exception& e) { - cout << "Standard Error: " << e.what() << " has occurred in the TreeGroupCommand class Function process. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; + m->errorOut(e, "TreeGroupCommand", "process"); exit(1); } - catch(...) { - cout << "An unknown error has occurred in the TreeGroupCommand class function process. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n"; - exit(1); - } } /***********************************************************/