Changeset 95 for trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models

Timestamp:

07/04/11 11:40:25 (13 years ago)

Author:

sherbold

Message:

• fixed bug in de.ugoe.cs.eventbench.models.TrieBasedModel?.generateSequences()

File:

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

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

@@ -151 +151 @@
                                 List<Event<?>> subSeq = new LinkedList<Event<?>>();
                                 subSeq.add(Event.STARTEVENT);
+                                sequenceSet.add(subSeq);
                         } else {
                                 for( Event<?> event : getEvents() ) {
@@ -161 +162 @@
                 }
                 Set<? extends Event<?>> events = getEvents();
-                Set<List<? extends Event<?>>> seqsShorter = generateSequences(length-1);
+                Set<List<? extends Event<?>>> seqsShorter = generateSequences(length-1, fromStart);
                 for( Event<?> event : events ) {
                         for( List<? extends Event<?>> seqShorter : seqsShorter ) {
@@ -178 +179 @@
         public Set<List<? extends Event<?>>> generateValidSequences(int length) {
                 // check for min-length implicitly done by generateSequences
-                Set<List<? extends Event<?>>> validSequences = generateSequences(length, true);
-                for( List<? extends Event<?>> sequence : validSequences ) {
-                        if( sequence.size()!=length ) {
-                                validSequences.remove(sequence);
-                        } else {
-                                if( !Event.ENDEVENT.equals(sequence.get(sequence.size()-1)) ) {
-                                        validSequences.remove(sequence);
-                                }
+                Set<List<? extends Event<?>>> allSequences = generateSequences(length, true);
+                Set<List<? extends Event<?>>> validSequences = new LinkedHashSet<List<? extends Event<?>>>();
+                for( List<? extends Event<?>> sequence : allSequences ) {
+                        if( sequence.size()==length && Event.ENDEVENT.equals(sequence.get(sequence.size()-1)) ) {
+                                validSequences.add(sequence);
                         }
                 }