X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftimeline%2FTimeline.java;h=88aa1976fb05b263de531b9951cf9b5a8023b80c;hb=23822f3ac39fa0ebd7e74b8c5fee2cd40415b05c;hp=7030310b4621b524a94f85ad24300d1b5a211d36;hpb=74aebd92f41d03f4a44c9a455ef8c05465136412;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/timeline/Timeline.java b/era.mi/src/era/mi/logic/timeline/Timeline.java
index 7030310b..88aa1976 100644
--- a/era.mi/src/era/mi/logic/timeline/Timeline.java
+++ b/era.mi/src/era/mi/logic/timeline/Timeline.java
@@ -11,34 +11,34 @@ import java.util.function.Consumer;
  * @author Fabian Stemmler
  *
  */
-public class Timeline {
+public class Timeline
+{
 	private PriorityQueue<InnerEvent> events;
 	private long currentTime = 0;
 
 	private final List<Consumer<TimelineEvent>> eventAddedListener;
 
-	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;
-		});
+	public Timeline(int initCapacity)
+	{
+		events = new PriorityQueue<InnerEvent>(initCapacity);
 
 		eventAddedListener = new ArrayList<>();
 	}
 
-	public boolean hasNext() {
+	public boolean hasNext()
+	{
 		return !events.isEmpty();
 	}
 
-	public void executeNext() {
-		InnerEvent first = events.poll();
-		currentTime = first.getTiming();
-		first.run();
+	public void executeNext()
+	{
+		InnerEvent first = events.peek();
+		if (first != null)
+			executeUpTo(first.getTiming(), -1);
 	}
 
-	public void executeAll() {
+	public void executeAll()
+	{
 		while (hasNext())
 			executeNext();
 	}
@@ -47,18 +47,21 @@ public class Timeline {
 	 * Executes all events up to a given simulation timestamp. The simulation process can be constrained by a real world timestamp.
 	 * 
 	 * @param timestamp  the simulation timestamp up to which the events will be processed
-	 * @param stopMillis the System.currentTimeMillis() when simulation definitely needs to stop.
+	 * @param stopMillis the System.currentTimeMillis() when simulation definitely needs to stop. A value of -1 means no timeout.
 	 * @return if it was possible to fulfil the goal in the given real world time.
 	 * @author Christian Femers
 	 */
-	public ExecutionResult executeUpTo(long timestamp, long stopMillis) {
-		if (events.isEmpty()) {
+	public ExecutionResult executeUpTo(long timestamp, long stopMillis)
+	{
+		if (events.isEmpty())
+		{
 			currentTime = timestamp;
 			return ExecutionResult.NOTHING_DONE;
 		}
 		int checkStop = 0;
 		InnerEvent first = events.peek();
-		while (first != null && first.getTiming() <= timestamp) {
+		while (first != null && first.getTiming() <= timestamp)
+		{
 			events.remove();
 			currentTime = first.getTiming();
 			first.run();
@@ -72,27 +75,31 @@ public class Timeline {
 		return ExecutionResult.DONE_IN_TIME;
 	}
 
-	public long getSimulationTime() {
+	public long getSimulationTime()
+	{
 		return currentTime;
 	}
 
-	public long nextEventTime() {
+	public long nextEventTime()
+	{
 		if (!hasNext())
 			return -1;
-		else
-			return events.peek().timing;
+		return events.peek().getTiming();
 	}
 
-	public void reset() {
+	public void reset()
+	{
 		events.clear();
 		currentTime = 0;
 	}
 
-	public void addEventAddedListener(Consumer<TimelineEvent> listener) {
+	public void addEventAddedListener(Consumer<TimelineEvent> listener)
+	{
 		eventAddedListener.add(listener);
 	}
 
-	public void removeEventAddedListener(Consumer<TimelineEvent> listener) {
+	public void removeEventAddedListener(Consumer<TimelineEvent> listener)
+	{
 		eventAddedListener.remove(listener);
 	}
 
@@ -102,16 +109,16 @@ public class Timeline {
 	 * @param function       The {@link TimelineEventHandler} that will be executed, when the {@link InnerEvent} occurs on the timeline.
 	 * @param relativeTiming The amount of MI ticks in which the {@link InnerEvent} is called, starting from the current time.
 	 */
-	public void addEvent(TimelineEventHandler function, int relativeTiming) {
+	public void addEvent(TimelineEventHandler function, int relativeTiming)
+	{
 		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 final long timing;
+	private class InnerEvent implements Runnable, Comparable<InnerEvent>
+	{
 		private final TimelineEventHandler function;
 		private final TimelineEvent event;
 
@@ -121,36 +128,52 @@ 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;
+		public long getTiming()
+		{
+			return event.getTiming();
 		}
 
-		public void run() {
+		@Override
+		public void run()
+		{
 			function.handle(event);
 		}
 
 		@Override
-		public String toString() {
+		public String toString()
+		{
 			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
-	public String toString() {
+	public String toString()
+	{
 		return "simulation time: " + currentTime + ", " + events.toString();
 	}
 
-	public static long toNanoseconds(long ticks) {
+	public static long toNanoseconds(long ticks)
+	{
 		return ticks; // TODO: Alter this when it has been determined how ticks should relate to real time.
 	}
 
-	public enum ExecutionResult {
+	public enum ExecutionResult
+	{
 		NOTHING_DONE, DONE_IN_TIME, RAN_OUT_OF_TIME
 	}
 }
\ No newline at end of file