fixed bug with cluster class. when we added the change for average neighbor to update...

diff --git a/cluster.cpp b/cluster.cpp
index d0a83cfd0f4a7ccd5c73c8ea8966a8e3d49fc03c..a766e08d47b4af7a46d8093323cb795d57d6aa78 100644 (file)
--- a/cluster.cpp
+++ b/cluster.cpp
@@ -205,7 +205,6 @@ void Cluster::clusterNames(){
 void Cluster::update(double& cutOFF){
        try {
                getRowColCells();       
-//cout << "got rowcells" << endl;
 
                vector<int> foundCol(nColCells, 0);
 

diff --git a/cluster.hpp b/cluster.hpp
index aa517a057400e09cdca593f4db1e2559dca74972..d7c2737a05ed1a0198be9713aa4345f288ec3976 100644 (file)
--- a/cluster.hpp
+++ b/cluster.hpp
@@ -67,7 +67,7 @@ private:
 class SingleLinkage : public Cluster {
 public:
        SingleLinkage(RAbundVector*, ListVector*, SparseMatrix*, float, string);
-    void update();
+    void update(double&);
        bool updateDistance(MatData& colCell, MatData& rowCell);
        string getTag();
        

diff --git a/singlelinkage.cpp b/singlelinkage.cpp
index fe5adca04ac1659cf88ac3c8df311aeead91709c..1a1b2aee36bed8af6b7d9782e54adcdedc04d466 100644 (file)
--- a/singlelinkage.cpp
+++ b/singlelinkage.cpp
@@ -18,7 +18,7 @@ string SingleLinkage::getTag() {
 
 /***********************************************************************/
 //This function clusters based on the single linkage method.
-void  SingleLinkage::update(){
+void  SingleLinkage::update(double& cutOFF){
        try {
                getRowColCells();       
        
@@ -77,6 +77,7 @@ void  SingleLinkage::update(){
                clusterBins();
                clusterNames();
                // remove also the cell with the smallest distance
+
                removeCell(rowCells[rowInd], -1 , -1);
        }
        catch(exception& e) {