Changeset 408 for trunk/EventBenchConsole/src/de/ugoe

Timestamp:

04/03/12 10:21:17 (13 years ago)

Author:

sherbold

Message:

• fixed bug in command generateHybrid: sometimes sequences had the wrong length and did not end with the END symbol, even though a valid end was requested.

File:

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

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

@@ -111 +111 @@
                                         sequence = finishSequence(seqTmp, model, length + 2,
                                                         validEnd);
+                                        if( sequence!= null && sequence.size()!=length+2 ) {
+                                                sequence = null;
+                                        }
                                 } else {
                                         sequence = finishSequence(seqTmp, model, length + 1,
                                                         validEnd);
+                                        if( sequence!= null && sequence.size()!=length+1 ) {
+                                                sequence = null;
+                                        }
                                 }
-                                sequences.add(sequence);
+                                if( sequence!=null ) {
+                                        sequences.add(sequence);
+                                }
                         }
                 }
@@ -130 +138 @@
                 boolean endFound = false;
                 List<Event<?>> sequenceCopy = new LinkedList<Event<?>>(sequence);
-
-                while (!endFound) {
+                final int maxIter = 30000;
+                int iter = 0;
+                while (!endFound && iter<maxIter) {
+                        iter++;
                         sequenceCopy = new LinkedList<Event<?>>(sequence);
                         while (!endFound && sequenceCopy.size() <= maxLength) {
@@ -139 +149 @@
                                         probSum += model.getProbability(sequenceCopy, symbol);
                                         if (probSum >= randVal) {
-                                                if (!(Event.STARTEVENT.equals(symbol) || Event.ENDEVENT.equals(symbol))) {
+                                                if (!(Event.STARTEVENT.equals(symbol) || (!validEnd && Event.ENDEVENT.equals(symbol)))) {
                                                         // only add the symbol the sequence if it is not
                                                         // START
@@ -152 +162 @@
                         }
                 }
+                if( iter==maxIter ) {
+                        return null;
+                }
                 return sequenceCopy;
         }
@@ -162 +175 @@
         @Override
         public void help() {
-                Console.println("Usage: generateFixedLengthSequences <modelname> <sequencesName> <lenght> <maxlengthAll> <numSequences> {<validEnd>}");
+                Console.println("Usage: generateHybrid <modelname> <sequencesName> <lenght> <maxlengthAll> <numSequences> {<validEnd>}");
         }