Changeset 547 for trunk/quest-core-coverage/src/main/java/de/ugoe/cs/quest/coverage/CoverageCalculatorProcess.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/CoverageCalculatorProcess.java (modified) (7 diffs)

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

@@ -33 +33 @@
          * </p>
          */
-        private Collection<List<? extends Event<?>>> sequences;
+        private Collection<List<Event>> sequences;
 
         /**
@@ -48 +48 @@
          * </p>
          */
-        private Collection<List<? extends Event<?>>> containedSubSeqs = null;
+        private Collection<List<Event>> containedSubSeqs = null;
 
         /**
@@ -56 +56 @@
          * </p>
          */
-        private Collection<List<? extends Event<?>>> allPossibleSubSeqs = null;
+        private Collection<List<Event>> allPossibleSubSeqs = null;
 
         /**
@@ -64 +64 @@
          * </p>
          */
-        private Map<List<? extends Event<?>>, Double> subSeqWeights = null;
+        private Map<List<Event>, Double> subSeqWeights = null;
 
         /**
@@ -85 +85 @@
          */
         public CoverageCalculatorProcess(IStochasticProcess process,
-                        Collection<List<? extends Event<?>>> sequences, int length) {
+                        Collection<List<Event>> sequences, int length) {
                 if (process == null) {
                         throw new InvalidParameterException("process must not be null");
@@ -159 +159 @@
                 }
                 double weight = 0.0;
-                for (List<? extends Event<?>> subSeq : containedSubSeqs) {
+                for (List<Event> subSeq : containedSubSeqs) {
                         Double curWeight = subSeqWeights.get(subSeq);
                         if( curWeight!=null ) {
@@ -208 +208 @@
          *             thrown is newSequences is null
          */
-        public void setSequences(Collection<List<? extends Event<?>>> newSequences) {
+        public void setSequences(Collection<List<Event>> newSequences) {
                 if (newSequences == null) {
                         throw new InvalidParameterException("sequences must not be null");