- if ((rowCells[i]->row == smallRow) && (rowCells[i]->column == smallCol)) {
- rowInd = i; // The index of the smallest distance cell in rowCells
- } else {
- if (rowCells[i]->row == smallRow) {
- search = rowCells[i]->column;
- } else {
- search = rowCells[i]->row;
- }
-
- for (int j=0;j<nColCells;j++) {
- if (!((colCells[j]->row == smallRow) && (colCells[j]->column == smallCol))) {
- if (colCells[j]->row == search || colCells[j]->column == search) {
- 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
- if (changed) {
- if (colCells[j]->vectorMap != NULL) {
- *(colCells[j]->vectorMap) = NULL;
- colCells[j]->vectorMap = NULL;
- }
- }
- removeCell(rowCells[i], i , -1);
- deleted[i] = true;
- break;
- }
- }
- }
- if (!deleted[i]) {
- // Assign the cell to the new cluster
- // remove the old cell from seqVec and add the cell
- // with the new row and column assignment again
- removeCell(rowCells[i], i , -1, false);
- if (search < smallCol){
- rowCells[i]->row = smallCol;
- rowCells[i]->column = search;
- } else {
- rowCells[i]->row = search;
- rowCells[i]->column = smallCol;
- }
- seqVec[rowCells[i]->row].push_back(rowCells[i]);
- seqVec[rowCells[i]->column].push_back(rowCells[i]);
- }
- }
+ if (dMatrix->seqVec[smallRow][i].index == smallCol) {
+ rowInd = i; // The index of the smallest distance cell in rowCells
+ } else {
+ search = dMatrix->seqVec[smallRow][i].index;
+
+ for (int j=0;j<nColCells;j++) {
+ if (dMatrix->seqVec[smallCol][j].index != smallRow) { //if you are not the small cell
+ if (dMatrix->seqVec[smallCol][j].index == search) {
+ changed = updateDistance(dMatrix->seqVec[smallCol][j], dMatrix->seqVec[smallRow][i]);
+ dMatrix->updateCellCompliment(smallCol, j);
+ dMatrix->rmCell(smallRow, i);
+ deleted[i] = true;
+ break;
+ }
+ }
+ }
+ if (!deleted[i]) {
+ // Assign the cell to the new cluster
+ // remove the old cell from seqVec and add the cell
+ // with the new row and column assignment again
+ float distance = dMatrix->seqVec[smallRow][i].dist;
+ dMatrix->rmCell(smallRow, i);
+ if (search < smallCol){
+ PDistCell value(smallCol, distance);
+ dMatrix->addCell(search, value);
+ } else {
+ PDistCell value(search, distance);
+ dMatrix->addCell(smallCol, value);
+ }
+ sort(dMatrix->seqVec[smallCol].begin(), dMatrix->seqVec[smallCol].end(), compareIndexes);
+ sort(dMatrix->seqVec[search].begin(), dMatrix->seqVec[search].end(), compareIndexes);
+ }
+ }