Changeset 331 for trunk

Timestamp:

12/19/11 14:24:13 (13 years ago)

Author:

sherbold

Message:

• improved Javadoc comments of de.ugoe.cs.eventbench.coverage.CoverageCalculatorObserved? and de.ugoe.cs.eventbench.coverage.CoverageCalculatorProcess?
• improved null-safety of de.ugoe.cs.eventbench.coverage.CoverageCalculatorObserved?.getCoverageNew(), getCoverageNewWeight(), and getCoverageObservedWeight()

Location:

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/coverage

Files:

• CoverageCalculatorObserved.java (modified) (8 diffs)
• CoverageCalculatorProcess.java (modified) (2 diffs)

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/coverage/CoverageCalculatorObserved.java

@@ -72 +72 @@
          *            length of the subsequences for which the coverage is analyzed;
          *            must be >0
+         * @throws InvalidParameterException
+         *             thrown if observedSequences or sequences is null or length
+         *             less than or equal to 0
          */
         public CoverageCalculatorObserved(
@@ -77 +80 @@
                         Collection<List<? extends Event<?>>> sequences, int length) {
                 if (observedSequences == null) {
-                        throw new InvalidParameterException("process must not be null");
+                        throw new InvalidParameterException(
+                                        "observed sequences must not be null");
                 }
                 if (sequences == null) {
@@ -162 +166 @@
          *            subsequences are possible
          * @return coverage percentage
+         * @throws InvalidParameterException
+         *             thrown if process is null
          */
         public double getCoveragePossibleNew(IStochasticProcess process) {
+                if (process == null) {
+                        throw new InvalidParameterException("process must not be null");
+                }
                 createSubSeqs();
                 Collection<List<? extends Event<?>>> subSeqsGeneratedCopy = new LinkedHashSet<List<? extends Event<?>>>(
@@ -187 +196 @@
          *            which subsequences are possible
          * @return coverage percentage
+         * @throws InvalidParameterException
+         *             thrown if process is null
          */
         public double getCoveragePossibleNewWeight(IStochasticProcess process) {
+                if (process == null) {
+                        throw new InvalidParameterException("process must not be null");
+                }
                 createSubSeqs();
                 Collection<List<? extends Event<?>>> subSeqsGeneratedCopy = new LinkedHashSet<List<? extends Event<?>>>(
@@ -200 +214 @@
                 double weight = 0.0d;
                 for (List<? extends Event<?>> subSeq : subSeqsGeneratedCopy) {
-                        weight += weightMap.get(subSeq);
+                        Double currentWeight = weightMap.get(subSeq);
+                        if( currentWeight!=null ) {
+                                weight += currentWeight;
+                        }
                 }
                 return weight;
         }
-        
+
         /**
          * <p>
          * Returns the number of covered subsequences of length k.
          * </p>
-         *  
+         * 
          * @return number of covered subsequences
          */
@@ -216 +233 @@
                 return subSeqsObserved.size();
         }
-        
+
         /**
          * <p>
          * Returns the number of covered subsequences of length k.
          * </p>
+         * 
          * @return number of covered subsequences
          */
@@ -227 +245 @@
                 return subSeqsGenerated.size();
         }
-        
+
         public int getNumNew() {
                 createSubSeqs();
@@ -235 +253 @@
                 return subSeqsGeneratedCopy.size();
         }
-        
 
         /**

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/coverage/CoverageCalculatorProcess.java

@@ -81 +81 @@
          *            length of the subsequences for which the coverage is analyzed;
          *            must be >0
+         * @throws InvalidParameterException
+         *             thrown if process or sequences is null or length less than or equal to 0
          */
         public CoverageCalculatorProcess(IStochasticProcess process,
@@ -200 +202 @@
          * @param newSequences
          *            new collection of sequences
+         * @throws InvalidParameterException
+         *             thrown is newSequences is null
          */
         public void setSequences(Collection<List<? extends Event<?>>> newSequences) {
+                if (newSequences == null) {
+                        throw new InvalidParameterException("sequences must not be null");
+                }
                 this.sequences = newSequences;
                 containedSubSeqs = null;