Changeset 34 for branches/localSpectral/src/clustering

Timestamp:

Oct 30, 2010, 8:39:22 PM (14 years ago)

Author:

toshi

Message:

 

Location:

branches/localSpectral/src/clustering

Files:

• Edge.java (modified) (1 diff)
• LocalSpectral.java (modified) (3 diffs)

branches/localSpectral/src/clustering/Edge.java

@@ -27 +27 @@
     }
 
-    
+    @Override
+    public String toString(){
+        return vertex1 + " --> "+ vertex2;
+    }
     
 

branches/localSpectral/src/clustering/LocalSpectral.java

@@ -92 +92 @@
         double min_conductance_subset=100;
         int min_conductance_index = -1;
+        int volume_cluster=0;
 
         int subsets_count = vertexsScore.size();
@@ -114 +115 @@
                     minvolume = volume_graph - volume_subset;
                 double conductance = edge_boundary / minvolume;
+
                 if ((volume_subset > min_volume) && (volume_subset < max_volume)){
+                //if (volume_subset < min_volume){
                     if (conductance < min_conductance_subset){
                         min_conductance_subset = conductance;
                         min_conductance_index = i;
+                        volume_cluster = volume_subset;
                     }
                 }
-                //System.out.println("CONDUCTANCE: "+conductance + " minvolume: "+minvolume + " edge_boundary: "+edge_boundary);
             }
 
@@ -126 +129 @@
         System.out.println("MIN CONDUCTANCE: "+min_conductance_subset);
 
-        System.out.println("CLUSTER: ");
+        System.out.println("CLUSTER: ("+min_conductance_index+" elements, volume "+ volume_cluster +", volume graph "+ 2 * this.graph.getEdgeCount()+")");
         List<V> cluster = new ArrayList<V>();
         for(int i=0; i< min_conductance_index; i++)
             cluster.add(vertexsScore.get(i).getVertex());
 
+        String node_list = "";
         for(V node : cluster)
-            System.out.println(node.toString());
+            node_list += node.toString() + ",";
+        System.out.println(node_list);
        
         return cluster;