Changeset 524 for trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomSequences.java

Timestamp:

08/01/12 11:28:16 (12 years ago)

Author:

sherbold

Message:

• the commands generateFixedLengthSequences, generateHybrid, and generateRandomSequences now quest-core-testgeneration for the generation of test suites instead of local implementations.

File:

• trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomSequences.java (modified) (4 diffs)

trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateRandomSequences.java

@@ -2 +2 @@
 
 import java.security.InvalidParameterException;
-import java.util.HashSet;
+import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 import de.ugoe.cs.quest.CommandHelpers;
 import de.ugoe.cs.quest.eventcore.Event;
+import de.ugoe.cs.quest.testgeneration.RandomWalkGenerator;
 import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
@@ -28 +28 @@
          * @see de.ugoe.cs.util.console.Command#run(java.util.List)
          */
-        @SuppressWarnings("unchecked")
         @Override
         public void run(List<Object> parameters) {
@@ -67 +66 @@
                 }
                 model = (IStochasticProcess) dataObject;
-                Set<List<? extends Event<?>>> sequences = new HashSet<List<? extends Event<?>>>(
-                                numSessions);
-                long numIterations = 0;
-                while (sequences.size() < numSessions && numIterations < maxIter) {
-                        List<? extends Event<?>> generatedSequence = model.randomSequence(
-                                        maxLength, validEnd);
-                        if (generatedSequence.size() >= minLength
-                                        && generatedSequence.size() <= maxLength) {
-                                ((List<Event<?>>) generatedSequence).add(0, Event.STARTEVENT);
-                                if( validEnd ) {
-                                        ((List<Event<?>>) generatedSequence).add(Event.ENDEVENT);
-                                }
-                                sequences.add(generatedSequence);
-                        }
-                        numIterations++;
-                }
+
+                RandomWalkGenerator generator = new RandomWalkGenerator(numSessions,
+                                minLength, maxLength, validEnd, maxIter);
+                Collection<List<? extends Event<?>>> sequences = generator
+                                .generateTestSuite(model);
+
                 if (sequences.size() < numSessions) {
                         Console.println("Only " + sequences.size()
@@ -88 +77 @@
                                         + " iterations");
                 }
+
                 if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {
                         CommandHelpers.dataOverwritten(sequencesName);