/***********************************************************************/
-Cluster::Cluster(RAbundVector* rav, ListVector* lv, SparseMatrix* dm, float c) :
-rabund(rav), list(lv), dMatrix(dm), cutoff(c)
+Cluster::Cluster(RAbundVector* rav, ListVector* lv, SparseMatrix* dm, float c, string f) :
+rabund(rav), list(lv), dMatrix(dm), method(f)
{
/*
cout << "sizeof(MatData): " << sizeof(MatData) << endl;
seqVec[currentCell->column].push_back(currentCell);
}
mapWanted = false; //set to true by mgcluster to speed up overlap merge
+
+ //save so you can modify as it changes in average neighbor
+ cutoff = c;
+ m = MothurOut::getInstance();
}
/***********************************************************************/
nColCells = colCells.size();
}
catch(exception& e) {
- errorOut(e, "Cluster", "getRowColCells");
+ m->errorOut(e, "Cluster", "getRowColCells");
exit(1);
}
// cout << '\t' << rabund->get(smallRow) << '\t' << rabund->get(smallCol) << endl;
}
catch(exception& e) {
- errorOut(e, "Cluster", "clusterBins");
+ m->errorOut(e, "Cluster", "clusterBins");
exit(1);
}
// cout << '\t' << list->get(smallRow) << '\t' << list->get(smallCol) << endl;
}
catch(exception& e) {
- errorOut(e, "Cluster", "clusterNames");
+ m->errorOut(e, "Cluster", "clusterNames");
exit(1);
}
//This function clusters based on the method of the derived class
//At the moment only average and complete linkage are covered, because
//single linkage uses a different approach.
-void Cluster::update(){
+void Cluster::update(double& cutOFF){
try {
getRowColCells();
- vector<int> found(nColCells, 0);
+ vector<int> foundCol(nColCells, 0);
+
int search;
bool changed;
} else {
search = rowCells[i]->row;
}
-
+
+ bool merged = false;
for (int j=0;j<nColCells;j++) {
- if (!((colCells[j]->row == smallRow) && (colCells[j]->column == smallCol))) {
+ if (!((colCells[j]->row == smallRow) && (colCells[j]->column == smallCol))) { //if you are not hte smallest distance
if (colCells[j]->row == search || colCells[j]->column == search) {
- found[j] = 1;
+ foundCol[j] = 1;
+ merged = true;
changed = updateDistance(colCells[j], rowCells[i]);
// If the cell's distance changed and it had the same distance as
// the smallest distance, invalidate the mins vector in SparseMatrix
}
break;
}
+ }
+ }
+ //if not merged it you need it for warning
+ if ((!merged) && (method == "average")) {
+ //m->mothurOut("Warning: trying to merge cell " + toString(rowCells[i]->row+1) + " " + toString(rowCells[i]->column+1) + " distance " + toString(rowCells[i]->dist) + " with value above cutoff. Results may vary from using cutoff at cluster command instead of read.dist."); m->mothurOutEndLine();
+ if (cutOFF > rowCells[i]->dist) {
+ cutOFF = rowCells[i]->dist;
+ //m->mothurOut("changing cutoff to " + toString(cutOFF)); m->mothurOutEndLine();
}
+
}
- removeCell(rowCells[i], i , -1);
+ removeCell(rowCells[i], i , -1);
+
}
}
clusterBins();
// Special handling for singlelinkage case, not sure whether this
// could be avoided
for (int i=nColCells-1;i>=0;i--) {
- if (found[i] == 0) {
+ if (foundCol[i] == 0) {
+ if (method == "average") {
+ if (!((colCells[i]->row == smallRow) && (colCells[i]->column == smallCol))) {
+ //m->mothurOut("Warning: merging cell " + toString(colCells[i]->row+1) + " " + toString(colCells[i]->column+1) + " distance " + toString(colCells[i]->dist) + " value above cutoff. Results may vary from using cutoff at cluster command instead of read.dist."); m->mothurOutEndLine();
+ if (cutOFF > colCells[i]->dist) {
+ cutOFF = colCells[i]->dist;
+ //m->mothurOut("changing cutoff to " + toString(cutOFF)); m->mothurOutEndLine();
+ }
+ }
+ }
removeCell(colCells[i], -1, i);
}
}
}
catch(exception& e) {
- errorOut(e, "Cluster", "update");
+ m->errorOut(e, "Cluster", "update");
exit(1);
}
}
/***********************************************************************/
-void Cluster::setMapWanted(bool m) {
+void Cluster::setMapWanted(bool f) {
try {
- mapWanted = m;
+ mapWanted = f;
//initialize map
for (int i = 0; i < list->getNumBins(); i++) {
}
catch(exception& e) {
- errorOut(e, "Cluster", "setMapWanted");
+ m->errorOut(e, "Cluster", "setMapWanted");
exit(1);
}
}
}
catch(exception& e) {
- errorOut(e, "Cluster", "updateMap");
+ m->errorOut(e, "Cluster", "updateMap");
exit(1);
}
}