Changeset 121 for trunk

Timestamp:

07/13/11 11:33:15 (13 years ago)

Author:

sherbold

Message:

+ added optional parameters minLength and maxLength to command generateRandomSequences to allow only sequences of a given length

File:

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

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

@@ -3 +3 @@
 import java.security.InvalidParameterException;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -21 +20 @@
                 int numSessions;
                 long maxIter;
+                int minLength = 0;
+                int maxLength = Integer.MAX_VALUE;
                 try {
                         modelname = (String) parameters.get(0);
@@ -26 +27 @@
                         numSessions = Integer.parseInt((String) parameters.get(2));
                         maxIter = numSessions*10;
-                        if( parameters.size()==4 ) {
+                        if( parameters.size()>=4 ) {
                                 maxIter = Long.parseLong((String) parameters.get(3));
+                        }
+                        if( parameters.size()>=5 ) {
+                                minLength = Integer.parseInt((String) parameters.get(4));
+                        }
+                        if( parameters.size()>=6 ) {
+                                maxLength = Integer.parseInt((String) parameters.get(5));
                         }
                 }
@@ -46 +53 @@
                         long numIterations = 0;
                         while( sequences.size()<numSessions && numIterations<maxIter ) {
-                                sequences.add(model.randomSequence());
+                                List<? extends Event<?>> generatedSequence = model.randomSequence();
+                                if( generatedSequence.size()>=minLength && generatedSequence.size()<=maxLength ) {
+                                        sequences.add(generatedSequence);
+                                }
                                 numIterations++;
                         }
@@ -60 +70 @@
         @Override
         public void help() {
-                Console.println("Usage: generateRandomSequenecs <modelName> <sequencesName> <numSessions> {<maxIter>}");
+                Console.println("Usage: generateRandomSequenecs <modelName> <sequencesName> <numSessions> {<maxIter> <minLength> <maxLength>}");
         }