Changeset 393 for trunk/EventBenchConsole/src/de/ugoe/cs/eventbench

Timestamp:

03/08/12 09:24:55 (13 years ago)

Author:

sherbold

Message:

• added optional parameter validEnd to the command generateFixedLengthSequences. If the parameter is true, only sequences that end in de.ugoe.cs.eventbench.data.Event.ENDEVENT are generated. If the parameter is false, the final event is arbitrary.

File:

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

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

@@ -41 +41 @@
                 boolean all = true;
                 int numSequences = -1;
+                boolean validEnd = true;
                 try {
                         modelname = (String) parameters.get(0);
@@ -49 +50 @@
                                 all = Boolean.parseBoolean((String) parameters.get(4));
                         }
-                        if (parameters.size() == 6) {
+                        if (parameters.size() >= 6) {
                                 numSequences = Integer.parseInt((String) parameters.get(5));
+                        }
+                        if (parameters.size() >= 7) {
+                                validEnd = Boolean.parseBoolean((String) parameters.get(6));
                         }
                 } catch (Exception e) {
@@ -69 +73 @@
                 Collection<List<? extends Event<?>>> sequences = new LinkedHashSet<List<? extends Event<?>>>();
                 for (int length = minLength; length <= maxLength; length++) {
-                        sequences.addAll(model.generateValidSequences(length + 2));
+                        if( validEnd ) {
+                                sequences.addAll(model.generateValidSequences(length + 2));
+                        } else {
+                                sequences.addAll(model.generateSequences(length + 1, true));
+                        }
                 }
                 Console.traceln("" + sequences.size() + " possible");
@@ -120 +128 @@
         @Override
         public void help() {
-                Console.println("Usage: generateFixedLengthSequences <modelname> <sequencesName> <minlenght> <maxlength> {<all>} {<numSequences>}");
+                Console.println("Usage: generateFixedLengthSequences <modelname> <sequencesName> <minlenght> <maxlength> {<all>} {<numSequences>} {<validEnd>}");
         }