Wire q = new Wire(1, WIRE_DELAY);\r
Wire nq = new Wire(1, WIRE_DELAY);\r
\r
- ManualSwitch rIn = new ManualSwitch(r.createEnd());\r
- ManualSwitch sIn = new ManualSwitch(s.createEnd());\r
+ ManualSwitch rIn = new ManualSwitch(r.createReadWriteEnd());\r
+ ManualSwitch sIn = new ManualSwitch(s.createReadWriteEnd());\r
\r
- OrGate or1 = new OrGate(OR_DELAY, t2.createEnd(), r.createEnd(), nq.createEnd());\r
- OrGate or2 = new OrGate(OR_DELAY, t1.createEnd(), s.createEnd(), q.createEnd());\r
- NotGate not1 = new NotGate(NOT_DELAY, t2.createEnd(), q.createEnd());\r
- NotGate not2 = new NotGate(NOT_DELAY, t1.createEnd(), nq.createEnd());\r
+ OrGate or1 = new OrGate(OR_DELAY, t2.createReadWriteEnd(), r.createReadOnlyEnd(), nq.createReadOnlyEnd());\r
+ OrGate or2 = new OrGate(OR_DELAY, t1.createReadWriteEnd(), s.createReadOnlyEnd(), q.createReadOnlyEnd());\r
+ NotGate not1 = new NotGate(NOT_DELAY, t2.createReadOnlyEnd(), q.createReadWriteEnd());\r
+ NotGate not2 = new NotGate(NOT_DELAY, t1.createReadOnlyEnd(), nq.createReadWriteEnd());\r
\r
Map<ManualSwitch, Rectangle> switchMap = new HashMap<>();\r
\r
g.setColor(Color.BLACK);\r
break;\r
case U:\r
- g.setColor(Color.BLUE);\r
+ g.setColor(Color.MAGENTA);\r
break;\r
default:\r
throw new IllegalArgumentException();\r
gt.repaint(12);\r
try\r
{\r
- Thread.sleep(Math.max(16 - System.currentTimeMillis() + lastFrame, 0));\r
+ Thread.sleep(Math.max(updateT - System.currentTimeMillis() + lastFrame, 0));\r
}\r
catch (Exception e)\r
{\r