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

Timestamp:

10/15/11 01:41:55 (13 years ago)

Author:

sherbold

Message:

• added methods getChildren() and setCount() to de.ugoe.cs.eventbench.models.TrieNode?
• added method updateKnownSymbols() to de.ugoe.cs.eventbench.models.Trie
• changed the visibility of some members of de.ugoe.cs.eventbench.models.PredictionByPartionMatch?
• added class de.ugoe.cs.eventbench.models.ModelFlattener? to generate FirstOrderMarkovModel? from higher-order models through state splitting
• tweaked entropy calculation of de.ugoe.cs.eventbench.models.FirstOrderMarkovModel? to work with flattened models (locating of START and END was a problem)

File:

• trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/FirstOrderMarkovModel.java (modified) (4 diffs)

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

@@ -3 +3 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
@@ -99 +100 @@
                 int numStates = knownSymbols.size();
 
-                int startStateIndex = knownSymbols.indexOf(Event.STARTEVENT);
-                int endStateIndex = knownSymbols.indexOf(Event.ENDEVENT);
-                if (startStateIndex == -1) {
+                List<Integer> startIndexList = new LinkedList<Integer>();
+                List<Integer> endIndexList = new LinkedList<Integer>();
+                for( int i=0 ; i<knownSymbols.size() ; i++ ) {
+                        String id = knownSymbols.get(i).getStandardId();
+                        if( id.equals(Event.STARTEVENT.getStandardId()) || id.contains(Event.STARTEVENT.getStandardId()+"-=-") ) {
+                                startIndexList.add(i);
+                        }
+                        if( id.equals(Event.ENDEVENT.getStandardId()) || id.contains("-=-"+Event.ENDEVENT.getStandardId()) ) {
+                                endIndexList.add(i);
+                        }
+                }
+                
+                if (startIndexList.isEmpty()) { 
                         Console.printerrln("Error calculating entropy. Initial state of markov chain not found.");
                         return Double.NaN;
                 }
-                if (endStateIndex == -1) {
+                if (endIndexList.isEmpty()) {
                         Console.printerrln("Error calculating entropy. End state of markov chain not found.");
                         return Double.NaN;
                 }
-                transmissionMatrix.set(endStateIndex, startStateIndex, 1);
+                for( Integer i : endIndexList ) {
+                        for(Integer j : startIndexList ) {
+                                transmissionMatrix.set(i, j, 1);
+                        }
+                }
 
                 // Calculate stationary distribution by raising the power of the
@@ -160 +175 @@
                 List<Event<?>> knownSymbols = new ArrayList<Event<?>>(
                                 trie.getKnownSymbols());
-
                 for (Event<?> symbol : knownSymbols) {
                         final String thisSaneId = symbol.getShortId().replace("\"", "\\\"")
@@ -183 +197 @@
         /**
          * <p>
-         * Returns a {@link Graph} represenation of the model with the states as
+         * Returns a {@link Graph} representation of the model with the states as
          * nodes and directed edges weighted with transition probabilities.
          * </p>