Changeset 23 for trunk

Timestamp:

04/14/11 13:22:26 (14 years ago)

Author:

sherbold

Message:

+ added functionality to get a tree represenation of the Trie

Location:

trunk/EventBenchCore/src/de/ugoe/cs/eventbench

Files:

• data/Event.java (modified) (3 diffs)
• models/Trie.java (modified) (3 diffs)
• models/TrieBasedModel.java (modified) (2 diffs)

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/Event.java

@@ -52 +52 @@
                         } else {
                                 return type.equals(otherEvent.type)
-                                        && target==otherEvent.target;
+                                        && otherEvent.target==null;
                         }
                 } else {
@@ -72 +72 @@
                 if (targetShort!=null) {
                         shortId = targetShort+"."+getType();
-                        if (idInfo!="") {
+                        if ( !"".equals(idInfo)) {
                                 shortId += "."+idInfo;
                         }
@@ -87 +87 @@
                 }
                 id += getType();
-                if ( idInfo!="" ) {
+                if ( !"".equals(idInfo) ) {
                         id += "." + idInfo;
                 }

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/Trie.java

@@ -1 +1 @@
 package de.ugoe.cs.eventbench.models;
 
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.awt.Shape;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -9 +6 @@
 import java.util.Set;
 
-import javax.swing.JFrame;
-
-import org.apache.commons.collections15.Transformer;
-
-
-import edu.uci.ics.jung.algorithms.layout.Layout;
-import edu.uci.ics.jung.algorithms.layout.TreeLayout;
 import edu.uci.ics.jung.graph.DelegateTree;
 import edu.uci.ics.jung.graph.Tree;
-import edu.uci.ics.jung.visualization.BasicVisualizationServer;
-import edu.uci.ics.jung.visualization.decorators.ToStringLabeller;
-import edu.uci.ics.jung.visualization.renderers.Renderer.VertexLabel.Position;
 
 public class Trie<T> {
@@ -155 +142 @@
         }
         
-        private Tree<TrieVertex, Edge> getGraph() {
+        protected Tree<TrieVertex, Edge> getGraph() {
                 DelegateTree<TrieVertex, Edge> graph = new DelegateTree<TrieVertex, Edge>();
                 rootNode.getGraph(null, graph);
                 return graph;
-        }
-        
-        public void display() {
-                Tree<TrieVertex, Edge> graph = this.getGraph();
-                Layout<TrieVertex, Edge> layout = new TreeLayout<TrieVertex, Edge>(graph, 60);
-                // The BasicVisualizationServer<V,E> is parameterized by the edge types
-                BasicVisualizationServer<TrieVertex,Edge> vv =
-                new BasicVisualizationServer<TrieVertex,Edge>(layout);
-                vv.setPreferredSize(new Dimension(1100,850)); //Sets the viewing area size
-                
-                
-                final Rectangle rect = new Rectangle(40, 20);
-                        
-                Transformer<TrieVertex, Shape> vertexShapeTransformer =
-                        new Transformer<TrieVertex, Shape>() {
-                                public Shape transform(TrieVertex s) {
-                                        return rect;
-                                }
-                };
-                vv.getRenderer().getVertexLabelRenderer().setPosition(Position.CNTR);
-                vv.getRenderContext().setVertexShapeTransformer(vertexShapeTransformer);
-                vv.getRenderContext().setVertexLabelTransformer(new ToStringLabeller<TrieVertex>());
-                
-                JFrame frame = new JFrame("Trie");
-                frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-                frame.getContentPane().add(vv);
-                frame.pack();
-                frame.setVisible(true);
         }
         

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/TrieBasedModel.java

@@ -6 +6 @@
 
 import de.ugoe.cs.eventbench.data.Event;
+import de.ugoe.cs.eventbench.models.Trie.Edge;
+import de.ugoe.cs.eventbench.models.Trie.TrieVertex;
+import edu.uci.ics.jung.graph.Tree;
 
 public abstract class TrieBasedModel implements IStochasticProcess {
@@ -69 +72 @@
                 return sequence;
         }
+        
+        public Tree<TrieVertex, Edge> getTrieGraph() {
+                return trie.getGraph();
+        }
 
         @Override