X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=clustercommand.cpp;h=7484a621645c2449bfc9f158a391549f33da71dd;hb=182db2b6f1747bc1e0b8cd3eceec8751abdd31d5;hp=baf4224c952a5a47bea7aa911f56196c6dabdead;hpb=3c856e629e20261496b0433c2587f27b2c8ba3f6;p=mothur.git diff --git a/clustercommand.cpp b/clustercommand.cpp index baf4224..7484a62 100644 --- a/clustercommand.cpp +++ b/clustercommand.cpp @@ -11,9 +11,10 @@ //********************************************************************************************************************** //This function checks to make sure the cluster command has no errors and then clusters based on the method chosen. -ClusterCommand::ClusterCommand(string option){ +ClusterCommand::ClusterCommand(string option) { try{ globaldata = GlobalData::getInstance(); + abort = false; //allow user to run help @@ -21,7 +22,7 @@ ClusterCommand::ClusterCommand(string option){ else { //valid paramters for this command - string Array[] = {"cutoff","precision","method","showabund","timing"}; + string Array[] = {"cutoff","precision","method","showabund","timing","outputdir","inputdir"}; vector myArray (Array, Array+(sizeof(Array)/sizeof(string))); OptionParser parser(option); @@ -36,9 +37,12 @@ ClusterCommand::ClusterCommand(string option){ } } + //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 = ""; } + //error checking to make sure they read a distance file if ((globaldata->gSparseMatrix == NULL) || (globaldata->gListVector == NULL)) { - mothurOut("Before you use the cluster command, you first need to read in a distance matrix."); mothurOutEndLine(); + m->mothurOut("Before you use the cluster command, you first need to read in a distance matrix."); m->mothurOutEndLine(); abort = true; } @@ -61,7 +65,7 @@ ClusterCommand::ClusterCommand(string option){ if (method == "not found") { method = "furthest"; } if ((method == "furthest") || (method == "nearest") || (method == "average")) { } - else { mothurOut("Not a valid clustering method. Valid clustering algorithms are furthest, nearest or average."); mothurOutEndLine(); abort = true; } + else { m->mothurOut("Not a valid clustering method. Valid clustering algorithms are furthest, nearest or average."); m->mothurOutEndLine(); abort = true; } showabund = validParameter.validFile(parameters, "showabund", false); if (showabund == "not found") { showabund = "T"; } @@ -81,21 +85,26 @@ ClusterCommand::ClusterCommand(string option){ } //create cluster - if (method == "furthest") { cluster = new CompleteLinkage(rabund, list, matrix); } - else if(method == "nearest"){ cluster = new SingleLinkage(rabund, list, matrix); } - else if(method == "average"){ cluster = new AverageLinkage(rabund, list, matrix); } + if (method == "furthest") { cluster = new CompleteLinkage(rabund, list, matrix, cutoff, method); } + else if(method == "nearest"){ cluster = new SingleLinkage(rabund, list, matrix, cutoff, method); } + else if(method == "average"){ cluster = new AverageLinkage(rabund, list, matrix, cutoff, method); } tag = cluster->getTag(); - - fileroot = getRootName(globaldata->inputFileName); + + if (outputDir == "") { outputDir += hasPath(globaldata->inputFileName); } + fileroot = outputDir + getRootName(getSimpleName(globaldata->inputFileName)); openOutputFile(fileroot+ tag + ".sabund", sabundFile); openOutputFile(fileroot+ tag + ".rabund", rabundFile); openOutputFile(fileroot+ tag + ".list", listFile); + + outputNames.push_back(fileroot+ tag + ".sabund"); + outputNames.push_back(fileroot+ tag + ".rabund"); + outputNames.push_back(fileroot+ tag + ".list"); } } } catch(exception& e) { - errorOut(e, "ClusterCommand", "ClusterCommand"); + m->errorOut(e, "ClusterCommand", "ClusterCommand"); exit(1); } } @@ -104,14 +113,14 @@ ClusterCommand::ClusterCommand(string option){ void ClusterCommand::help(){ try { - mothurOut("The cluster command can only be executed after a successful read.dist command.\n"); - mothurOut("The cluster command parameter options are method, cuttoff, precision, showabund and timing. No parameters are required.\n"); - mothurOut("The cluster command should be in the following format: \n"); - mothurOut("cluster(method=yourMethod, cutoff=yourCutoff, precision=yourPrecision) \n"); - mothurOut("The acceptable cluster methods are furthest, nearest and average. If no method is provided then furthest is assumed.\n\n"); + m->mothurOut("The cluster command can only be executed after a successful read.dist command.\n"); + m->mothurOut("The cluster command parameter options are method, cuttoff, precision, showabund and timing. No parameters are required.\n"); + m->mothurOut("The cluster command should be in the following format: \n"); + m->mothurOut("cluster(method=yourMethod, cutoff=yourCutoff, precision=yourPrecision) \n"); + m->mothurOut("The acceptable cluster methods are furthest, nearest and average. If no method is provided then furthest is assumed.\n\n"); } catch(exception& e) { - errorOut(e, "ClusterCommand", "help"); + m->errorOut(e, "ClusterCommand", "help"); exit(1); } } @@ -142,10 +151,22 @@ int ClusterCommand::execute(){ print_start = true; start = time(NULL); loops = 0; + double saveCutoff = cutoff; while (matrix->getSmallDist() < cutoff && matrix->getNNodes() > 0){ + + if (m->control_pressed) { //clean up + delete globaldata->gSparseMatrix; globaldata->gSparseMatrix = NULL; + delete globaldata->gListVector; globaldata->gListVector = NULL; + if (globaldata->getFormat() == "phylip") { globaldata->setPhylipFile(""); } + else if (globaldata->getFormat() == "column") { globaldata->setColumnFile(""); } + sabundFile.close();rabundFile.close();listFile.close(); + for (int i = 0; i < outputNames.size(); i++) { remove(outputNames[i].c_str()); } + return 0; + } + if (print_start && isTrue(timing)) { - mothurOut("Clustering (" + tag + ") dist " + toString(matrix->getSmallDist()) + "/" + m->mothurOut("Clustering (" + tag + ") dist " + toString(matrix->getSmallDist()) + "/" + toString(roundDist(matrix->getSmallDist(), precision)) + "\t(precision: " + toString(precision) + ", Nodes: " + toString(matrix->getNNodes()) + ")"); cout.flush(); @@ -154,7 +175,7 @@ int ClusterCommand::execute(){ loops++; - cluster->update(); + cluster->update(cutoff); float dist = matrix->getSmallDist(); float rndDist = roundDist(dist, precision); @@ -172,7 +193,7 @@ int ClusterCommand::execute(){ } if (print_start && isTrue(timing)) { - mothurOut("Clustering (" + tag + ") for distance " + toString(previousDist) + "/" + toString(rndPreviousDist) + m->mothurOut("Clustering (" + tag + ") for distance " + toString(previousDist) + "/" + toString(rndPreviousDist) + "\t(precision: " + toString(precision) + ", Nodes: " + toString(matrix->getNNodes()) + ")"); cout.flush(); print_start = false; @@ -200,13 +221,24 @@ int ClusterCommand::execute(){ sabundFile.close(); rabundFile.close(); listFile.close(); + + if (saveCutoff != cutoff) { m->mothurOut("changed cutoff to " + toString(cutoff)); m->mothurOutEndLine(); } + + 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(); + + //if (isTrue(timing)) { - mothurOut("It took " + toString(time(NULL) - estart) + " seconds to cluster"); mothurOutEndLine(); + m->mothurOut("It took " + toString(time(NULL) - estart) + " seconds to cluster"); m->mothurOutEndLine(); //} + + return 0; } catch(exception& e) { - errorOut(e, "ClusterCommand", "execute"); + m->errorOut(e, "ClusterCommand", "execute"); exit(1); } } @@ -216,8 +248,8 @@ int ClusterCommand::execute(){ void ClusterCommand::printData(string label){ try { if (isTrue(timing)) { - mothurOut("\tTime: " + toString(time(NULL) - start) + "\tsecs for " + toString(oldRAbund.getNumBins()) - + "\tclusters. Updates: " + toString(loops)); mothurOutEndLine(); + m->mothurOut("\tTime: " + toString(time(NULL) - start) + "\tsecs for " + toString(oldRAbund.getNumBins()) + + "\tclusters. Updates: " + toString(loops)); m->mothurOutEndLine(); } print_start = true; loops = 0; @@ -234,7 +266,7 @@ void ClusterCommand::printData(string label){ oldList.print(listFile); } catch(exception& e) { - errorOut(e, "ClusterCommand", "printData"); + m->errorOut(e, "ClusterCommand", "printData"); exit(1); }