Changeset 25 for trunk/EventBenchCore/src/de/ugoe/cs

Timestamp:

04/14/11 13:51:20 (14 years ago)

Author:

sherbold

Message:

• renamed DotPrinter? to IDotCompatible in package de.ugoe.cs.eventbench.models

+ added getDotRepresentation to de.ugoe.cs.eventbench.models.IDotCompatible

• removed printDot from de.ugoe.cs.eventbench.models.IDotCompatible

Location:

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

Files:

• FirstOrderMarkovModel.java (modified) (4 diffs)
• IDotCompatible.java (moved) (moved from trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/DotPrinter.java) (1 diff)

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

@@ -13 +13 @@
 import Jama.Matrix;
 
-public class FirstOrderMarkovModel extends HighOrderMarkovModel implements DotPrinter {
+public class FirstOrderMarkovModel extends HighOrderMarkovModel implements IDotCompatible {
 
         final static int MAX_STATDIST_ITERATIONS = 1000;
@@ -39 +39 @@
         }
         
-        public void printDot() {
-                Console.println("digraph model {");
+        public String getDotRepresentation() {
+                StringBuilder stringBuilder = new StringBuilder();
+                stringBuilder.append("digraph model {");
 
                 List<Event<?>> knownSymbols = new ArrayList<Event<?>>(trie.getKnownSymbols());
@@ -46 +47 @@
                 for( Event<?> symbol : knownSymbols) {
                         final String thisSaneId = symbol.getShortId().replace("\"", "\\\"").replaceAll("[\r\n]","");
-                        Console.println(" " + symbol.hashCode() + " [label=\""+thisSaneId+"\"];");
+                        stringBuilder.append(" " + symbol.hashCode() + " [label=\""+thisSaneId+"\"];");
                         List<Event<?>> context = new ArrayList<Event<?>>();
                         context.add(symbol); 
@@ -55 +56 @@
                         }
                 }
-                System.out.println('}');
+                stringBuilder.append('}');
+                return stringBuilder.toString();
         }
         

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

@@ -1 +1 @@
 package de.ugoe.cs.eventbench.models;
 
-public interface DotPrinter {
-        public abstract void printDot();
+public interface IDotCompatible {
+        public abstract String getDotRepresentation();
 }