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

Timestamp:

Sep 30, 2010, 5:33:45 PM (15 years ago)

Author:

gnappo

Message:

Aggiunto metodo per stampare i grafi in formato utile per kmetis; modificato politica di azione di mqi, ora agisce sulla partizione piu` grande.

File:

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

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

@@ -81 +81 @@
 
         static private DirectedGraph<Node, Edge> prepareDirectedGraph(
-                        Bisection partition, Node source, Node sink, boolean forConductance) {
-                Subgraph A = null;
-                Subgraph B = null;
-                if (partition.getSubgraph().getVertexCount() < partition
-                                .getComplement().getVertexCount()) {
-                        A = partition.getSubgraph();
-                        B = partition.getComplement();
-                } else {
-                        A = partition.getComplement();
-                        B = partition.getSubgraph();
-                }
+                        Bisection bisection, Node source, Node sink, boolean forConductance) {
+                Subgraph A = bisection.getLargerSubgraph();
+                Subgraph B = bisection.getSmallerSubgraph();
                 int a = 0;
                 if (!forConductance)
@@ -98 +90 @@
                         Iterator<Node> aIterator = A.iterator();
                         while(aIterator.hasNext()) {
-                                a += partition.getGraph().degree(aIterator.next());
-                        }
-                }
-                int c = partition.edgeCut() / 2;
+                                a += bisection.getGraph().degree(aIterator.next());
+                        }
+                }
+                int c = bisection.edgeCut() / 2;
 
                 DirectedGraph<Node, Edge> g = new DirectedSparseGraph<Node, Edge>();
@@ -109 +101 @@
                         g.addVertex(u);
                 }
-
                 nodes = A.iterator();
                 int id = 0;
@@ -153 +144 @@
                         if(forConductance)
                                 //FIXME: CONTROLLAMI
-                                g.addEdge(new Edge(Integer.toString(id), 1, c * partition.getGraph().degree(u)), u, sink);
+                                g.addEdge(new Edge(Integer.toString(id), 1, c * bisection.getGraph().degree(u)), u, sink);
                         else
                                 g.addEdge(new Edge(Integer.toString(id), 1, c), u, sink);
@@ -173 +164 @@
                 boolean finished = false;
                 Bisection bisection = partition;
-                Set<Node> cluster = new HashSet<Node>(partition.getSmallerNotEmptySubgraph()
+                Set<Node> cluster = new HashSet<Node>(partition.getLargerSubgraph()
                                 .createInducedSubgraph().getVertices());
                 int maxFlowThreshold = Integer.MAX_VALUE;
@@ -200 +191 @@
 
                         if (!forConductance)
-                                maxFlowThreshold = bisection.getSmallerNotEmptySubgraph()
+                                maxFlowThreshold = bisection.getLargerSubgraph()
                                                 .getVertexCount()
                                                 * bisection.edgeCut() / 2;
                         else {
-                                Iterator<Node> aIterator = bisection.getSmallerNotEmptySubgraph().iterator();
+                                Iterator<Node> aIterator = bisection.getLargerSubgraph().iterator();
                                 maxFlowThreshold = 0;
                                 while(aIterator.hasNext())
@@ -212 +203 @@
                         }
                         alg.evaluate();
-//                       Util.viewFlowGraph(directedGraph, edgeFlowMap);
-//                      System.out.println("MAX FLOW: " + alg.getMaxFlow() + " THRESHOLD: "
-//                                      + maxFlowThreshold);
+//                      Util.viewFlowGraph(directedGraph, edgeFlowMap);
+                        System.out.println("MAX FLOW: " + alg.getMaxFlow() + " THRESHOLD: "
+                                        + maxFlowThreshold);
                         if (alg.getMaxFlow() < maxFlowThreshold) {
                                 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;
+                                cluster = dfsResult;
+                                bisection = new Bisection(new Subgraph(
+                                        bisection.getGraph(), cluster));
                         } else
                                 finished = true;