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

Timestamp:

Sep 23, 2010, 10:32:44 AM (14 years ago)

Author:

gnappo

Message:

Modificata strategia individuazione cluster: quelli trovati vengono rimossi.

File:

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

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

@@ -159 +159 @@
          */
         static public Set<Node> mqi(Bisection partition) {
-                System.out.println("INITIAL BISECTION: " + partition.toString());
+//              System.out.println("INITIAL BISECTION: " + partition.toString());
                 boolean finished = false;
                 Bisection bisection = partition;
@@ -167 +167 @@
                 int maxFlowThreshold = Integer.MAX_VALUE;
                 while (!finished) {
-                        Node source = new Node("S");
-                        Node sink = new Node("T");
+                        Node source = new Node("$$$$S");
+                        Node sink = new Node("$$$$T");
                         DirectedGraph<Node, Edge> directedGraph = prepareDirectedGraph(
                                         bisection, source, sink);
@@ -182 +182 @@
                                 public Edge create() {
                                         i++;
-                                        return new Edge("f" + Integer.toString(i), 1, 1);
+                                        return new Edge("$$$$" + Integer.toString(i), 1, 1);
                                 }
                         };
@@ -194 +194 @@
                         alg.evaluate();
 //                      Util.viewFlowGraph(directedGraph, edgeFlowMap);
-                        System.out.println("MAX FLOW: " + alg.getMaxFlow() + " THRESHOLD: "
-                                        + maxFlowThreshold);
+//                      System.out.println("MAX FLOW: " + alg.getMaxFlow() + " THRESHOLD: "
+//                                      + maxFlowThreshold);
                         if (alg.getMaxFlow() < maxFlowThreshold) {
                                 cluster = DFSReversed(sink, directedGraph, edgeFlowMap, new HashSet<Node>());
@@ -201 +201 @@
                                  bisection = new Bisection(new Subgraph(bisection.getGraph(),
                                  cluster));
-                                System.out.println("NEW BISECTION: " + bisection.toString());
+//                              System.out.println("NEW BISECTION: " + bisection.toString());
                         } else
                                 finished = true;