Changeset 80 for trunk

Timestamp:

06/22/11 14:12:18 (13 years ago)

Author:

sherbold

Message:

• added getProbability() to de.ugoe.cs.eventbench.models.IStochasticProcess and implementing classes
• added getEvents() to de.ugoe.cs.eventbench.models.IStochasticProcess and implementing classes
• changed getProbability() of subclasses of de.ugoe.cs.eventbench.TrieBasedModel? such that the probability is not zero if the context length is higher than the order of the model, but rather the probability of the suffix of the length of the order, i.e., for a 2nd-order model context(X1,X2,X3,X4) becomes context(X3,X4)

Location:

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

Files:

• HighOrderMarkovModel.java (modified) (1 diff)
• IStochasticProcess.java (modified) (2 diffs)
• PredictionByPartialMatch.java (modified) (2 diffs)
• TrieBasedModel.java (modified) (3 diffs)

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

@@ -12 +12 @@
                 super(maxOrder, r);
         }
-                
+        
         @Override
-        protected double getProbability(List<Event<?>> context, Event<?> symbol) {
+        public double getProbability(List<Event<?>> context, Event<?> symbol) {
                 double result = 0.0d;
                 
-                List<Event<?>> contextCopy = new LinkedList<Event<?>>(context);
+                List<Event<?>> contextCopy;
+                if( context.size()>=trieOrder ) {
+                        contextCopy = new LinkedList<Event<?>>(context.subList(context.size()-trieOrder+1, context.size()));
+                } else {
+                        contextCopy = new LinkedList<Event<?>>(context);
+                }
 
         

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

@@ -2 +2 @@
 
 import java.util.List;
+import java.util.Set;
 
 import de.ugoe.cs.eventbench.data.Event;
 
 public interface IStochasticProcess {
+        
+        double getProbability(List<Event<?>> context, Event<?> symbol);
 
         public List<? extends Event<?>> randomSequence();
@@ -12 +15 @@
         
         public String[] getStateStrings();
+        
+        public Set<Event<?>> getEvents();
 
 }

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

@@ -29 +29 @@
         
         @Override
-        protected double getProbability(List<Event<?>> context, Event<?> symbol) {
+        public double getProbability(List<Event<?>> context, Event<?> symbol) {
                 double result = 0.0d;
                 double resultCurrentContex = 0.0d;
                 double resultShorterContex = 0.0d;
                 
-                List<Event<?>> contextCopy = new LinkedList<Event<?>>(context); // defensive copy
+                List<Event<?>> contextCopy;
+                if( context.size()>=trieOrder ) {
+                        contextCopy = new LinkedList<Event<?>>(context.subList(context.size()-trieOrder+1, context.size()));
+                } else {
+                        contextCopy = new LinkedList<Event<?>>(context);
+                }
 
         
@@ -47 +52 @@
                         resultCurrentContex = ((double) countSymbol) / sumCountFollowers;
                 } else {
-                        resultCurrentContex = ((double) countSymbol / sumCountFollowers)*(1-probEscape);
+                        if( sumCountFollowers==0 ) {
+                                resultCurrentContex = 0.0;
+                        }
+                        else {
+                                resultCurrentContex = ((double) countSymbol / sumCountFollowers)*(1-probEscape);
+                        }
                         contextCopy.remove(0); 
                         double probSuffix = getProbability(contextCopy, symbol);

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

@@ -4 +4 @@
 import java.util.List;
 import java.util.Random;
+import java.util.Set;
 
 import de.ugoe.cs.eventbench.data.Event;
@@ -13 +14 @@
 
         protected int trieOrder;
-
-        protected abstract double getProbability(List<Event<?>> context, Event<?> symbol);
 
         protected Trie<Event<?>> trie;
@@ -99 +98 @@
                 return stateStrings;
         }
+        
+        public Set<Event<?>> getEvents() {
+                return trie.getKnownSymbols();
+        }
 
 }