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

Timestamp:

Oct 9, 2010, 12:24:38 PM (14 years ago)

Author:

gnappo

Message:

Aggiunto output in formato XML dei dati; modificato MQI (adesso cerca nella partizione piu` grande).

File:

• src/main/java/weka/clusterers/forMetisMQI/MQI.java (modified) (6 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 edu.uci.ics.jung.algorithms.flows.EdmondsKarpMaxFlow;
 import edu.uci.ics.jung.graph.DirectedGraph;
@@ -83 +84 @@
 
         static private DirectedGraph<Node, Edge> prepareDirectedGraph(
-                        Bisection bisection, Node source, Node sink, boolean forConductance) {
-                Subgraph B = bisection.getLargerSubgraph();
-                Subgraph A = bisection.getSmallerSubgraph();
+                        Subgraph A, Node source, Node sink, boolean forConductance) {
+                Bisection bisection = new Bisection(A);
+                Subgraph B = bisection.getComplement();
                 int a = 0;
                 if (!forConductance)
@@ -161 +162 @@
         static public Set<Node> mqi(Bisection partition, boolean forConductance) {
 //              System.out.println("INITIAL BISECTION: " + partition.toString());
+                UndirectedGraph startingGraph = partition.getGraph();
                 boolean finished = false;
                 Bisection bisection = partition;
-                Set<Node> cluster = new HashSet<Node>(partition.getSmallerSubgraph()
+                Set<Node> cluster = new HashSet<Node>(partition.getLargerSubgraph()
                                 .createInducedSubgraph().getVertices());
 //              System.out.println("IMPROVING SUBGRAPH: " + cluster);
@@ -170 +172 @@
                         Node source = new Node("$$$$S");
                         Node sink = new Node("$$$$T");
-                        DirectedGraph<Node, Edge> directedGraph = prepareDirectedGraph(
-                                        bisection, source, sink, true);
+                        Subgraph A = new Subgraph(startingGraph,cluster);
+                        DirectedGraph<Node, Edge> directedGraph = prepareDirectedGraph(A, source, sink, true);
                         Transformer<Edge, Number> capTransformer = new Transformer<Edge, Number>() {
                                 public Double transform(Edge e) {
@@ -191 +193 @@
 
                         if (!forConductance)
-                                maxFlowThreshold = bisection.getLargerSubgraph()
-                                                .getVertexCount()
+                                maxFlowThreshold = A.getVertexCount()
                                                 * bisection.edgeCut() / 2;
                         else {
 //                              maxFlowThreshold = Math.min(bisection.getLargerSubgraph().totalDegree(), bisection.getSmallerSubgraph().totalDegree());
-                                maxFlowThreshold = bisection.getSmallerSubgraph().totalDegree();
+                                maxFlowThreshold = A.totalDegree();
                                 maxFlowThreshold = maxFlowThreshold
                                                 * (bisection.edgeCut() / 2);
@@ -216 +217 @@
 //                              System.out.println("REFINED BISECTION: " + bisection.toString());
                                 if(Configuration.instance().getVerboseLevel() > 1)
-                                        GraphsFrame.instance().addPanel(Util.panelCluster(bisection.getGraph(), cluster));
+                                        GraphsFrame.instance().addPanel(Util.panelCluster(bisection.getGraph().clone(), cluster));
                         } else
                                 finished = true;