X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftimeline%2FTimeline.java;h=be577cf19ab0d34f1dcc6ae7835af0ae07a2a52f;hb=c547387e5f20f021f7de11865037bf7ebd46e5e4;hp=2578a9befcbf5455d95daa012ab5a14c15430c95;hpb=9ea0dc9cec7c1fd6adba4bb3806e328470416bd9;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 2578a9be..be577cf1 100644
--- a/era.mi/src/era/mi/logic/timeline/Timeline.java
+++ b/era.mi/src/era/mi/logic/timeline/Timeline.java
@@ -39,6 +39,41 @@ public class Timeline
 		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()
 	{
@@ -103,4 +138,14 @@ public class Timeline
 	{
 		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