Changeset 118

Timestamp:

07/12/11 16:52:27 (13 years ago)

Author:

sherbold

Message:

+ extended de.ugoe.cs.eventbench.models.IStochasticProcess with getProbability() for a sequence

• refactored de.ugoe.cs.eventbench.coverage.CoverageCalculator? to use IStochasticProcess#getProbability(sequences)

Location:

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

Files:

• coverage/CoverageCalculator.java (modified) (1 diff)
• models/IStochasticProcess.java (modified) (1 diff)
• models/TrieBasedModel.java (modified) (2 diffs)

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

@@ -178 +178 @@
                 double sum = 0.0;
                 for (List<? extends Event<?>> sequence : sequences) {
-                        double prob = 1.0;
-                        List<Event<?>> context = new LinkedList<Event<?>>();
-                        for (Event<?> event : sequence) {
-                                prob *= process.getProbability(context, event);
-                                context.add(event);
-                        }
+                        double prob = process.getProbability(sequence);
                         subSeqWeights.put(sequence, prob);
                         sum += prob;

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/IStochasticProcess.java

@@ -32 +32 @@
          */
         double getProbability(List<? extends Event<?>> context, Event<?> symbol);
+        
+        /**
+         * <p>
+         * Returns the probabilitiy that a given sequence is generated by the stochastic process.
+         * </p>
+         * @param sequence sequences of which the probability is calculated
+         * @return probability of the sequences; 1.0 if sequence is empty or null
+         */
+        double getProbability(List<? extends Event<?>> sequence);
 
         /**

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/models/TrieBasedModel.java

@@ -274 +274 @@
          */
         @Override
-        public Collection<List<? extends Event<?>>> generateValidSequences(int length) {
+        public Collection<List<? extends Event<?>>> generateValidSequences(
+                        int length) {
                 // check for min-length implicitly done by generateSequences
-                Collection<List<? extends Event<?>>> allSequences = generateSequences(length,
-                                true);
+                Collection<List<? extends Event<?>>> allSequences = generateSequences(
+                                length, true);
                 Collection<List<? extends Event<?>>> validSequences = new LinkedHashSet<List<? extends Event<?>>>();
                 for (List<? extends Event<?>> sequence : allSequences) {
@@ -288 +289 @@
         }
 
+        /*
+         * (non-Javadoc)
+         * 
+         * @see
+         * de.ugoe.cs.eventbench.models.IStochasticProcess#getProbability(java.util
+         * .List)
+         */
+        @Override
+        public double getProbability(List<? extends Event<?>> sequence) {
+                double prob = 1.0;
+                if (sequence != null) {
+                        List<Event<?>> context = new LinkedList<Event<?>>();
+                        for (Event<?> event : sequence) {
+                                prob *= getProbability(context, event);
+                                context.add(event);
+                        }
+                }
+                return prob;
+        }
+
 }