X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftimeline%2FTimeline.java;h=8b3c3255416c65f2e36cba51653ddbdf46e169d1;hb=62bde086cd9895a0de2b0c3d242e546c263ea5a0;hp=bdd59476053b5165d2204c794465a74049515aa0;hpb=a4c5cfb856026771dfcf31eb22434b8b6ff20ad4;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 bdd59476..8b3c3255 100644
--- a/era.mi/src/era/mi/logic/timeline/Timeline.java
+++ b/era.mi/src/era/mi/logic/timeline/Timeline.java
@@ -15,7 +15,6 @@ public class Timeline
 	public Timeline(int initCapacity)
 	{
 		events = new PriorityQueue<InnerEvent>(initCapacity, (a, b) -> {
-			//Is this really necessary? If only ints are allowed as relative timing, the difference should always be an int
 			long difference = a.getTiming() - b.getTiming();
 			if(difference == 0)
 				return 0;
@@ -34,6 +33,47 @@ public class Timeline
 		currentTime = first.getTiming();
 		first.run();
 	}
+	
+	public void executeAll()
+	{
+		while (hasNext())
+			executeNext();
+	}
+	
+	/**
+	 * 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.
+	 * @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())
+		{
+			currentTime = timestamp;
+			return ExecutionResult.NOTHING_DONE;
+		}
+		int checkStop = 0;
+		InnerEvent first = events.peek();
+		while (first != null && first.getTiming() <= timestamp)
+		{
+			events.remove();
+			currentTime = first.getTiming();
+			first.run();
+			// Don't check after every run
+			checkStop = (checkStop + 1) % 10;
+			if (checkStop == 0 && System.currentTimeMillis() >= stopMillis)
+				return ExecutionResult.RAN_OUT_OF_TIME;
+			first = events.peek();
+		}
+		currentTime = timestamp;
+		return ExecutionResult.DONE_IN_TIME;
+	}
 
 	public long getSimulationTime()
 	{
@@ -86,5 +126,26 @@ public class Timeline
 			function.handle(event);
 		}
 		
+		@Override
+		public String toString()
+		{
+			return event.toString();
+		}
+	}
+	
+	@Override
+	public String toString()
+	{
+		return "simulation time: " + currentTime + ", " + events.toString();
+	}
+	
+	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
+	{
+		NOTHING_DONE, DONE_IN_TIME, RAN_OUT_OF_TIME 
 	}
 }
\ No newline at end of file