Changeset 361 for trunk/EventBenchCore

Timestamp:

01/27/12 14:42:36 (13 years ago)

Author:

sherbold

Message:

• implemented copy-constructors for de.ugoe.cs.eventbench.models.Trie/TrieNode?
• de.ugoe.cs.eventbench.ModelFlatterner? now handles high order markov models that are really first order markov models better (copies the internal trie directly)

Location:

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

Files:

• ModelFlattener.java (modified) (1 diff)
• Trie.java (modified) (3 diffs)
• TrieNode.java (modified) (2 diffs)

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

@@ -43 +43 @@
                         HighOrderMarkovModel model) {
                 int markovOrder = model.trieOrder - 1;
-                if (markovOrder == 1) {
-                        // TODO model is already FOM
-                        // requires copy constructor in class trie
-                }
-                firstOrderTrie = new Trie<Event<?>>();
-                TrieNode<Event<?>> rootNode = model.trie.find(null);
-                generateFirstOrderTrie(rootNode, new LinkedList<String>(), markovOrder);
-                firstOrderTrie.updateKnownSymbols();
-
                 FirstOrderMarkovModel firstOrderModel = new FirstOrderMarkovModel(
                                 new Random());
-                firstOrderModel.trie = firstOrderTrie;
                 firstOrderModel.trieOrder = 2;
+                if (markovOrder == 1) {
+                        firstOrderModel.trie = new Trie<Event<?>>(model.trie);
+                        firstOrderModel.trieOrder = 2;
+                } else {
+                        firstOrderTrie = new Trie<Event<?>>();
+                        TrieNode<Event<?>> rootNode = model.trie.find(null);
+                        generateFirstOrderTrie(rootNode, new LinkedList<String>(), markovOrder);
+                        firstOrderTrie.updateKnownSymbols();
+                        firstOrderModel.trie = firstOrderTrie;
+                }
 
                 return firstOrderModel;

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

@@ -2 +2 @@
 
 import java.io.Serializable;
+import java.security.InvalidParameterException;
 import java.util.Collection;
 import java.util.HashSet;
@@ -64 +65 @@
         /**
          * <p>
+         * Copy-Constructor. Creates a new Trie as the copy of other. The other trie
+         * must noch be null.
+         * </p>
+         * 
+         * @param other
+         *            Trie that is copied
+         */
+        public Trie(Trie<T> other) {
+                if (other == null) {
+                        throw new InvalidParameterException("other trie must not be null");
+                }
+                rootNode = new TrieNode<T>(other.rootNode);
+                knownSymbols = new LinkedHashSet<T>(other.knownSymbols);
+        }
+
+        /**
+         * <p>
          * Returns a collection of all symbols occuring in the trie.
          * </p>
@@ -251 +269 @@
         public List<T> getContextSuffix(List<T> context) {
                 List<T> contextSuffix;
-                if( context!=null ) {
+                if (context != null) {
                         contextSuffix = new LinkedList<T>(context); // defensive copy
                 } else {

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

@@ -78 +78 @@
          *            symbol associated with the trie node
          */
-        public TrieNode(T symbol) {
+        TrieNode(T symbol) {
                 if (symbol == null) {
                         throw new InvalidParameterException(
@@ -86 +86 @@
                 count = 0;
                 children = new LinkedList<TrieNode<T>>();
+        }
+
+        /**
+         * <p>
+         * Copy-Constructor. Creates a new TrieNode as copy of other. Other must not
+         * be null.
+         * </p>
+         * 
+         * @param other
+         */
+        TrieNode(TrieNode<T> other) {
+                if (other == null) {
+                        throw new InvalidParameterException("other must not be null");
+                }
+                symbol = other.symbol;
+                count = other.count;
+                children = new LinkedList<TrieNode<T>>();
+                for (TrieNode<T> child : other.children) {
+                        children.add(new TrieNode<T>(child));
+                }
         }