Changeset 18 for src/main/java/weka/clusterers/forMetisMQI/MQI.java

Timestamp:

Sep 29, 2010, 9:13:19 AM (14 years ago)

Author:

gnappo

Message:

Implementato raffinamento KL in metis; implementata ottimizzazione di mqi sulla conduttanza.

File:

• src/main/java/weka/clusterers/forMetisMQI/MQI.java (modified) (11 diffs)

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.graph.UndirectedGraph;
 import weka.clusterers.forMetisMQI.util.Util;
 import edu.uci.ics.jung.algorithms.flows.EdmondsKarpMaxFlow;
@@ -27 +26 @@
 
         static private Set<Node> DFSReversed(Node currentNode,
-                        DirectedGraph<Node, Edge> g, Map<Edge, Number> edgeFlowMap, Set<Node> marked) {
+                        DirectedGraph<Node, Edge> g, Map<Edge, Number> edgeFlowMap,
+                        Set<Node> marked) {
                 Collection<Edge> inEdges = g.getInEdges(currentNode);
                 Set<Node> result = new HashSet<Node>();
@@ -47 +47 @@
                 return result;
         }
-
-
 
         static private Set<Node> BFSReversed(Node sink,
@@ -83 +81 @@
 
         static private DirectedGraph<Node, Edge> prepareDirectedGraph(
-                        Bisection partition, Node source, Node sink) {
+                        Bisection partition, Node source, Node sink, boolean forConductance) {
                 Subgraph A = null;
                 Subgraph B = null;
@@ -94 +92 @@
                         B = partition.getSubgraph();
                 }
-                int a = A.getVertexCount();
+                int a = 0;
+                if (!forConductance)
+                        a = A.getVertexCount();
+                else {
+                        Iterator<Node> aIterator = A.iterator();
+                        while(aIterator.hasNext()) {
+                                a += partition.getGraph().degree(aIterator.next());
+                        }
+                }
                 int c = partition.edgeCut() / 2;
 
@@ -120 +126 @@
                 g.addVertex(sink);
 
-                
-                //build the edges from source to each node of A which previously was connected
-                //with a node of B.
+                // build the edges from source to each node of A which previously was
+                // connected
+                // with a node of B.
                 nodes = B.iterator();
                 while (nodes.hasNext()) {
@@ -131 +137 @@
                                 if (A.contains(v)) {
                                         Edge e = g.findEdge(source, v);
-                                        if(e != null) {
+                                        if (e != null) {
                                                 e.setCapacity(e.getCapacity() + a);
                                         } else {
-                                                g.addEdge(new Edge(Integer.toString(id), 1, a), source, v);
+                                                g.addEdge(new Edge(Integer.toString(id), 1, a), source,
+                                                                v);
                                                 id++;
                                         }
@@ -144 +151 @@
                 while (nodes.hasNext()) {
                         Node u = nodes.next();
-                        g.addEdge(new Edge(Integer.toString(id), 1, c), u, sink);
+                        if(forConductance)
+                                //FIXME: CONTROLLAMI
+                                g.addEdge(new Edge(Integer.toString(id), 1, c * partition.getGraph().degree(u)), u, sink);
+                        else
+                                g.addEdge(new Edge(Integer.toString(id), 1, c), u, sink);
                         id++;
                 }
@@ -158 +169 @@
          * @return
          */
-        static public Set<Node> mqi(Bisection partition) {
+        static public Set<Node> mqi(Bisection partition, boolean forConductance) {
 //              System.out.println("INITIAL BISECTION: " + partition.toString());
                 boolean finished = false;
                 Bisection bisection = partition;
-                Set<Node> cluster = new HashSet<Node>(partition
-                                .getSmallerNotEmptySubgraph().createInducedSubgraph()
-                                .getVertices());
+                Set<Node> cluster = new HashSet<Node>(partition.getSmallerNotEmptySubgraph()
+                                .createInducedSubgraph().getVertices());
                 int maxFlowThreshold = Integer.MAX_VALUE;
                 while (!finished) {
@@ -170 +180 @@
                         Node sink = new Node("$$$$T");
                         DirectedGraph<Node, Edge> directedGraph = prepareDirectedGraph(
-                                        bisection, source, sink);
+                                        bisection, source, sink, true);
                         Transformer<Edge, Number> capTransformer = new Transformer<Edge, Number>() {
                                 public Double transform(Edge e) {
@@ -189 +199 @@
                                         edgeFactory);
 
-                        maxFlowThreshold = bisection.getSmallerNotEmptySubgraph()
-                                        .getVertexCount()
-                                        * bisection.edgeCut() / 2;
+                        if (!forConductance)
+                                maxFlowThreshold = bisection.getSmallerNotEmptySubgraph()
+                                                .getVertexCount()
+                                                * bisection.edgeCut() / 2;
+                        else {
+                                Iterator<Node> aIterator = bisection.getSmallerNotEmptySubgraph().iterator();
+                                maxFlowThreshold = 0;
+                                while(aIterator.hasNext())
+                                        maxFlowThreshold += partition.getGraph().degree(aIterator.next());
+                                maxFlowThreshold = maxFlowThreshold
+                                                * (bisection.edgeCut() / 2);
+                        }
                         alg.evaluate();
-//                      Util.viewFlowGraph(directedGraph, edgeFlowMap);
+//                       Util.viewFlowGraph(directedGraph, edgeFlowMap);
 //                      System.out.println("MAX FLOW: " + alg.getMaxFlow() + " THRESHOLD: "
 //                                      + maxFlowThreshold);
                         if (alg.getMaxFlow() < maxFlowThreshold) {
-                                cluster = DFSReversed(sink, directedGraph, edgeFlowMap, new HashSet<Node>());
-                                cluster.remove(sink);
-                                 bisection = new Bisection(new Subgraph(bisection.getGraph(),
-                                 cluster));
-//                              System.out.println("NEW BISECTION: " + bisection.toString());
+                                Set<Node> dfsResult = DFSReversed(sink, directedGraph,
+                                                edgeFlowMap, new HashSet<Node>());
+                                dfsResult.remove(sink);
+//                              if (dfsResult.size() > 0) {
+                                        cluster = dfsResult;
+                                        bisection = new Bisection(new Subgraph(
+                                                        bisection.getGraph(), cluster));
+//                                      System.out
+//                                                      .println("NEW BISECTION: " + bisection.toString());
+//                              } else
+//                                      finished = true;
                         } else
                                 finished = true;