Fixed GUITest: WireEnds used as outputs were created as input.

[Mograsim.git] / era.mi / src / era / mi / logic / tests / GUITest.java

diff --git a/era.mi/src/era/mi/logic/tests/GUITest.java b/era.mi/src/era/mi/logic/tests/GUITest.java
index 28dd67a..814a3b7 100644 (file)
--- a/era.mi/src/era/mi/logic/tests/GUITest.java
+++ b/era.mi/src/era/mi/logic/tests/GUITest.java
@@ -20,7 +20,7 @@ import era.mi.logic.components.ManualSwitch;
 import era.mi.logic.components.gates.NotGate;\r
 import era.mi.logic.components.gates.OrGate;\r
 import era.mi.logic.timeline.Timeline.ExecutionResult;\r
-import era.mi.logic.wires.WireArray;\r
+import era.mi.logic.wires.Wire;\r
 \r
 public class GUITest extends JPanel\r
 {\r
@@ -31,20 +31,20 @@ public class GUITest extends JPanel
        private static final int OR_DELAY = 100;\r
        private static final int NOT_DELAY = 100;\r
 \r
-       WireArray r = new WireArray(1, WIRE_DELAY);\r
-       WireArray s = new WireArray(1, WIRE_DELAY);\r
-       WireArray t1 = new WireArray(1, WIRE_DELAY);\r
-       WireArray t2 = new WireArray(1, WIRE_DELAY);\r
-       WireArray q = new WireArray(1, WIRE_DELAY);\r
-       WireArray nq = new WireArray(1, WIRE_DELAY);\r
+       Wire r = new Wire(1, WIRE_DELAY);\r
+       Wire s = new Wire(1, WIRE_DELAY);\r
+       Wire t1 = new Wire(1, WIRE_DELAY);\r
+       Wire t2 = new Wire(1, WIRE_DELAY);\r
+       Wire q = new Wire(1, WIRE_DELAY);\r
+       Wire nq = new Wire(1, WIRE_DELAY);\r
 \r
-       ManualSwitch rIn = new ManualSwitch(r);\r
-       ManualSwitch sIn = new ManualSwitch(s);\r
+       ManualSwitch rIn = new ManualSwitch(r.createEnd());\r
+       ManualSwitch sIn = new ManualSwitch(s.createEnd());\r
 \r
-       OrGate or1 = new OrGate(OR_DELAY, t2, r, nq);\r
-       OrGate or2 = new OrGate(OR_DELAY, t1, s, q);\r
-       NotGate not1 = new NotGate(NOT_DELAY, t2, q);\r
-       NotGate not2 = new NotGate(NOT_DELAY, t1, nq);\r
+       OrGate or1 = new OrGate(OR_DELAY, t2.createEnd(), r.createReadOnlyEnd(), nq.createReadOnlyEnd());\r
+       OrGate or2 = new OrGate(OR_DELAY, t1.createEnd(), s.createReadOnlyEnd(), q.createReadOnlyEnd());\r
+       NotGate not1 = new NotGate(NOT_DELAY, t2.createReadOnlyEnd(), q.createEnd());\r
+       NotGate not2 = new NotGate(NOT_DELAY, t1.createReadOnlyEnd(), nq.createEnd());\r
 \r
        Map<ManualSwitch, Rectangle> switchMap = new HashMap<>();\r
 \r
@@ -177,7 +177,7 @@ public class GUITest extends JPanel
                g.drawString(s, x - (int) (w * anchorX), y + (int) (h * anchorY));\r
        }\r
 \r
-       private void drawWire(Graphics g, WireArray wa, String name, double x1, double y1, double x2, double y2)\r
+       private void drawWire(Graphics g, Wire wa, String name, double x1, double y1, double x2, double y2)\r
        {\r
                setTo(g, wa);\r
                g.drawLine(gX(x1), gY(y1), gX(x2), gY(y2));\r
@@ -224,7 +224,7 @@ public class GUITest extends JPanel
                g.setColor(Color.BLACK);\r
        }\r
 \r
-       private static void setTo(Graphics g, WireArray wa)\r
+       private static void setTo(Graphics g, Wire wa)\r
        {\r
                switch (wa.getValue())\r
                {\r