Changeset 18

Timestamp:

04/14/11 11:12:06 (13 years ago)

Author:

sherbold

Message:

• removed all reference to de.ugoe.cs.eventbench.MarkovModel? and replaced them with de.ugoe.cs.eventbench.models.FirstOrderMarkovModel? and de.ugoe.cs.eventbench.models.IStochasticProcess

Location:

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench

Files:

• EventGenerator.java (modified) (1 diff)
• commands/CMDcalcEntropy.java (modified) (2 diffs)
• commands/CMDgenerateRandomReplay.java (modified) (2 diffs)
• commands/CMDprintRandomSession.java (modified) (2 diffs)
• commands/CMDshowMarkovModel.java (modified) (5 diffs)
• commands/CMDtest.java (added)
• commands/CMDtrainMarkovModel.java (modified) (4 diffs)
• commands/CMDtrainPPM.java (modified) (1 diff)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/EventGenerator.java

@@ -143 +143 @@
                 for (int ruleIndex = 0; ruleIndex < ruleElements.size() && !isMatch; ruleIndex++) {
                         Element currentRule = ruleElements.get(ruleIndex);
+                        currentRuleName = currentRule.getAttributeValue("name");
                         currentToken = new ReplayableEvent<WindowsMessage>(currentRuleName);
-                        currentRuleName = currentRule.getAttributeValue("name");
                         isMatch = true;
                         messageStorage = new HashMap<String, Object>();

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDcalcEntropy.java

@@ -4 +4 @@
 
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.eventbench.markov.MarkovModel;
+import de.ugoe.cs.eventbench.models.FirstOrderMarkovModel;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
@@ -25 +25 @@
                 }
                 
-                MarkovModel model = null; 
+                FirstOrderMarkovModel model = null; 
                 Object dataObject = GlobalDataContainer.getInstance().getData(modelname);
                 if( dataObject==null ) {
                         Console.println("Model " + modelname + "not found in storage.");
                 }
-                else if( !(dataObject instanceof MarkovModel) ) {
-                        Console.println("Object " + modelname + " is not a markov model!");
+                else if( !(dataObject instanceof FirstOrderMarkovModel) ) {
+                        Console.println("Object " + modelname + " is not a first-order Markov model!");
                 } else {
-                        model = (MarkovModel) dataObject;
+                        model = (FirstOrderMarkovModel) dataObject;
                         double entropy = model.calcEntropy();
                         if( Double.isNaN(entropy) ) {

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateRandomReplay.java

@@ -8 +8 @@
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
 import de.ugoe.cs.eventbench.data.ReplayableEvent;
-import de.ugoe.cs.eventbench.markov.MarkovModel;
+import de.ugoe.cs.eventbench.models.IStochasticProcess;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
@@ -36 +36 @@
                 }
                 
-                MarkovModel model = null; 
+                IStochasticProcess model = null; 
                 Object dataObject = GlobalDataContainer.getInstance().getData(modelname);
                 if( dataObject==null ) {
                         Console.println("Model " + modelname + " not found in storage.");
                 }
-                else if( !(dataObject instanceof MarkovModel) ) {
+                else if( !(dataObject instanceof IStochasticProcess) ) {
                         Console.println("Object " + modelname + " not of type MarkovModel!");
                 } else {
-                        model = (MarkovModel) dataObject;
+                        model = (IStochasticProcess) dataObject;
                         List<List<ReplayableEvent<?>>> sequences = new LinkedList<List<ReplayableEvent<?>>>();
                         try {

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDprintRandomSession.java

@@ -6 +6 @@
 import de.ugoe.cs.eventbench.data.Event;
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.eventbench.markov.MarkovModel;
+import de.ugoe.cs.eventbench.models.IStochasticProcess;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
@@ -27 +27 @@
                 }
                 
-                MarkovModel model = null; 
+                IStochasticProcess model = null; 
                 Object dataObject = GlobalDataContainer.getInstance().getData(modelname);
                 if( dataObject==null ) {
                         Console.println("Model " + modelname + " not found in storage.");
                 }
-                else if( !(dataObject instanceof MarkovModel) ) {
+                else if( !(dataObject instanceof IStochasticProcess) ) {
                         Console.println("Object " + modelname + " not of type MarkovModel!");
                 } else {
-                        model = (MarkovModel) dataObject;
+                        model = (IStochasticProcess) dataObject;
                         for( Event<?> event : model.randomSequence() ) {
                                 Console.println(event.toString());

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDshowMarkovModel.java

@@ -12 +12 @@
 
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.eventbench.markov.MarkovModel;
-import de.ugoe.cs.eventbench.markov.MarkovModel.MarkovEdge;
+import de.ugoe.cs.eventbench.models.FirstOrderMarkovModel;
+import de.ugoe.cs.eventbench.models.FirstOrderMarkovModel.MarkovEdge;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
@@ -47 +47 @@
                         Console.printerrln("No model with name " + modelname + "found");
                 } else {
-                        MarkovModel mm = (MarkovModel) dataObject;
+                        FirstOrderMarkovModel mm = (FirstOrderMarkovModel) dataObject;
                         
                         Graph<String, MarkovEdge> graph = mm.getGraph();
@@ -57 +57 @@
                         vv.setPreferredSize(new Dimension(1100,850)); //Sets the viewing area size
 
-                        
                         if( showNodeNames ) {
                                 final Rectangle rect = new Rectangle(240, 20);
@@ -72 +71 @@
                         }
                         
-                        
-                        vv.getRenderContext().setEdgeLabelTransformer(new ToStringLabeller<MarkovModel.MarkovEdge>());
+                        vv.getRenderContext().setEdgeLabelTransformer(new ToStringLabeller<MarkovEdge>());
                         
                         JFrame frame = new JFrame("Markov Model");
@@ -82 +80 @@
                 }
         }
-        
-        
 }

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDtrainMarkovModel.java

@@ -4 +4 @@
 import java.security.InvalidParameterException;
 import java.util.List;
+import java.util.Random;
 
 import de.ugoe.cs.eventbench.data.Event;
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.eventbench.markov.MarkovModel;
+import de.ugoe.cs.eventbench.models.FirstOrderMarkovModel;
+import de.ugoe.cs.eventbench.models.HighOrderMarkovModel;
 import de.ugoe.cs.util.console.Command;
 import de.ugoe.cs.util.console.Console;
@@ -15 +17 @@
         @Override
         public void help() {
-                Console.println("Usage: trainMarkovModel <modelName>");
+                Console.println("Usage: trainMarkovModel <modelName> {<order>}");
         }
 
@@ -22 +24 @@
         public void run(List<Object> parameters) {
                 String modelname;
+                int order = 1;
                 try {
                         modelname = (String) parameters.get(0);
+                        if( parameters.size()==2 ) {
+                                order = Integer.parseInt((String) parameters.get(0));
+                        }
                 } catch (Exception e) {
                         throw new InvalidParameterException();
@@ -35 +41 @@
                         if( sequences.size()>0 ) {
                                 if( sequences.get(0).get(0) instanceof Event ) {
-                                        MarkovModel model = new MarkovModel();
+                                        HighOrderMarkovModel model;
+                                        if( order==1 ) {
+                                                model = new FirstOrderMarkovModel(new Random());
+                                        } else {
+                                                model = new HighOrderMarkovModel(order, new Random());
+                                        }
                                         model.train(sequences);
                                         if( GlobalDataContainer.getInstance().addData(modelname, model) ) {

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDtrainPPM.java

@@ -41 +41 @@
                                         if( GlobalDataContainer.getInstance().addData(modelname, model) ) {
                                                 Console.traceln("Old model overwritten");
-                                        }
-                                        // TODO TMP!!
-                                        Console.traceln(model.randomSequence().toString());
-                                        
+                                        }                                       
                                 } else {
                                         Console.traceln("Illegal use of \"sequences\" parameter in the GlobalDataContainer.");