added load.logfile command. changed summary.single output for subsample=t.

[mothur.git] / anosimcommand.cpp

diff --git a/anosimcommand.cpp b/anosimcommand.cpp
index 1b6afe35b760ed140b6747d02a41ce5d4424fca1..bd4e6b0683886bd0012e6b222a12592c8e594107 100644 (file)
--- a/anosimcommand.cpp
+++ b/anosimcommand.cpp
@@ -49,7 +49,26 @@ string AnosimCommand::getHelpString(){
                exit(1);
        }
 }
-
+//**********************************************************************************************************************
+string AnosimCommand::getOutputFileNameTag(string type, string inputName=""){  
+       try {
+        string outputFileName = "";
+               map<string, vector<string> >::iterator it;
+        
+        //is this a type this command creates
+        it = outputTypes.find(type);
+        if (it == outputTypes.end()) {  m->mothurOut("[ERROR]: this command doesn't create a " + type + " output file.\n"); }
+        else {
+            if (type == "anosim") {  outputFileName =  "anosim"; }
+            else { m->mothurOut("[ERROR]: No definition for type " + type + " output file tag.\n"); m->control_pressed = true;  }
+        }
+        return outputFileName;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "AnosimCommand", "getOutputFileNameTag");
+               exit(1);
+       }
+}
 //**********************************************************************************************************************
 AnosimCommand::AnosimCommand(){        
        try {
@@ -188,7 +207,7 @@ int AnosimCommand::execute(){
                
                //create a new filename
                ofstream ANOSIMFile;
-               string ANOSIMFileName = outputDir + m->getRootName(m->getSimpleName(phylipFileName))  + "anosim";                               
+               string ANOSIMFileName = outputDir + m->getRootName(m->getSimpleName(phylipFileName)) + getOutputFileNameTag("anosim");                          
                m->openOutputFile(ANOSIMFileName, ANOSIMFile);
                outputNames.push_back(ANOSIMFileName); outputTypes["anosim"].push_back(ANOSIMFileName);
                m->mothurOut("\ncomparison\tR-value\tP-value\n");