Added GUITest, ManualSwitch and one method to Timeline

[Mograsim.git] / era.mi / src / era / mi / logic / timeline / Timeline.java

diff --git a/era.mi/src/era/mi/logic/timeline/Timeline.java b/era.mi/src/era/mi/logic/timeline/Timeline.java
index 186e946..be577cf 100644 (file)
--- 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())\r
                        executeNext();\r
        }\r
+       \r
+       /**\r
+        * Executes all events up to a given simulation timestamp. The simulation\r
+        * process can be constrained by a real world timestamp.\r
+        * \r
+        * @param timestamp  the simulation timestamp up to which the events will be\r
+        *                   processed\r
+        * @param stopMillis the System.currentTimeMillis() when simulation definitely\r
+        *                   needs to stop.\r
+        * @return if it was possible to fulfil the goal in the given real world time.\r
+        * @author Christian Femers\r
+        */\r
+       public ExecutionResult executeUpTo(long timestamp, long stopMillis)\r
+       {\r
+               if (events.isEmpty())\r
+               {\r
+                       currentTime = timestamp;\r
+                       return ExecutionResult.NOTHING_DONE;\r
+               }\r
+               int checkStop = 0;\r
+               InnerEvent first = events.peek();\r
+               while (first != null && first.getTiming() <= timestamp)\r
+               {\r
+                       events.remove();\r
+                       currentTime = first.getTiming();\r
+                       first.run();\r
+                       // Don't check after every run\r
+                       checkStop = (checkStop + 1) % 10;\r
+                       if (checkStop == 0 && System.currentTimeMillis() >= stopMillis)\r
+                               return ExecutionResult.RAN_OUT_OF_TIME;\r
+                       first = events.peek();\r
+               }\r
+               currentTime = timestamp;\r
+               return ExecutionResult.DONE_IN_TIME;\r
+       }\r
 \r
        public long getSimulationTime()\r
        {\r
@@ -108,4 +143,9 @@ public class Timeline
        {\r
                return ticks; //TODO: Alter this when it has been determined how ticks should relate to real time.\r
        }\r
+       \r
+       public enum ExecutionResult\r
+       {\r
+               NOTHING_DONE, DONE_IN_TIME, RAN_OUT_OF_TIME \r
+       }\r
 }
\ No newline at end of file