<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10">
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="module" value="true"/>
</attributes>
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=10
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=10
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
Bundle-SymbolicName: LogicUI;singleton:=true
Bundle-Version: 1.0.0
Export-Package: era.mi.gui,
+ era.mi.gui.components,
era.mi.gui.examples,
- era.mi.gui.model,
- era.mi.gui.model.components,
- era.mi.gui.model.wires,
- era.mi.gui.modeladapter
-Bundle-RequiredExecutionEnvironment: JavaSE-10
+ era.mi.gui.wires
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.swt;bundle-version="3.110.0",
SWTZoomableCanvas;bundle-version="1.0.0";visibility:=reexport,
era.mi;bundle-version="1.0.0";visibility:=reexport
--- /dev/null
+package era.mi.gui.examples;
+
+import era.mi.gui.LogicUICanvas;
+import era.mi.gui.LogicUIStandalone;
+import era.mi.gui.components.GUIManualSwitch;
+import era.mi.gui.components.GUINotGate;
+import era.mi.gui.components.GUIOrGateOld;
+import era.mi.gui.wires.WireConnectionPoint;
+import era.mi.logic.timeline.Timeline;
+import era.mi.logic.wires.Wire;
+import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
+
+public class RSLatchGUIExample
+{
+ private static final int WIRE_DELAY = 10;
+ private static final int OR_DELAY = 50;
+ private static final int NOT_DELAY = 50;
+
+ public static void main(String[] args)
+ {
+ Timeline t = new Timeline(11);
+ t.setTimeFunction(() -> System.currentTimeMillis()); // real time simulation
+ LogicUIStandalone ui = new LogicUIStandalone(t);
+ addComponentsAndWires(ui.getLogicUICanvas(), t);
+ ui.run();
+ }
+
+ public static void addComponentsAndWires(LogicUICanvas ui, Timeline t)
+ {
+ Wire r = new Wire(t, 1, WIRE_DELAY);
+ Wire s = new Wire(t, 1, WIRE_DELAY);
+ Wire t2 = new Wire(t, 1, WIRE_DELAY);
+ Wire t1 = new Wire(t, 1, WIRE_DELAY);
+ Wire q = new Wire(t, 1, WIRE_DELAY);
+ Wire nq = new Wire(t, 1, WIRE_DELAY);
+
+ GUIManualSwitch rIn = ui.addComponent(new GUIManualSwitch(t, r.createReadWriteEnd()), 100, 100);
+ GUIManualSwitch sIn = ui.addComponent(new GUIManualSwitch(t, s.createReadWriteEnd()), 100, 200);
+ GUIOrGateOld or1 = ui.addComponent(new GUIOrGateOld(t, OR_DELAY, t1.createReadWriteEnd(), r.createReadOnlyEnd(), nq.createReadOnlyEnd()),
+ 160, 102.5);
+ GUIOrGateOld or2 = ui.addComponent(new GUIOrGateOld(t, OR_DELAY, t2.createReadWriteEnd(), q.createReadOnlyEnd(), s.createReadOnlyEnd()),
+ 160, 192.5);
+ GUINotGate not1 = ui.addComponent(new GUINotGate(t, NOT_DELAY, t1.createReadOnlyEnd(), q.createReadWriteEnd()), 200, 107.5);
+ GUINotGate not2 = ui.addComponent(new GUINotGate(t, NOT_DELAY, t2.createReadOnlyEnd(), nq.createReadWriteEnd()), 200, 197.5);
+
+ WireConnectionPoint p1 = ui.addComponent(new WireConnectionPoint(q, 3), 250, 112.5);
+ WireConnectionPoint p2 = ui.addComponent(new WireConnectionPoint(nq, 3), 250, 202.5);
+ WireConnectionPoint o1 = ui.addComponent(new WireConnectionPoint(q, 1), 270, 112.5);
+ WireConnectionPoint o2 = ui.addComponent(new WireConnectionPoint(nq, 1), 270, 202.5);
+
+ ui.addWire(rIn, 0, or1, 0);
+ ui.addWire(sIn, 0, or2, 1);
+ ui.addWire(or1, 2, not1, 0);
+ ui.addWire(or2, 2, not2, 0);
+ ui.addWire(not1, 1, p1, 0);
+ ui.addWire(not2, 1, p2, 0);
+ ui.addWire(p1, 1, or2, 0, new Point(250, 130), new Point(140, 185), new Point(140, 197.5));
+ ui.addWire(p2, 1, or1, 1, new Point(250, 185), new Point(140, 130), new Point(140, 117.5));
+ ui.addWire(p1, 2, o1, 0);
+ ui.addWire(p2, 2, o2, 0);
+ }
+}
\ No newline at end of file
while (running.get())
{
// always execute to keep timeline from "hanging behind" for too long
- timeline.executeUpTo(System.currentTimeMillis(), System.currentTimeMillis() + 10);
+ timeline.executeUntil(timeline.laterThan(System.currentTimeMillis()), System.currentTimeMillis() + 10);
long sleepTime;
if (timeline.hasNext())
sleepTime = timeline.nextEventTime() - System.currentTimeMillis();
--- /dev/null
+package era.mi.gui.components;
+
+public class GUIManualSwitch
+{
+
+}
-Subproject commit 7d47333ed050416991e97421ece07965edb3d7f2
+Subproject commit 6f9a55d483020bad4a5f66de375c3d0d6da585df
package era.mi.logic.tests;
+import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.fail;
assertEquals(-1, a.getSignedValue());
}
+ boolean flag = false;
+
+ @Test
+ void simpleTimelineTest()
+ {
+ Timeline t = new Timeline(3);
+ flag = false;
+ t.addEvent((e) ->
+ {
+ if (!flag)
+ fail();
+ flag = false;
+ }, 15);
+ t.addEvent((e) ->
+ {
+ if (flag)
+ fail();
+ flag = true;
+ }, 10);
+ t.addEvent((e) ->
+ {
+ if (flag)
+ fail();
+ flag = true;
+ }, 20);
+ t.addEvent((e) ->
+ {
+ fail("Only supposed to execute until timestamp 20, not 25");
+ }, 25);
+
+ t.executeUntil(t.laterThan(20), 100);
+
+ if (!flag)
+ fail();
+ }
+
@Test
void multipleInputs()
{
while (f.isVisible())
{
- ExecutionResult er = gt.getTimeline().executeUpTo((lastFrame - begin) * 3, lastFrame + 14);
+ ExecutionResult er = gt.getTimeline().executeUntil(gt.getTimeline().laterThan((lastFrame - begin) * 3), lastFrame + 14);
// if (t.hasNext())
// t.executeNext();
if (er != ExecutionResult.NOTHING_DONE)
import java.util.ArrayList;
import java.util.List;
import java.util.PriorityQueue;
+import java.util.function.BooleanSupplier;
import java.util.function.Consumer;
+import java.util.function.LongSupplier;
/**
* Orders Events by the time they are due to be executed. Can execute Events individually.
public class Timeline
{
private PriorityQueue<InnerEvent> events;
- private long currentTime = 0;
+ private LongSupplier time;
+ private long lastTimeUpdated = 0;
private final List<Consumer<TimelineEvent>> eventAddedListener;
events = new PriorityQueue<InnerEvent>(initCapacity);
eventAddedListener = new ArrayList<>();
+ time = () -> lastTimeUpdated;
+ }
+
+ /**
+ * @param timestamp exclusive
+ * @return true if the first event is later than the timestamp
+ */
+ public BooleanSupplier laterThan(long timestamp)
+ {
+ return () -> timeCmp(events.peek().getTiming(), timestamp) > 0;
}
public boolean hasNext()
return !events.isEmpty();
}
+ /**
+ * Executes all events at the next timestamp, at which there are any
+ */
public void executeNext()
{
InnerEvent first = events.peek();
if (first != null)
- executeUpTo(first.getTiming(), -1);
+ executeUntil(laterThan(first.getTiming()), -1);
}
public void executeAll()
}
/**
- * Executes all events up to a given simulation timestamp. The simulation process can be constrained by a real world timestamp.
+ * Executes all events until a given condition is met. 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 condition the condition until which the events are be processed
* @param stopMillis the System.currentTimeMillis() when simulation definitely needs to stop. A value of -1 means no timeout.
- * @return if it was possible to fulfill the goal in the given real world time.
- * @author Christian Femers
+ * @return State of the event execution
+ * @formatter:off
+ * <code>NOTHING_DONE</code> if the {@link Timeline} was already empty
+ * <code>EXEC_OUT_OF_TIME</code> if the given maximum time was reached
+ * <code>EXEC_UNTIL_CONDITION</code> if the condition was met
+ * <code>EXEC_UNTIL_EMPTY</code> if events were executed until the {@link Timeline} was empty
+ * @formatter:on
+ * @author Christian Femers, Fabian Stemmler
*/
- public ExecutionResult executeUpTo(long timestamp, long stopMillis)
+ public ExecutionResult executeUntil(BooleanSupplier condition, long stopMillis)
{
if (events.isEmpty())
{
- currentTime = timestamp;
+ lastTimeUpdated = getSimulationTime();
return ExecutionResult.NOTHING_DONE;
}
int checkStop = 0;
InnerEvent first = events.peek();
- while (first != null && first.getTiming() <= timestamp)
+ while (hasNext() && !condition.getAsBoolean())
{
events.remove();
- currentTime = first.getTiming();
+ lastTimeUpdated = 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;
+ return ExecutionResult.EXEC_OUT_OF_TIME;
first = events.peek();
}
- currentTime = timestamp;
- return ExecutionResult.DONE_IN_TIME;
+ lastTimeUpdated = getSimulationTime();
+ return hasNext() ? ExecutionResult.EXEC_UNTIL_EMPTY : ExecutionResult.EXEC_UNTIL_CONDITION;
+ }
+
+ public void setTimeFunction(LongSupplier time)
+ {
+ this.time = time;
}
public long getSimulationTime()
{
- return currentTime;
+ return time.getAsLong();
}
public long nextEventTime()
public void reset()
{
events.clear();
- currentTime = 0;
+ lastTimeUpdated = 0;
}
public void addEventAddedListener(Consumer<TimelineEvent> listener)
*/
public void addEvent(TimelineEventHandler function, int relativeTiming)
{
- long timing = currentTime + relativeTiming;
+ long timing = getSimulationTime() + relativeTiming;
TimelineEvent event = new TimelineEvent(timing);
events.add(new InnerEvent(function, event));
eventAddedListener.forEach(l -> l.accept(event));
@Override
public int compareTo(InnerEvent o)
{
- long difference = getTiming() - o.getTiming();
- if (difference == 0)
- return 0;
- return difference < 0 ? -1 : 1;
+ return timeCmp(getTiming(), o.getTiming());
}
}
- @Override
- public String toString()
+ private static int timeCmp(long a, long b)
{
- return "simulation time: " + currentTime + ", " + events.toString();
+ return Long.signum(a - b);
}
- public static long toNanoseconds(long ticks)
+ @Override
+ public String toString()
{
- return ticks; // TODO: Alter this when it has been determined how ticks should relate to real time.
+ return String.format("Simulation time: %s, Last update: %d, Events: %s", getSimulationTime(), lastTimeUpdated, events.toString());
}
public enum ExecutionResult
{
- NOTHING_DONE, DONE_IN_TIME, RAN_OUT_OF_TIME
+ NOTHING_DONE, EXEC_UNTIL_EMPTY, EXEC_UNTIL_CONDITION, EXEC_OUT_OF_TIME
}
}
\ No newline at end of file
projects / Mograsim.git / commitdiff