Changeset 391 for trunk/EventBenchCore/src/de

Timestamp:

03/08/12 09:11:15 (13 years ago)

Author:

sherbold

Message:

• modified de.ugoe.cs.eventbench.data.Event.equals(Object) such that targetEquals is always called, if the other object can equal the Event object. This simplifies pre-computing the equalities of de.ugoe.cs.eventbench.jfc.data.JFCEvents (project EventBenchConsole?) significantly.
• minor optimization of de.ugoe.cs.eventbench.models.TrieBasedModel?.randomSequence(int, boolean). Removed obsolete variable currentState.

Location:

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

Files:

• data/Event.java (modified) (1 diff)
• models/TrieBasedModel.java (modified) (2 diffs)

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

@@ -98 +98 @@
                         if (otherEvent.canEqual(this)) {
                                 if (type != null) {
-                                        return type.equals(otherEvent.type)
-                                                        && targetEquals(otherEvent.target);
+                                        return targetEquals(otherEvent.target)
+                                                        && type.equals(otherEvent.type);
                                 } else {
-                                        return otherEvent.type == null
-                                                        && targetEquals(otherEvent.target);
+                                        return targetEquals(otherEvent.target)
+                                                        && otherEvent.type == null;
                                 }
                         } else {

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

@@ -163 +163 @@
                                 context.add(Event.STARTEVENT);
 
-                                Event<?> currentState = Event.STARTEVENT;
-
                                 while (!endFound && sequence.size() < maxLength) {
                                         double randVal = r.nextDouble();
@@ -176 +174 @@
                                                                 // START or END
                                                                 context.add(symbol);
-                                                                currentState = symbol;
-                                                                sequence.add(currentState);
+                                                                sequence.add(symbol);
                                                         }
                                                         endFound = (symbol == Event.ENDEVENT)