Changeset 23 for src/main/java

Timestamp:

Oct 5, 2010, 9:55:49 PM (14 years ago)

Author:

gnappo

Message:

Implementato pannello per la visualizzazione grafi.

Location:

src/main/java/weka/clusterers/forMetisMQI

Files:

• GraphAlgorithms.java (modified) (4 diffs)
• util/GraphsFrame.java (added)
• util/Util.java (modified) (6 diffs)

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

@@ -11 +11 @@
 import weka.clusterers.forMetisMQI.graph.UndirectedGraph;
 import weka.clusterers.forMetisMQI.util.CoarserGraphElement;
+import weka.clusterers.forMetisMQI.util.GraphsFrame;
 import weka.clusterers.forMetisMQI.util.Util;
 
@@ -81 +82 @@
          */
         static public Set<Set<Node>> metisMqi(UndirectedGraph g, int numberOfCluster, int sizeFinerGraph, boolean randomBisection) {
+                GraphsFrame gf = new GraphsFrame("Prova");
                 System.out.println("Vertex count: " + g.getVertexCount());
                 System.out.println("Edges count: " + g.getEdgeCount());
@@ -93 +95 @@
                 Set<Set<Node>> clusters = new HashSet<Set<Node>>();
                 UndirectedGraph gclone = g.clone();
-//              Util.viewGraph(g);
+                gf.addPanel(Util.panelGraph(gclone));
                 for (int i = 0; i < numberOfCluster; i++) {
                         Bisection bisection = null;
@@ -125 +127 @@
                         }
                 }
-                Util.viewClusters(gclone, clusters);
+                gf.addPanel(Util.panelClusters(gclone, clusters));
+                gf.setVisible(true);
                 return clusters;
         }

src/main/java/weka/clusterers/forMetisMQI/util/Util.java

@@ -11 +11 @@
 
 import javax.swing.JFrame;
+import javax.swing.JPanel;
 
 import org.apache.commons.collections15.Transformer;
@@ -19 +20 @@
 import weka.clusterers.forMetisMQI.graph.UndirectedGraph;
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
-import edu.uci.ics.jung.algorithms.layout.ISOMLayout;
 import edu.uci.ics.jung.algorithms.layout.Layout;
 import edu.uci.ics.jung.graph.Graph;
@@ -27 +27 @@
 public class Util {
         
-        public static void viewCluster(Graph<Node, Edge> g, Set<Node> cluster) {
+        public static JPanel panelCluster(Graph<Node, Edge> g, Set<Node> cluster) {
                 Set<Set<Node>> clusters = new HashSet<Set<Node>>();
                 clusters.add(cluster);
-                viewClusters(g, clusters);
+                return panelClusters(g, clusters);
         }
         
         
-        public static void viewClusters(Graph<Node, Edge> g, Set<Set<Node>> clusters) {
+        public static JPanel panelClusters(Graph<Node, Edge> g, Set<Set<Node>> clusters) {
                 Layout<Node, Edge> layout = new FRLayout<Node, Edge>(g);
                 layout.setSize(new Dimension(800, 600)); // sets the initial size of the space
@@ -85 +85 @@
                                 new ToStringLabeller<Edge>());
                 vv.getRenderContext().setVertexFillPaintTransformer(vertexPaint);
-                JFrame frame = new JFrame("Graph View");
-                frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-                frame.getContentPane().add(vv);
-                frame.pack();
-                frame.setVisible(true);
+                return vv;
         }
         
-        public static void viewGraph(Graph<Node, Edge> g){
+        public static JPanel panelGraph(Graph<Node, Edge> g){
                 Layout<Node, Edge> layout = new FRLayout<Node, Edge>(g);
                 layout.setSize(new Dimension(800,600)); // sets the initial size of the space
@@ -101 +97 @@
                 vv.getRenderContext().setVertexLabelTransformer(new ToStringLabeller<Node>());
                 vv.getRenderContext().setEdgeLabelTransformer(new ToStringLabeller<Edge>());
-                JFrame frame = new JFrame("Simple Graph View");
-                frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-                frame.getContentPane().add(vv);
-                frame.pack();
-                frame.setVisible(true);
+                return vv;
         }
         
-        public static void viewFlowGraph(Graph<Node, Edge> g, Map<Edge, Number> edgeFlowMap){
+        public static JPanel panelFlowGraph(Graph<Node, Edge> g, Map<Edge, Number> edgeFlowMap){
                 class EdgeTransformer implements Transformer<Edge,String> {
                         Map<Edge,Number> edgeFlowMap = null;
@@ -126 +118 @@
                 vv.getRenderContext().setVertexLabelTransformer(new ToStringLabeller<Node>());
                 vv.getRenderContext().setEdgeLabelTransformer(new EdgeTransformer(edgeFlowMap));
-                JFrame frame = new JFrame("Simple Graph View");
-                frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-                frame.getContentPane().add(vv);
-                frame.pack();
-                frame.setVisible(true);
+                return vv;
         }