X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=hclustercommand.cpp;h=47136938a19e6c5d4b8dd2b8110849249ac50b06;hb=8dd3c225255d7084e3aff8740aa4f1f1cabb367a;hp=3e99473bb6d742cd759c6a5a3eed55373df58549;hpb=e150b0b0664caec517485ee6d69dcdade6dcae77;p=mothur.git

diff --git a/hclustercommand.cpp b/hclustercommand.cpp
index 3e99473..4713693 100644
--- a/hclustercommand.cpp
+++ b/hclustercommand.cpp
@@ -135,16 +135,17 @@ HClusterCommand::HClusterCommand(string option)  {
 			phylipfile = validParameter.validFile(parameters, "phylip", true);
 			if (phylipfile == "not open") { abort = true; }
 			else if (phylipfile == "not found") { phylipfile = ""; }	
-			else {  distfile = phylipfile;  format = "phylip"; 	}
+			else {  distfile = phylipfile;  format = "phylip"; 	m->setPhylipFile(phylipfile); }
 			
 			columnfile = validParameter.validFile(parameters, "column", true);
 			if (columnfile == "not open") { abort = true; }	
 			else if (columnfile == "not found") { columnfile = ""; }
-			else {  distfile = columnfile; format = "column";	}
+			else {  distfile = columnfile; format = "column";	m->setColumnFile(columnfile); }
 			
 			namefile = validParameter.validFile(parameters, "name", true);
 			if (namefile == "not open") { abort = true; }	
 			else if (namefile == "not found") { namefile = ""; }
+			else { m->setNameFile(namefile); }
 			
 			if ((phylipfile == "") && (columnfile == "")) { 
 				//is there are current file available for either of these?
@@ -181,14 +182,14 @@ HClusterCommand::HClusterCommand(string option)  {
 			if (temp == "not found") { temp = "100"; }
 			//saves precision legnth for formatting below
 			length = temp.length();
-			convert(temp, precision); 
+			m->mothurConvert(temp, precision); 
 			
 			temp = validParameter.validFile(parameters, "hard", false);			if (temp == "not found") { temp = "T"; }
 			hard = m->isTrue(temp);
 			
 			temp = validParameter.validFile(parameters, "cutoff", false);
 			if (temp == "not found") { temp = "10"; }
-			convert(temp, cutoff); 
+			m->mothurConvert(temp, cutoff); 
 			cutoff += (5 / (precision * 10.0)); 
 			
 			method = validParameter.validFile(parameters, "method", false);
@@ -259,7 +260,7 @@ int HClusterCommand::execute(){
 				sabundFile.close();
 				rabundFile.close();
 				listFile.close();
-				for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str());  } outputTypes.clear();
+				for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]);  } outputTypes.clear();
 				return 0;  
 			}
 			
@@ -275,7 +276,7 @@ int HClusterCommand::execute(){
 			sabundFile.close();
 			rabundFile.close();
 			listFile.close();
-			for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str());  } outputTypes.clear();
+			for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]);  } outputTypes.clear();
 			return 0;  
 		}
 
@@ -305,35 +306,41 @@ int HClusterCommand::execute(){
 				sabundFile.close();
 				rabundFile.close();
 				listFile.close();
-				for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str());  } outputTypes.clear();
+				for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]);  } outputTypes.clear();
 				return 0;  
 		}
 
+		float saveCutoff = cutoff;
 		
 		while (seqs.size() != 0){
 		
 			seqs = cluster->getSeqs();
 			
+			//to account for cutoff change in average neighbor
+			if (seqs.size() != 0) {
+				if (seqs[0].dist > cutoff) { break; }
+			}
+			
 			if (m->control_pressed) {  
 				delete cluster;
 				sabundFile.close();
 				rabundFile.close();
 				listFile.close();
-				for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str());  } outputTypes.clear();
+				for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]);  } outputTypes.clear();
 				return 0;  
 			}
 
 			for (int i = 0; i < seqs.size(); i++) {  //-1 means skip me
 				
 				if (seqs[i].seq1 != seqs[i].seq2) {
-					cluster->update(seqs[i].seq1, seqs[i].seq2, seqs[i].dist);
+					cutoff = cluster->update(seqs[i].seq1, seqs[i].seq2, seqs[i].dist);
 					
 					if (m->control_pressed) {  
 						delete cluster;
 						sabundFile.close();
 						rabundFile.close();
 						listFile.close();
-						for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str());  } outputTypes.clear();
+						for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]);  } outputTypes.clear();
 						return 0;  
 					}
 
@@ -366,7 +373,7 @@ int HClusterCommand::execute(){
 			sabundFile.close();
 			rabundFile.close();
 			listFile.close();
-			for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str());  } outputTypes.clear();
+			for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]);  } outputTypes.clear();
 			return 0;  
 		}
 					
@@ -383,10 +390,18 @@ int HClusterCommand::execute(){
 		delete cluster;
 		
 		if (m->control_pressed) {  
-			for (int i = 0; i < outputNames.size(); i++) {	remove(outputNames[i].c_str());  } outputTypes.clear();
+			for (int i = 0; i < outputNames.size(); i++) {	m->mothurRemove(outputNames[i]);  } outputTypes.clear();
 			return 0;  
 		}
 		
+		
+		if (saveCutoff != cutoff) { 
+			if (hard)	{  saveCutoff = m->ceilDist(saveCutoff, precision);	}
+			else		{	saveCutoff = m->roundDist(saveCutoff, precision);  }
+			
+			m->mothurOut("changed cutoff to " + toString(cutoff)); m->mothurOutEndLine(); 
+		}
+		
 		//set list file as new current listfile
 		string current = "";
 		itTypes = outputTypes.find("list");