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

Timestamp:

Sep 11, 2010, 4:12:16 PM (14 years ago)

Author:

gnappo

Message:

Aggiunta la libreria Jung per lavorare con i grafi. Primi esperimenti. A breve riorganizzazione completa del codice per usufruire della libreria.

File:

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

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

@@ -13 +13 @@
         private static boolean debug = true;
         private static PrintStream debugStream = System.err;
-        private static int nodesContracted = 5;
+        private static int finerSize = 5;
 
         /**
@@ -61 +61 @@
                                         map.set(g.getIndex(matchedNode), labelCounter);
                                         if(debug) debugStream.println("Contracting node " + u + " with " + matchedNode + ". Node id: " + getMappedNode(g, map, u));
-                                } else
+                                } else {
                                         map.set(g.getIndex(u), labelCounter);
+                                        if(debug) debugStream.println("Node " + u + " with " + " new node id: " + getMappedNode(g, map, u));
+                                }
                                 labelCounter++;
                         }
@@ -106 +108 @@
                 //calcolo dei pesi del nuovo grafo: per ogni arco (u,v) && u < v.
                 //w(map(u),map(v)) += w(u,v). 
-                for(int u=0; u < g.size(); u++) {
+                for(int i=0; i < g.size(); i++) {
+                        int u = g.getLabel(i);
                         Iterator<Integer> it = g.getNeighbors(u).iterator();
                         while(it.hasNext()) {
@@ -115 +118 @@
                         }
                 }
-                for(int u = 0; u < g.size(); u++) {
+                for(int i=0; i < g.size(); i++) {
+                        int u = g.getLabel(i);
                         if(isMatched(g,match,u)) {
                                 int v = getMatchedNode(g,match,u);
@@ -159 +163 @@
                 if(debug)
                         debugStream.println("-----------------------------------------------------");
-            } while(e.getProjected().size() > e.getContracted().size() && e.getContracted().size() > nodesContracted);
+            } while(e.getProjected().size() > e.getContracted().size() && e.getContracted().size() > finerSize);
             return stack;
         }
+
+        public static void setFinerSize(int i) {
+                finerSize = i;
+        }
 }