Changeset 21 for src

Timestamp:

Oct 5, 2010, 8:44:43 AM (14 years ago)

Author:

gnappo

Message:

Correzione nel calcolo della conduttanza.

Location:

src/main/java/weka/clusterers/forMetisMQI

Files:

• GraphAlgorithms.java (modified) (1 diff)
• MQI.java (modified) (3 diffs)

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

@@ -95 +95 @@
 //              Util.viewGraph(g);
                 for (int i = 0; i < numberOfCluster; i++) {
-//                      Bisection partition = metis(g,sizeFinerGraph);
-                        Bisection partition = new Bisection(g);
+                        Bisection partition = metis(g,sizeFinerGraph);
+//                      Bisection partition = new Bisection(g);
                         System.out.print("Partizione iniziale: ");
                         System.out.print("V1: " + partition.getSubgraph().getVertexCount());

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

@@ -16 +16 @@
 import weka.clusterers.forMetisMQI.graph.Node;
 import weka.clusterers.forMetisMQI.graph.Subgraph;
-import weka.clusterers.forMetisMQI.util.Util;
 import edu.uci.ics.jung.algorithms.flows.EdmondsKarpMaxFlow;
 import edu.uci.ics.jung.graph.DirectedGraph;
 import edu.uci.ics.jung.graph.DirectedSparseGraph;
+import weka.clusterers.forMetisMQI.util.Util;
 
 public class MQI {
@@ -88 +88 @@
                         a = A.getVertexCount();
                 else {
-                        Iterator<Node> aIterator = A.iterator();
-                        while(aIterator.hasNext()) {
-                                a += bisection.getGraph().degree(aIterator.next());
-                        }
+                        a = Math.min(B.totalDegree(),A.totalDegree());
                 }
                 int c = bisection.edgeCut() / 2;
@@ -195 +192 @@
                                                 * bisection.edgeCut() / 2;
                         else {
-                                Iterator<Node> aIterator = bisection.getLargerSubgraph().iterator();
-                                maxFlowThreshold = 0;
-                                while(aIterator.hasNext())
-                                        maxFlowThreshold += partition.getGraph().degree(aIterator.next());
+                                maxFlowThreshold = Math.min(bisection.getLargerSubgraph().totalDegree(), bisection.getSmallerSubgraph().totalDegree());
                                 maxFlowThreshold = maxFlowThreshold
                                                 * (bisection.edgeCut() / 2);
                         }
                         alg.evaluate();
-//                      Util.viewFlowGraph(directedGraph, edgeFlowMap);
+                        Util.viewFlowGraph(directedGraph, edgeFlowMap);
                         System.out.println("MAX FLOW: " + alg.getMaxFlow() + " THRESHOLD: "
                                         + maxFlowThreshold);