Changeset 401 for trunk

Timestamp:

03/19/12 11:20:20 (13 years ago)

Author:

sherbold

Message:

• fixed bug that disallowed to generate sequences of a predefined maxLength and a valid end with the command generateHybrid if the generated sequence is finished through a random walk (same bug as fixed with previous commit due to code duplication)

File:

• trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateHybrid.java (modified) (4 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands/CMDgenerateHybrid.java

@@ -106 +106 @@
                         }
                         List<? extends Event<?>> seqTmp = seqsTmp.get(index);
-                        if (seqTmp.get(seqTmp.size() - 1) != Event.ENDEVENT) {
+                        if (!Event.ENDEVENT.equals(seqTmp.get(seqTmp.size() - 1))) {
                                 List<? extends Event<?>> sequence;
                                 if (validEnd) {
@@ -133 +133 @@
                 while (!endFound) {
                         sequenceCopy = new LinkedList<Event<?>>(sequence);
-                        while (!endFound && sequenceCopy.size() < maxLength) {
+                        while (!endFound && sequenceCopy.size() <= maxLength) {
                                 double randVal = r.nextDouble();
                                 double probSum = 0.0;
@@ -139 +139 @@
                                         probSum += model.getProbability(sequenceCopy, 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
@@ -145 +145 @@
                                                         sequenceCopy.add(symbol);
                                                 }
-                                                endFound = (symbol == Event.ENDEVENT)
+                                                endFound = Event.ENDEVENT.equals(symbol)
                                                                 || (!validEnd && sequenceCopy.size() == maxLength);
                                                 break;