Changeset 524 for trunk/quest-ui-core/src/main/java/de/ugoe/cs/quest/ui/commands/CMDgenerateFixedLengthSequences.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/CMDgenerateFixedLengthSequences.java (modified) (2 diffs)

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

@@ -2 +2 @@
 
 import java.security.InvalidParameterException;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Random;
-import java.util.Set;
 
 import de.ugoe.cs.quest.CommandHelpers;
 import de.ugoe.cs.quest.eventcore.Event;
+import de.ugoe.cs.quest.testgeneration.DrawFromAllSequencesGenerator;
 import de.ugoe.cs.quest.ui.GlobalDataContainer;
 import de.ugoe.cs.quest.usageprofiles.IStochasticProcess;
@@ -71 +66 @@
                 }
                 model = (IStochasticProcess) dataObject;
-                Collection<List<? extends Event<?>>> sequences = new LinkedHashSet<List<? extends Event<?>>>();
-                for (int length = minLength; length <= maxLength; length++) {
-                        if( validEnd ) {
-                                sequences.addAll(model.generateValidSequences(length + 2));
-                        } else {
-                                sequences.addAll(model.generateSequences(length + 1, true));
-                        }
-                }
-                Console.traceln("" + sequences.size() + " possible");
-                if (!all && numSequences < sequences.size()) {
-                        List<Double> probabilities = new ArrayList<Double>(sequences.size());
-                        double probSum = 0.0;
-                        for (List<? extends Event<?>> sequence : sequences) {
-                                double prob = model.getProbability(sequence);
-                                probabilities.add(prob);
-                                probSum += prob;
-                        }
-                        Set<Integer> drawnSequences = new HashSet<Integer>(numSequences);
-                        Random r = new Random();
-                        while (drawnSequences.size() < numSequences) {
-                                double randVal = r.nextDouble() * probSum;
-                                double sum = 0.0d;
-                                int index = -1;
-                                while (sum < randVal) {
-                                        index++;
-                                        double currentProb = probabilities.get(index);
-                                        sum += currentProb;
-                                }
-                                if (!drawnSequences.contains(index)) {
-                                        drawnSequences.add(index);
-                                        probSum -= probabilities.get(index);
-                                        probabilities.set(index, 0.0d);
-                                }
-                        }
-                        Collection<List<? extends Event<?>>> retainedSequences = new LinkedList<List<? extends Event<?>>>();
-                        int index = 0;
-                        for (List<? extends Event<?>> sequence : sequences) {
-                                if (drawnSequences.contains(index)) {
-                                        retainedSequences.add(sequence);
-                                }
-                                index++;
-                        }
-                        sequences = retainedSequences;
-                }
+                DrawFromAllSequencesGenerator generator = new DrawFromAllSequencesGenerator(
+                                numSequences, minLength, maxLength, validEnd, all);
+                Collection<List<? extends Event<?>>> sequences = generator
+                                .generateTestSuite(model);
+
                 if (GlobalDataContainer.getInstance().addData(sequencesName, sequences)) {
                         CommandHelpers.dataOverwritten(sequencesName);