Changeset 547 for trunk/quest-core-testgeneration/src/main

Timestamp:

08/16/12 12:34:24 (12 years ago)

Author:

sherbold

Message:

• countless adaptations throughout nearly all components to remove errors introduced due to the refactoring of the event core

Location:

trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration

Files:

• DrawFromAllSequencesGenerator.java (modified) (4 diffs)
• HybridGenerator.java (modified) (5 diffs)
• RandomWalkGenerator.java (modified) (2 diffs)

trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/DrawFromAllSequencesGenerator.java

@@ -127 +127 @@
          * @return the test suite
          */
-        public Collection<List<? extends Event<?>>> generateTestSuite(
+        public Collection<List<Event>> generateTestSuite(
                         IStochasticProcess model) {
                 if (model == null) {
@@ -133 +133 @@
                 }
 
-                Collection<List<? extends Event<?>>> sequences = new LinkedHashSet<List<? extends Event<?>>>();
+                Collection<List<Event>> sequences = new LinkedHashSet<List<Event>>();
                 for (int length = minLength; length <= maxLength; length++) {
                         if (validEnd) {
@@ -145 +145 @@
                         List<Double> probabilities = new ArrayList<Double>(sequences.size());
                         double probSum = 0.0;
-                        for (List<? extends Event<?>> sequence : sequences) {
+                        for (List<Event> sequence : sequences) {
                                 double prob = model.getProbability(sequence);
                                 probabilities.add(prob);
@@ -167 +167 @@
                                 }
                         }
-                        Collection<List<? extends Event<?>>> retainedSequences = new LinkedList<List<? extends Event<?>>>();
+                        Collection<List<Event>> retainedSequences = new LinkedList<List<Event>>();
                         int index = 0;
-                        for (List<? extends Event<?>> sequence : sequences) {
+                        for (List<Event> sequence : sequences) {
                                 if (drawnSequences.contains(index)) {
                                         retainedSequences.add(sequence);

trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/HybridGenerator.java

@@ -107 +107 @@
          * @return the test suite
          */
-        public Collection<List<? extends Event<?>>> generateTestSuite(
+        public Collection<List<Event>> generateTestSuite(
                         IStochasticProcess model) {
                 if (model == null) {
@@ -113 +113 @@
                 }
                 
-                Collection<List<? extends Event<?>>> sequences = new LinkedHashSet<List<? extends Event<?>>>();
-
-                List<List<? extends Event<?>>> seqsTmp = new ArrayList<List<? extends Event<?>>>(
+                Collection<List<Event>> sequences = new LinkedHashSet<List<Event>>();
+
+                List<List<Event>> seqsTmp = new ArrayList<List<Event>>(
                                 model.generateSequences(maxLengthAll + 1, true));
 
@@ -122 +122 @@
                 List<Double> probabilities = new ArrayList<Double>(seqsTmp.size());
                 double probSum = 0.0;
-                for (List<? extends Event<?>> sequence : seqsTmp) {
+                for (List<Event> sequence : seqsTmp) {
                         double prob = model.getProbability(sequence);
                         probabilities.add(prob);
@@ -140 +140 @@
                                 sum += currentProb;
                         }
-                        List<? extends Event<?>> seqTmp = seqsTmp.get(index);
+                        List<Event> seqTmp = seqsTmp.get(index);
                         if (!Event.ENDEVENT.equals(seqTmp.get(seqTmp.size() - 1))) {
-                                List<? extends Event<?>> sequence;
+                                List<Event> sequence;
                                 if (validEnd) {
                                         sequence = finishSequence(seqTmp, model, length + 2,
@@ -180 +180 @@
          * @return finished sequence of the desired length
          */
-        private List<? extends Event<?>> finishSequence(
-                        List<? extends Event<?>> sequence, IStochasticProcess model,
+        private List<Event> finishSequence(
+                        List<Event> sequence, IStochasticProcess model,
                         int length, boolean validEnd) {
                 Random r = new Random();
                 boolean endFound = false;
-                List<Event<?>> sequenceCopy = new LinkedList<Event<?>>(sequence);
+                List<Event> sequenceCopy = new LinkedList<Event>(sequence);
                 final int maxIter = 30000;
                 int iter = 0;
                 while (!endFound && iter < maxIter) {
                         iter++;
-                        sequenceCopy = new LinkedList<Event<?>>(sequence);
+                        sequenceCopy = new LinkedList<Event>(sequence);
                         while (!endFound && sequenceCopy.size() <= length) {
                                 double randVal = r.nextDouble();
                                 double probSum = 0.0;
-                                for (Event<?> symbol : model.getEvents()) {
+                                for (Event symbol : model.getEvents()) {
                                         probSum += model.getProbability(sequenceCopy, symbol);
                                         if (probSum >= randVal) {

trunk/quest-core-testgeneration/src/main/java/de/ugoe/cs/quest/testgeneration/RandomWalkGenerator.java

@@ -138 +138 @@
          * @return the test suite
          */
-        @SuppressWarnings("unchecked")
-        public Collection<List<? extends Event<?>>> generateTestSuite(
+        public Collection<List<Event>> generateTestSuite(
                         IStochasticProcess model) {
                 if (model == null) {
@@ -145 +144 @@
                 }
 
-                Set<List<? extends Event<?>>> sequences = new HashSet<List<? extends Event<?>>>(
+                Set<List<Event>> sequences = new HashSet<List<Event>>(
                                 numSequences);
                 actualIter = 0;
                 while (sequences.size() < numSequences && actualIter < maxIter) {
-                        List<? extends Event<?>> generatedSequence = model.randomSequence(
+                        List<Event> generatedSequence = model.randomSequence(
                                         maxLength, validEnd);
                         if (generatedSequence.size() >= minLength
                                         && generatedSequence.size() <= maxLength) {
-                                ((List<Event<?>>) generatedSequence).add(0, Event.STARTEVENT);
+                                ((List<Event>) generatedSequence).add(0, Event.STARTEVENT);
                                 if (validEnd) {
-                                        ((List<Event<?>>) generatedSequence).add(Event.ENDEVENT);
+                                        ((List<Event>) generatedSequence).add(Event.ENDEVENT);
                                 }
                                 sequences.add(generatedSequence);