Changeset 36 for branches/localSpectral/src/clustering/LocalSpectral.java

Timestamp:

Jan 6, 2011, 9:41:42 AM (14 years ago)

Author:

toshi

Message:

ultimo commit

File:

• branches/localSpectral/src/clustering/LocalSpectral.java (modified) (6 diffs)

branches/localSpectral/src/clustering/LocalSpectral.java

@@ -49 +49 @@
         rank.evaluate();
         Collection<V> vertexs = graph.getVertices();
-        Iterator<?> vertexsIterator = vertexs.iterator();
+        Iterator<V> vertexsIterator = vertexs.iterator();
         ArrayList<VertexScore<V>> vertexsScore = new ArrayList<VertexScore<V>>();
         while(vertexsIterator.hasNext()){
-            V vertex = (V) vertexsIterator.next();
+            V vertex =  vertexsIterator.next();
             Double score = (Double) rank.getVertexScore(vertex);
-            VertexScore<V> vertexscore = new VertexScore<V>(vertex,score);
+            VertexScore<V> vertexscore = new VertexScore<V>(vertex,score.floatValue());
             vertexsScore.add(vertexscore);
         }
@@ -62 +62 @@
     }
     
-    public List<V> clusterPageRankPriors(V seed, double min_volume){
+    public List<V> clusterPageRankPriors(List<V> seed, double min_volume){
         PageRankWithPriors rank;
         if(seed != null){
-            Transformer transf = new SeedTransformer(seed);
-            rank = new PageRankWithPriors(graph, transf, alpha);
+            if(seed.size() == 1){
+                Transformer transf = new SeedTransformer(seed.get(0));
+                rank = new PageRankWithPriors(graph, transf, alpha);
+            }
+            else{
+                Transformer transf = new ListSeedTransformer(seed);
+                rank = new PageRankWithPriors(graph, transf, alpha);
+            }
+
         }
         else{
@@ -79 +86 @@
             V vertex = (V) vertexsIterator.next();
             Double score = (Double) rank.getVertexScore(vertex);
-            int degree = graph.getIncidentEdges(vertex).size();
-            VertexScore<V> vertexscore = new VertexScore<V>(vertex,score/degree);
+            int degree = graph.inDegree(vertex);
+            VertexScore<V> vertexscore = new VertexScore<V>(vertex,score.floatValue()/degree);
             vertexsScore.add(vertexscore);
         }
@@ -103 +110 @@
             int edge_boundary = 0;
             for(int j=0; j<i; j++){
-                volume_subset += graph.getIncidentEdges(vertexsScore.get(j).getVertex()).size();
+                volume_subset += graph.inDegree(vertexsScore.get(j).getVertex());
                 for(E out_edge : graph.getOutEdges(vertexsScore.get(j).getVertex())){
                     V opposite = graph.getOpposite(vertexsScore.get(j).getVertex(), out_edge);
@@ -117 +124 @@
 
                 if ((volume_subset > min_volume) && (volume_subset < max_volume)){
-                //if (volume_subset < min_volume){
                     if (conductance < min_conductance_subset){
                         min_conductance_subset = conductance;
@@ -143 +149 @@
     }
 
+
 }