Changeset 400 for trunk/EventBenchCore/src/de

Timestamp:

03/19/12 10:57:34 (13 years ago)

Author:

sherbold

Message:

• fixed bug that disallowed to generate sequences of a predefined maxLength and a valid end with the method de.ugoe.cs.eventbench.models.TrieBasedModel?.randomSequence(int maxLength, boolean validEnd).

File:

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

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

@@ -163 +163 @@
                                 context.add(Event.STARTEVENT);
 
-                                while (!endFound && sequence.size() < maxLength) {
+                                while (!endFound && sequence.size() <= maxLength) {
                                         double randVal = r.nextDouble();
                                         double probSum = 0.0;
@@ -170 +170 @@
                                                 probSum += getProbability(currentContext, symbol);
                                                 if (probSum >= randVal) {
-                                                        if (!(symbol == Event.STARTEVENT || symbol == Event.ENDEVENT)) {
+                                                        if (!(Event.STARTEVENT.equals(symbol) || Event.ENDEVENT
+                                                                        .equals(symbol))) {
                                                                 // only add the symbol the sequence if it is not
                                                                 // START or END
@@ -176 +177 @@
                                                                 sequence.add(symbol);
                                                         }
-                                                        endFound = (symbol == Event.ENDEVENT)
+                                                        endFound = (Event.ENDEVENT.equals(symbol))
                                                                         || (!validEnd && sequence.size() == maxLength);
                                                         break;