Changeset 9 for src/main/java/weka/clusterers/forMetisMQI/Uncoarse.java

Timestamp:

Sep 14, 2010, 2:11:28 PM (14 years ago)

Author:

gnappo

Message:

Migrato il resto del codice verso Jung.

File:

• src/main/java/weka/clusterers/forMetisMQI/Uncoarse.java (modified) (2 diffs)

src/main/java/weka/clusterers/forMetisMQI/Uncoarse.java

@@ -6 +6 @@
 public class Uncoarse {
         
-        private boolean projectedBelongs(int u, KLPartition partition, CoarserGraphElement cge) {
+        private boolean projectedBelongs(Node u, KLPartition partition, CoarserGraphElement cge) {
                 Subgraph s = partition.getSubgraph();
-                int index = cge.getProjected().getIndex(u);
-                int mappedNode = cge.getMap().get(index);
+                Node mappedNode = cge.getMap().get(u);
                 return s.contains(mappedNode);
         }
@@ -20 +19 @@
          */
         public KLPartition uncoarseOneStep(KLPartition partition, CoarserGraphElement cge) {
-                Graph projected = cge.getProjected();
+                UndirectedGraph projected = cge.getProjected();
                 Subgraph part = new Subgraph(projected);
-                Iterator<Integer> projectedIterator = projected.iterator();
+                Iterator<Node> projectedIterator = projected.getVertices().iterator();
                 while(projectedIterator.hasNext()) {
-                        int u = projectedIterator.next();
+                        Node u = projectedIterator.next();
                         if(projectedBelongs(u,partition,cge))
-                                part.addNode(u);
+                                part.addVertex(u);
                 }
                 return new KLPartition(part);