Changeset 547 for trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/SequenceTools.java

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

File:

• trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/SequenceTools.java (modified) (5 diffs)

trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/SequenceTools.java

@@ -46 +46 @@
          * @return {@link Map} of weights
          */
-        public static Map<List<? extends Event<?>>, Double> generateWeights(
+        public static Map<List<Event>, Double> generateWeights(
                         IStochasticProcess process,
-                        Collection<List<? extends Event<?>>> sequences) {
-                Map<List<? extends Event<?>>, Double> subSeqWeights = new LinkedHashMap<List<? extends Event<?>>, Double>();
+                        Collection<List<Event>> sequences) {
+                Map<List<Event>, Double> subSeqWeights = new LinkedHashMap<List<Event>, Double>();
                 if (sequences != null && !sequences.isEmpty()) {
                         if (process != null) {
                                 double sum = 0.0;
-                                for (List<? extends Event<?>> sequence : sequences) {
+                                for (List<Event> sequence : sequences) {
                                         double prob = process.getProbability(sequence);
                                         subSeqWeights.put(sequence, prob);
@@ -59 +59 @@
                                 }
                                 if (sum < 1.0) {
-                                        for (Map.Entry<List<? extends Event<?>>, Double> entry : subSeqWeights
+                                        for (Map.Entry<List<Event>, Double> entry : subSeqWeights
                                                         .entrySet()) {
                                                 entry.setValue(entry.getValue() / sum);
@@ -65 +65 @@
                                 }
                         } else {
-                                for( List<? extends Event<?>> sequence : sequences ) {
+                                for( List<Event> sequence : sequences ) {
                                         subSeqWeights.put(sequence, 0.0d);
                                 }
@@ -114 +114 @@
          *             thrown if length less or equal to 0
          */
-        public static Set<List<? extends Event<?>>> containedSubSequences(
-                        Collection<List<? extends Event<?>>> sequences, int length) {
+        public static Set<List<Event>> containedSubSequences(
+                        Collection<List<Event>> sequences, int length) {
                 if (length <= 0) {
                         throw new InvalidParameterException(
                                         "length must be a positive integer");
                 }
-                Set<List<? extends Event<?>>> containedSubSeqs = new LinkedHashSet<List<? extends Event<?>>>();
+                Set<List<Event>> containedSubSeqs = new LinkedHashSet<List<Event>>();
                 if (sequences != null) {
-                        for (List<? extends Event<?>> sequence : sequences) {
-                                List<Event<?>> subSeq = new LinkedList<Event<?>>();
+                        for (List<Event> sequence : sequences) {
+                                List<Event> subSeq = new LinkedList<Event>();
                                 boolean minLengthReached = false;
-                                for (Event<?> event : sequence) {
+                                for (Event event : sequence) {
                                         subSeq.add(event);
                                         if (!minLengthReached) {
@@ -136 +136 @@
                                         if (minLengthReached) {
                                                 if (!containedSubSeqs.contains(subSeq)) {
-                                                        containedSubSeqs.add(new LinkedList<Event<?>>(
+                                                        containedSubSeqs.add(new LinkedList<Event>(
                                                                         subSeq));
                                                 }