Changeset 16 for trunk

Timestamp:

04/14/11 10:53:57 (14 years ago)

Author:

sherbold

Message:

+ added class de.ugoe.cs.eventbench.models.FirstOrderMarkovModel? to replace de.ugoe.cs.eventbench.markov.MarkovModel?

Location:

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

Files:

• data/Event.java (modified) (1 diff)
• models/FirstOrderMarkovModel.java (added)
• models/PredictionByPartialMatch.java (modified) (1 diff)
• models/Trie.java (modified) (1 diff)
• models/TrieBasedModel.java (modified) (5 diffs)

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

@@ -75 +75 @@
                                 shortId += "."+idInfo;
                         }
+                } else {
+                        shortId = getStandardId();
                 }
                 return shortId;

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

@@ -13 +13 @@
         double probEscape;
         
-        public PredictionByPartialMatch(int maxOrder, Random r) {
-                this(maxOrder, r, 0.1);
+        public PredictionByPartialMatch(int markovOrder, Random r) {
+                this(markovOrder, r, 0.1);
         }
         
-        public PredictionByPartialMatch(int maxOrder, Random r, double probEscape) {
-                super(maxOrder, r);
+        public PredictionByPartialMatch(int markovOrder, Random r, double probEscape) {
+                super(markovOrder, r);
                 this.probEscape = probEscape;
         }

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

@@ -38 +38 @@
         }
         
-        // trains the current Trie using the given sequence and adds all subsequence of length maxOrder
+        // trains the current Trie using the given sequence and adds all subsequence of length trieOrder
         public void train(List<T> sequence, int maxOrder) {
                 IncompleteMemory<T> latestActions = new IncompleteMemory<T>(maxOrder);

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

@@ -10 +10 @@
 public abstract class TrieBasedModel {
 
-        protected int maxOrder;
+        protected int trieOrder;
 
         protected abstract double getProbability(List<Event<?>> context, Event<?> symbol);
@@ -18 +18 @@
 
         
-        public TrieBasedModel(int maxOrder, Random r) {
+        public TrieBasedModel(int markovOrder, Random r) {
                 super();
-                this.maxOrder = maxOrder;
+                this.trieOrder = markovOrder+1;
                 this.r = r;
         }
@@ -32 +32 @@
                         currentSequence.add(Event.ENDEVENT);
                         
-                        trie.train(currentSequence, maxOrder);
+                        trie.train(currentSequence, trieOrder);
                 }
         }
@@ -39 +39 @@
                 List<Event<?>> sequence = new LinkedList<Event<?>>();
                 
-                IncompleteMemory<Event<?>> context = new IncompleteMemory<Event<?>>(maxOrder-1);
+                IncompleteMemory<Event<?>> context = new IncompleteMemory<Event<?>>(trieOrder-1);
                 context.add(Event.STARTEVENT);
                 
@@ -49 +49 @@
                         double randVal = r.nextDouble();
                         double probSum = 0.0;
-                        List<Event<?>> currentContext = context.getLast(maxOrder);
+                        List<Event<?>> currentContext = context.getLast(trieOrder);
                         for( Event<?> symbol : trie.getKnownSymbols() ) {
                                 probSum += getProbability(currentContext, symbol);