Changeset 553 for trunk/quest-core-usageprofiles/src

Timestamp:

08/16/12 16:08:48 (12 years ago)

Author:

sherbold

Message:

• countless adaptations throughout nearly all components to remove errors introduced due to the refactoring of the event core
• added StringEventType? as a simple-to-use event type instead of DummyEventType?

Location:

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

Files:

• FirstOrderMarkovModel.java (modified) (4 diffs)
• ModelFlattener.java (modified) (4 diffs)

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

@@ -103 +103 @@
                 List<Integer> endIndexList = new LinkedList<Integer>();
                 for( int i=0 ; i<knownSymbols.size() ; i++ ) {
-                        String id = knownSymbols.get(i).getStandardId();
-                        if( id.equals(Event.STARTEVENT.getStandardId()) || id.contains(Event.STARTEVENT.getStandardId()+"-=-") ) {
+                        String id = knownSymbols.get(i).getId();
+                        if( id.equals(Event.STARTEVENT.getId()) || id.contains(Event.STARTEVENT.getId()+"-=-") ) {
                                 startIndexList.add(i);
                         }
-                        if( id.equals(Event.ENDEVENT.getStandardId()) || id.contains("-=-"+Event.ENDEVENT.getStandardId()) ) {
+                        if( id.equals(Event.ENDEVENT.getId()) || id.contains("-=-"+Event.ENDEVENT.getId()) ) {
                                 endIndexList.add(i);
                         }
@@ -176 +176 @@
                                 trie.getKnownSymbols());
                 for (Event symbol : knownSymbols) {
-                        final String thisSaneId = symbol.getShortId().replace("\"", "\\\"")
+                        final String thisSaneId = symbol.getId().replace("\"", "\\\"")
                                         .replaceAll("[\r\n]", "");
                         stringBuilder.append(" " + knownSymbols.indexOf(symbol) + " [label=\""
@@ -210 +210 @@
 
                 for (Event symbol : knownSymbols) {
-                        String from = symbol.getShortId();
+                        String from = symbol.getId();
                         List<Event> context = new ArrayList<Event>();
                         context.add(symbol);
@@ -217 +217 @@
 
                         for (Event follower : followers) {
-                                String to = follower.getShortId();
+                                String to = follower.getId();
                                 MarkovEdge prob = new MarkovEdge(getProbability(context,
                                                 follower));

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

@@ -6 +6 @@
 
 import de.ugoe.cs.quest.eventcore.Event;
-import de.ugoe.cs.quest.eventcore.ReplayableEvent;
+import de.ugoe.cs.quest.eventcore.StringEventType;
 
 /**
@@ -101 +101 @@
                         List<String> parentIDs, int depth) {
                 for (TrieNode<Event> child : currentNode.getChildren()) {
-                        String currentId = child.getSymbol().getStandardId();
+                        String currentId = child.getSymbol().getId();
                         if (depth > 1) {
                                 List<String> childParentIDs = new LinkedList<String>(parentIDs);
@@ -114 +114 @@
                                 firstOrderID.append(currentId);
                                 TrieNode<Event> firstOrderNode = firstOrderTrie
-                                                .getChildCreate(new Event<Object>(firstOrderID
-                                                                .toString()));
+                                                .getChildCreate(new Event(new StringEventType(firstOrderID
+                                                                .toString())));
                                 firstOrderNode.setCount(child.getCount());
                                 for (TrieNode<Event> transitionChild : child.getChildren()) {
@@ -125 +125 @@
                                         transitionID.append(currentId + EVENT_SEPARATOR);
                                         transitionID.append(transitionChild.getSymbol()
-                                                        .getStandardId());
+                                                        .getId());
                                         TrieNode<Event> firstOrderTransitionChild = firstOrderNode
-                                                        .getChildCreate(new Event<Object>(transitionID
-                                                                        .toString()));
+                                                        .getChildCreate(new Event(new StringEventType(transitionID
+                                                                        .toString())));
                                         firstOrderTransitionChild.setCount(transitionChild
                                                         .getCount());