Changeset 10 for src/main/java/weka/clusterers/forMetisMQI/Coarse.java

Timestamp:

Sep 14, 2010, 5:27:28 PM (14 years ago)

Author:

gnappo

Message:

Corretti alcuni bachi inseriti con la migrazione a Jung.

File:

• src/main/java/weka/clusterers/forMetisMQI/Coarse.java (modified) (8 diffs)

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

@@ -13 +13 @@
 public class Coarse {
         
-        private static boolean debug = true;
+        private static boolean debug = false;
         private static PrintStream debugStream = System.err;
         private static int finerSize = 5;
@@ -98 +98 @@
                         while(it.hasNext())
                                 neighbors.add(getMappedNode(map, it.next()));
-                        
-//                      Set<Node> neighbors = new HashSet<Node>();
-//                      while(it.hasNext()) {
-//                              Node v = it.next();
-//                              neighbors.add(getMappedNode(map,v));
-//                      }
-//                      it = g.getNeighbors(getMappedNode(match,u)).iterator();
-//                      while(it.hasNext()) {
-//                              Node v = it.next();
-//                              neighbors.add(getMappedNode(map,v));
-//                      }
                         neighbors.remove(getMappedNode(map,u));
                         it = neighbors.iterator();
@@ -127 +116 @@
                         Pair<Node> srcDst = g.getEndpoints(oldEdge);
                         Node src = srcDst.getFirst();
-                        Node dst = srcDst.getFirst();
+                        Node dst = srcDst.getSecond();
                         Node srcMapped = getMappedNode(map, src);
                         Node dstMapped = getMappedNode(map, dst);
@@ -135 +124 @@
                         }
                 }
-                
-                
-//              for(int i=0; i < g.size(); i++) {
-//                      int u = g.getLabel(i);
-//                      Iterator<Integer> it = g.getNeighbors(u).iterator();
-//                      while(it.hasNext()) {
-//                              int v = it.next();
-//                              if(getMappedNode(g,map,u) != getMappedNode(g,map,v) && output.isEdge(getMappedNode(g,map,u), getMappedNode(g,map,v)) && u < v) {
-//                                      output.setWeight(getMappedNode(g,map,u), getMappedNode(g,map,v), output.getWeight(getMappedNode(g,map,u), getMappedNode(g,map,v)) + g.getWeight(u, v));
-//                              }
-//                      }
-//              }
-                
-                
                 iterator = g.getVertices().iterator();
                 Set<Node> nodesComplete = new HashSet<Node>();
@@ -158 +133 @@
                                         getMappedNode(map,u).setVwgt(u.getVwgt() + v.getVwgt());
                                         getMappedNode(map,u).setCewgt(u.getCewgt() + v.getCewgt() + g.findEdge(u, v).getWeight());
-                                        getMappedNode(map,u).setAdjwgt(u.getAdjwgt() + v.getAdjwgt() - 2 * g.findEdge(u, v).getWeight());
                                         nodesComplete.add(u);
                                         nodesComplete.add(v);
@@ -165 +139 @@
                                 getMappedNode(map,u).setVwgt(u.getVwgt());
                                 getMappedNode(map,u).setCewgt(u.getCewgt());
-                                getMappedNode(map,u).setAdjwgt(u.getAdjwgt());
                         }
                 }
@@ -174 +147 @@
          * Performs the first stage of the METIS algorithm, using RM.
          */
-        public static CoarserGraphElement coarseOneStep(UndirectedGraph g) {
+        private static CoarserGraphElement coarseOneStep(UndirectedGraph g) {
                 UndirectedGraph projected = g;
                 UndirectedGraph contracted = null;
@@ -183 +156 @@
                 return new CoarserGraphElement(contracted, projected, match, map);
         }
+
         
+        /**
+         * Performs at least one contraction of the given the graph, and goes on until the graph
+         * is under the desidered size (see setFinerSize()).
+         * @param g
+         * @return the stack of contracted graphs
+         */
         public static Stack<CoarserGraphElement> coarse(UndirectedGraph g) {
                 Stack<CoarserGraphElement> stack = new Stack<CoarserGraphElement>();
-                CoarserGraphElement e;
+                CoarserGraphElement e = null;
                 UndirectedGraph curr = g;
+                int i = 0;
+                
             do {
                 if(debug)
-                        debugStream.println("-----------------------------------------------------");
+                        debugStream.println("--------CONTRACTION-nr" + i +"------------------------------");
                 e = coarseOneStep(curr);
                 stack.push(e);
                 curr = e.getContracted();
-                if(debug)
-                        debugStream.println("-----------------------------------------------------");
+                if(debug) {
+                        debugStream.println("-----------EXPANDED----------------------------------");
+                        debugStream.println(e.getProjected().toString());
+                        debugStream.println("-----------CONTRACTED--------------------------------");
+                        debugStream.println(e.getContracted().toString());
+                }
+                i++;
             } while(e.getProjected().getVertexCount() > e.getContracted().getVertexCount() && e.getContracted().getVertexCount() > finerSize);
             return stack;