Changeset 248 for trunk/EventBenchCore

Timestamp:

10/06/11 19:07:39 (13 years ago)

Author:

sherbold

Message:

• added method getNumTransitions to interface de.ugoe.cs.eventbench.models.IStochasticProcess and implemented it in implementing classes

Location:

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

Files:

• IStochasticProcess.java (modified) (4 diffs)
• Trie.java (modified) (1 diff)
• TrieBasedModel.java (modified) (1 diff)
• TrieNode.java (modified) (1 diff)

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.
+         * Returns the probabilitiy that a given sequence is generated by the
+         * stochastic process.
          * </p>
-         * @param sequence sequences of which the probability is calculated
+         * 
+         * @param sequence
+         *            sequences of which the probability is calculated
          * @return probability of the sequences; 1.0 if sequence is empty or null
          */
@@ -97 +100 @@
          * @return generated sequences
          */
-        public Collection<List<? extends Event<?>>> generateValidSequences(int length);
+        public Collection<List<? extends Event<?>>> generateValidSequences(
+                        int length);
 
         /**
@@ -117 +121 @@
          */
         public String[] getSymbolStrings();
-        
+
         /**
          * <p>
-         * Returns the number of states the process would have if it would be flattened through state-splitting to a first-order Markov model.
+         * Returns the number of states the process would have if it would be
+         * flattened through state-splitting to a first-order Markov model.
          * </p>
          * <p>
@@ -126 +131 @@
          * </p>
          * 
-         * @return number of states an equivalent FOM would have; -1 is not available
+         * @return number of states an equivalent FOM would have; -1 if not
+         *         available
          */
         public int getNumFOMStates();
+
+        /**
+         * <p>
+         * Returns the number of transitions the process would have if it would be
+         * flattened through state-splitting to a first-order Markov model.
+         * </p>
+         * 
+         * @return number of transitions an equivalent FOM would have; -1 if not
+         *         available
+         */
+        public int getNumTransitions();
 
         /**

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

@@ -386 +386 @@
                 return ancestors.size();
         }
+
+        /**
+         * <p>
+         * Returns the number of trie nodes that are leafs.
+         * </p>
+         * 
+         * @return number of leafs in the trie
+         */
+        public int getNumLeafs() {
+                return rootNode.getNumLeafs();
+        }
 }

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

@@ -336 +336 @@
                 return trie.getNumLeafAncestors();
         }
+
+        /*
+         * (non-Javadoc)
+         * 
+         * @see de.ugoe.cs.eventbench.models.IStochasticProcess#getNumTransitions()
+         */
+        @Override
+        public int getNumTransitions() {
+                return trie.getNumLeafs();
+        }
 }

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

@@ -318 +318 @@
                 }
         }
+        
+        /**
+         * <p>Returns the number of descendants of this node that are leafs. This does not only include direct children of this node, but all leafs in the sub-trie with this node as root.
+         * </p>
+         * @return
+         */
+        protected int getNumLeafs() {
+                int numLeafs = 0;
+                for( TrieNode<T> child : children) {
+                        if( child.isLeaf() ) {
+                                numLeafs++;
+                        } else {
+                                numLeafs += child.getNumLeafs();
+                        }
+                }
+                return numLeafs;
+        }
 }