Changeset 12 for trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/Event.java

Timestamp:

04/13/11 15:53:14 (13 years ago)

Author:

sherbold

Message:

+ added class TrieBasedModel? as base class for all usage models that calculate probabilities based on a trie
+ extracted everything except the probability calculation from PPM to TrieBasedModel?
+ added HighOrderMarkovModel? based on TrieBasedModel?

File:

• trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/Event.java (modified) (4 diffs)

trunk/EventBenchCore/src/de/ugoe/cs/eventbench/data/Event.java

@@ -1 +1 @@
 package de.ugoe.cs.eventbench.data;
+
+import java.security.InvalidParameterException;
 
 
@@ -32 +34 @@
         
         public Event(String type) {
+                if( type==null ) {
+                        throw new InvalidParameterException("Event type must not be null");
+                }
                 this.type = type;
         }
@@ -41 +46 @@
                 }
                 if (other instanceof Event<?>) {
-                        Event<?> otherToken = (Event<?>) other;
-                        return otherToken.type.equals(this.type)
-                                        && otherToken.target.equals(this.target);
+                        Event<?> otherEvent = (Event<?>) other;
+                        if( target!=null ) {
+                                return type.equals(otherEvent.type)
+                                        && target.equals(otherEvent.target);
+                        } else {
+                                return type.equals(otherEvent.type)
+                                        && target==otherEvent.target;
+                        }
                 } else {
                         return false;
@@ -70 +80 @@
 
         public String getStandardId() {
-                String id = target + "." + getType();
+                String id = "";
+                if( target!=null ) {
+                        id += target + ".";
+                }
+                id += getType();
                 if ( idInfo!="" ) {
                         id += "." + idInfo;