Changeset 2026 for trunk/autoquest-core-usageprofiles/src/main/java/de/ugoe/cs/autoquest/usageprofiles/TrieBasedModel.java

Timestamp:

07/23/15 13:43:38 (9 years ago)

Author:

sherbold

Message:

• made generation of random sequences with an expected valid end and a predefined maximum length more robust. the generation now aborts after a user-defined number of attempts to create a valid sequence and returns an empty sequence instead.

File:

• trunk/autoquest-core-usageprofiles/src/main/java/de/ugoe/cs/autoquest/usageprofiles/TrieBasedModel.java (modified) (4 diffs)

trunk/autoquest-core-usageprofiles/src/main/java/de/ugoe/cs/autoquest/usageprofiles/TrieBasedModel.java

@@ -147 +147 @@
     @Override
     public List<Event> randomSequence() {
-        return randomSequence(Integer.MAX_VALUE, true);
+        return randomSequence(Integer.MAX_VALUE, true, 100);
     }
 
@@ -156 +156 @@
      */
     @Override
-    public List<Event> randomSequence(int maxLength, boolean validEnd) {
+    public List<Event> randomSequence(int maxLength, boolean validEnd, long maxIter) {
         List<Event> sequence = new LinkedList<Event>();
+        int attempts = 0;
         if (trie != null) {
             boolean endFound = false;
-            while (!endFound) { // outer loop for length checking
-                sequence = new LinkedList<Event>();
+            while (!endFound && attempts <= maxIter) { // outer loop for length checking
                 IncompleteMemory<Event> context = new IncompleteMemory<Event>(trieOrder - 1);
                 context.add(Event.STARTEVENT);
@@ -186 +186 @@
                     }
                 }
+                if (!endFound) {
+                    sequence = new LinkedList<Event>();
+                }
+                attempts++;
             }
         }
@@ -398 +402 @@
         List<Event> context = new LinkedList<Event>();
         for (Event event : sequence) {
-            odds += Math.log(getProbability(context, event)+1);
+            odds += Math.log(getProbability(context, event) + 1);
             context.add(event);
         }