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

trunk/quest-core-usageprofiles/src/main/java/de/ugoe/cs/quest/usageprofiles/ModelFlattener.java

@@ -27 +27 @@
         private static final String EVENT_SEPARATOR = "-=-";
 
-        Trie<Event<?>> firstOrderTrie;
+        Trie<Event> firstOrderTrie;
 
         /**
@@ -47 +47 @@
                 firstOrderModel.trieOrder = 2;
                 if (markovOrder == 1) {
-                        firstOrderModel.trie = new Trie<Event<?>>(model.trie);
+                        firstOrderModel.trie = new Trie<Event>(model.trie);
                         firstOrderModel.trieOrder = 2;
                 } else {
-                        firstOrderTrie = new Trie<Event<?>>();
-                        TrieNode<Event<?>> rootNode = model.trie.find(null);
+                        firstOrderTrie = new Trie<Event>();
+                        TrieNode<Event> rootNode = model.trie.find(null);
                         generateFirstOrderTrie(rootNode, new LinkedList<String>(), markovOrder);
                         firstOrderTrie.updateKnownSymbols();
@@ -98 +98 @@
          *            depth to go - NOT the current depth.
          */
-        private void generateFirstOrderTrie(TrieNode<Event<?>> currentNode,
+        private void generateFirstOrderTrie(TrieNode<Event> currentNode,
                         List<String> parentIDs, int depth) {
-                for (TrieNode<Event<?>> child : currentNode.getChildren()) {
+                for (TrieNode<Event> child : currentNode.getChildren()) {
                         String currentId = child.getSymbol().getStandardId();
                         if (depth > 1) {
@@ -113 +113 @@
                                 }
                                 firstOrderID.append(currentId);
-                                TrieNode<Event<?>> firstOrderNode = firstOrderTrie
+                                TrieNode<Event> firstOrderNode = firstOrderTrie
                                                 .getChildCreate(new Event<Object>(firstOrderID
                                                                 .toString()));
                                 firstOrderNode.setCount(child.getCount());
-                                for (TrieNode<Event<?>> transitionChild : child.getChildren()) {
+                                for (TrieNode<Event> transitionChild : child.getChildren()) {
                                         StringBuilder transitionID = new StringBuilder();
                                         for (String parentID : parentIDs.subList(1,
@@ -126 +126 @@
                                         transitionID.append(transitionChild.getSymbol()
                                                         .getStandardId());
-                                        TrieNode<Event<?>> firstOrderTransitionChild = firstOrderNode
+                                        TrieNode<Event> firstOrderTransitionChild = firstOrderNode
                                                         .getChildCreate(new Event<Object>(transitionID
                                                                         .toString()));