From: Christian Femers <femers@in.tum.de>
Date: Wed, 22 May 2019 16:43:23 +0000 (+0200)
Subject: Removed redundant timing in InnerEvent and made it Comparable
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=412920c08f2adf3550b2b5b6bb55241e4e39d918;p=Mograsim.git

Removed redundant timing in InnerEvent and made it Comparable
---

diff --git a/era.mi/src/era/mi/logic/timeline/Timeline.java b/era.mi/src/era/mi/logic/timeline/Timeline.java
index 48b0f958..07467eaf 100644
--- a/era.mi/src/era/mi/logic/timeline/Timeline.java
+++ b/era.mi/src/era/mi/logic/timeline/Timeline.java
@@ -20,13 +20,7 @@ public class Timeline
 
 	public Timeline(int initCapacity)
 	{
-		events = new PriorityQueue<InnerEvent>(initCapacity, (a, b) ->
-		{
-			long difference = a.getTiming() - b.getTiming();
-			if (difference == 0)
-				return 0;
-			return difference < 0 ? -1 : 1;
-		});
+		events = new PriorityQueue<InnerEvent>(initCapacity);
 
 		eventAddedListener = new ArrayList<>();
 	}
@@ -90,7 +84,7 @@ public class Timeline
 	{
 		if (!hasNext())
 			return -1;
-		return events.peek().timing;
+		return events.peek().getTiming();
 	}
 
 	public void reset()
@@ -119,14 +113,12 @@ public class Timeline
 	{
 		long timing = currentTime + relativeTiming;
 		TimelineEvent event = new TimelineEvent(timing);
-		events.add(new InnerEvent(function, event, timing));
+		events.add(new InnerEvent(function, event));
 		eventAddedListener.forEach(l -> l.accept(event));
 	}
 
-	private class InnerEvent
+	private class InnerEvent implements Comparable<InnerEvent>
 	{
-
-		final long timing;
 		private final TimelineEventHandler function;
 		private final TimelineEvent event;
 
@@ -136,16 +128,15 @@ public class Timeline
 		 * @param function {@link TimelineEventHandler} to be executed when the {@link InnerEvent} occurs
 		 * @param timing   Point in the MI simulation {@link Timeline}, at which the {@link InnerEvent} is executed;
 		 */
-		InnerEvent(TimelineEventHandler function, TimelineEvent event, long timing)
+		InnerEvent(TimelineEventHandler function, TimelineEvent event)
 		{
 			this.function = function;
 			this.event = event;
-			this.timing = timing;
 		}
 
 		public long getTiming()
 		{
-			return timing;
+			return event.getTiming();
 		}
 
 		public void run()
@@ -158,6 +149,15 @@ public class Timeline
 		{
 			return event.toString();
 		}
+
+		@Override
+		public int compareTo(InnerEvent o)
+		{
+			long difference = getTiming() - o.getTiming();
+			if (difference == 0)
+				return 0;
+			return difference < 0 ? -1 : 1;
+		}
 	}
 
 	@Override