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

Timestamp:

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

Author:

sherbold

Message:

• generateRandomSequences now generates no duplicates

Location:

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/commands

Files:

• CMDcalcCoverage.java (modified) (2 diffs)
• CMDgenerateRandomSequences.java (modified) (4 diffs)

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

@@ -32 +32 @@
                 
                 IStochasticProcess process = null; 
-                List<List<? extends Event<?>>> sequences = null;
+                Collection<List<? extends Event<?>>> sequences = null;
                 Object dataObjectProcess = GlobalDataContainer.getInstance().getData(modelname);
                 if( dataObjectProcess==null ) {
@@ -58 +58 @@
                                 
                                 process = (IStochasticProcess) dataObjectProcess;
-                                sequences = (List<List<? extends Event<?>>>) dataObjectSequences;
+                                sequences = (Collection<List<? extends Event<?>>>) dataObjectSequences;
                                 Console.print(sequenceName);
                                 for( int length=minLength ; length<=maxLength ; length++) {

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

@@ -2 +2 @@
 
 import java.security.InvalidParameterException;
+import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
 
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
@@ -18 +20 @@
                 String sequencesName;
                 int numSessions;
+                long maxIter;
                 try {
                         modelname = (String) parameters.get(0);
                         sequencesName = (String) parameters.get(1);
                         numSessions = Integer.parseInt((String) parameters.get(2));
+                        maxIter = numSessions*10;
+                        if( parameters.size()==4 ) {
+                                maxIter = Long.parseLong((String) parameters.get(3));
+                        }
                 }
                 catch (Exception e) {
@@ -36 +43 @@
                 } else {
                         model = (IStochasticProcess) dataObject;
-                        List<List<? extends Event<?>>> sequences = new LinkedList<List<? extends Event<?>>>();
-                        for( int i=0 ; i<numSessions ; i++ ) {
+                        Set<List<? extends Event<?>>> sequences = new HashSet<List<? extends Event<?>>>(numSessions);
+                        long numIterations = 0;
+                        while( sequences.size()<numSessions && numIterations<maxIter ) {
                                 sequences.add(model.randomSequence());
+                                numIterations++;
+                        }
+                        if( sequences.size() < numSessions ) {
+                                Console.println("Only " + sequences.size() + " unique sessions generated after " + maxIter + " iterations");
                         }
                         if( GlobalDataContainer.getInstance().addData(sequencesName, sequences) ) {
@@ -48 +60 @@
         @Override
         public void help() {
-                Console.println("Usage: generateRandomSequenecs <modelName> <sequencesName> <numSessions>");
+                Console.println("Usage: generateRandomSequenecs <modelName> <sequencesName> <numSessions> {<maxIter>}");
         }