X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=anosimcommand.cpp;h=1b6afe35b760ed140b6747d02a41ce5d4424fca1;hb=2bb9267aa4b4ecdf8488b06605cc9f3f36fa4332;hp=2ee691ea9cb0db6f3a98ff299d0a1f9c6f60bbaf;hpb=1d898dc6edaf9e9f287fab53bf1f21fb29757a17;p=mothur.git

diff --git a/anosimcommand.cpp b/anosimcommand.cpp
index 2ee691e..1b6afe3 100644
--- a/anosimcommand.cpp
+++ b/anosimcommand.cpp
@@ -71,6 +71,7 @@ AnosimCommand::AnosimCommand(string option) {
 		
 		//allow user to run help
 		if(option == "help") { help(); abort = true; calledHelp = true; }
+		else if(option == "citation") { citation(); abort = true; calledHelp = true;}
 		
 		else {
 			vector<string> myArray = setParameters();
@@ -123,25 +124,25 @@ AnosimCommand::AnosimCommand(string option) {
 				if (phylipFileName != "") { m->mothurOut("Using " + phylipFileName + " as input file for the phylip parameter."); m->mothurOutEndLine(); }
 				else { 	m->mothurOut("You have no current phylip file and the phylip parameter is required."); m->mothurOutEndLine(); abort = true; }
 				
-			}	
+			}else { m->setPhylipFile(phylipFileName); }	
 			
 			//check for required parameters
 			designFileName = validParameter.validFile(parameters, "design", true);
-			if (designFileName == "not open") { abort = true; }
+			if (designFileName == "not open") { designFileName = ""; abort = true; }
 			else if (designFileName == "not found") {
 				//if there is a current design file, use it
 				designFileName = m->getDesignFile(); 
 				if (designFileName != "") { m->mothurOut("Using " + designFileName + " as input file for the design parameter."); m->mothurOutEndLine(); }
 				else { 	m->mothurOut("You have no current design file and the design parameter is required."); m->mothurOutEndLine(); abort = true; }								
-			}	
+			}else { m->setDesignFile(designFileName); }	
 			
 			string temp = validParameter.validFile(parameters, "iters", false);
 			if (temp == "not found") { temp = "1000"; }
-			convert(temp, iters); 
+			m->mothurConvert(temp, iters); 
 			
 			temp = validParameter.validFile(parameters, "alpha", false);
 			if (temp == "not found") { temp = "0.05"; }
-			convert(temp, experimentwiseAlpha); 
+			m->mothurConvert(temp, experimentwiseAlpha); 
 		}
 		
 	}
@@ -175,10 +176,16 @@ int AnosimCommand::execute(){
 		//link designMap to rows/columns in distance matrix
 		map<string, vector<int> > origGroupSampleMap;
 		for(int i=0;i<sampleNames.size();i++){
-			origGroupSampleMap[designMap->getGroup(sampleNames[i])].push_back(i);
+			string group = designMap->getGroup(sampleNames[i]);
+			
+			if (group == "not found") {
+				m->mothurOut("[ERROR]: " + sampleNames[i] + " is not in your design file, please correct."); m->mothurOutEndLine(); m->control_pressed = true;
+			}else { origGroupSampleMap[group].push_back(i); }
 		}
 		int numGroups = origGroupSampleMap.size();
 		
+		if (m->control_pressed) { delete designMap; return 0; }
+		
 		//create a new filename
 		ofstream ANOSIMFile;
 		string ANOSIMFileName = outputDir + m->getRootName(m->getSimpleName(phylipFileName))  + "anosim";