X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=cluster.cpp;h=ac9f4482da12110796c54f15c4137681a3d29038;hb=078d7227da8dda9ae8620822fa32d51ec2706fc3;hp=40537fe7b51eb759cf7be438bdd61978835a192c;hpb=edd8b9d9392a99e0b1527507de3a4ca8fabfc1c6;p=mothur.git

diff --git a/cluster.cpp b/cluster.cpp
index 40537fe..ac9f448 100644
--- a/cluster.cpp
+++ b/cluster.cpp
@@ -17,6 +17,7 @@
 Cluster::Cluster(RAbundVector* rav, ListVector* lv, SparseMatrix* dm, float c, string f) :
 rabund(rav), list(lv), dMatrix(dm), method(f)
 {
+	try {
 /*
 	cout << "sizeof(MatData): " << sizeof(MatData) << endl;
 	cout << "sizeof(PCell*): " << sizeof(PCell*) << endl;
@@ -52,7 +53,7 @@ rabund(rav), list(lv), dMatrix(dm), method(f)
 	// sequence in the distance matrix.
 //ofstream outtemp;
 //string temp = "temp";
-//openOutputFile(temp, outtemp);	
+//m->openOutputFile(temp, outtemp);	
 //cout << lv->size() << endl;
 	seqVec = vector<MatVec>(lv->size());
 	for (MatData currentCell = dMatrix->begin(); currentCell != dMatrix->end(); currentCell++) {
@@ -66,6 +67,12 @@ rabund(rav), list(lv), dMatrix(dm), method(f)
 	//save so you can modify as it changes in average neighbor
 	cutoff = c;
 	m = MothurOut::getInstance();
+	
+	}
+	catch(exception& e) {
+		m->errorOut(e, "Cluster", "Cluster");
+		exit(1);
+	}
 }
 
 /***********************************************************************/
@@ -198,7 +205,6 @@ void Cluster::clusterNames(){
 void Cluster::update(double& cutOFF){
 	try {
 		getRowColCells();	
-//cout << "got rowcells" << endl;
 
 		vector<int> foundCol(nColCells, 0);
 
@@ -208,6 +214,7 @@ void Cluster::update(double& cutOFF){
 		// The vector has to be traversed in reverse order to preserve the index
 		// for faster removal in removeCell()
 		for (int i=nRowCells-1;i>=0;i--) {
+			//if you are not the smallCell
 			if (!((rowCells[i]->row == smallRow) && (rowCells[i]->column == smallCol))) {
 				if (rowCells[i]->row == smallRow) {
 					search = rowCells[i]->column;