new WireEnds as in/outputs are now initialized with U again

added method createReadOnlyEnd() to Wire
updated ComponentTest accordingly

diff --git a/era.mi/src/era/mi/logic/tests/ComponentTest.java b/era.mi/src/era/mi/logic/tests/ComponentTest.java
index d4ba21d..d2ecdbc 100644 (file)
--- a/era.mi/src/era/mi/logic/tests/ComponentTest.java
+++ b/era.mi/src/era/mi/logic/tests/ComponentTest.java
@@ -35,11 +35,11 @@ class ComponentTest
                Simulation.TIMELINE.reset();\r
                Wire a = new Wire(1, 1), b = new Wire(1, 1), c = new Wire(1, 10), d = new Wire(2, 1), e = new Wire(1, 1), f = new Wire(1, 1),\r
                                g = new Wire(1, 1), h = new Wire(2, 1), i = new Wire(2, 1), j = new Wire(1, 1), k = new Wire(1, 1);\r
-               new AndGate(1, f.createEnd(), a.createEnd(), b.createEnd());\r
-               new NotGate(1, f.createEnd(), g.createEnd());\r
-               new Merger(h.createEnd(), c.createEnd(), g.createEnd());\r
-               new Mux(1, i.createEnd(), e.createEnd(), h.createEnd(), d.createEnd());\r
-               new Splitter(i.createEnd(), k.createEnd(), j.createEnd());\r
+               new AndGate(1, f.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd());\r
+               new NotGate(1, f.createReadOnlyEnd(), g.createEnd());\r
+               new Merger(h.createEnd(), c.createReadOnlyEnd(), g.createReadOnlyEnd());\r
+               new Mux(1, i.createEnd(), e.createReadOnlyEnd(), h.createReadOnlyEnd(), d.createReadOnlyEnd());\r
+               new Splitter(i.createReadOnlyEnd(), k.createEnd(), j.createEnd());\r
 \r
                a.createEnd().feedSignals(Bit.ZERO);\r
                b.createEnd().feedSignals(Bit.ONE);\r
@@ -59,7 +59,7 @@ class ComponentTest
                Simulation.TIMELINE.reset();\r
                Wire a = new Wire(3, 1), b = new Wire(2, 1), c = new Wire(3, 1), in = new Wire(8, 1);\r
                in.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);\r
-               new Splitter(in.createEnd(), a.createEnd(), b.createEnd(), c.createEnd());\r
+               new Splitter(in.createReadOnlyEnd(), a.createEnd(), b.createEnd(), c.createEnd());\r
 \r
                Simulation.TIMELINE.executeAll();\r
 \r
@@ -77,7 +77,7 @@ class ComponentTest
                b.createEnd().feedSignals(Bit.ONE, Bit.ZERO);\r
                c.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);\r
 \r
-               new Merger(out.createEnd(), a.createEnd(), b.createEnd(), c.createEnd());\r
+               new Merger(out.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd());\r
 \r
                Simulation.TIMELINE.executeAll();\r
 \r
@@ -89,9 +89,9 @@ class ComponentTest
        void triStateBufferTest()\r
        {\r
                Wire a = new Wire(1, 1), b = new Wire(1, 1), en = new Wire(1, 1), notEn = new Wire(1, 1);\r
-               new NotGate(1, en.createEnd(), notEn.createEnd());\r
-               new TriStateBuffer(1, a.createEnd(), b.createEnd(), en.createEnd());\r
-               new TriStateBuffer(1, b.createEnd(), a.createEnd(), notEn.createEnd());\r
+               new NotGate(1, en.createReadOnlyEnd(), notEn.createEnd());\r
+               new TriStateBuffer(1, a.createReadOnlyEnd(), b.createEnd(), en.createReadOnlyEnd());\r
+               new TriStateBuffer(1, b.createReadOnlyEnd(), a.createEnd(), notEn.createReadOnlyEnd());\r
 \r
                WireEnd enI = en.createEnd(), aI = a.createEnd(), bI = b.createEnd();\r
                enI.feedSignals(Bit.ONE);\r
@@ -129,7 +129,7 @@ class ComponentTest
                a.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);\r
                c.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);\r
 \r
-               new Mux(1, out.createEnd(), select.createEnd(), a.createEnd(), b.createEnd(), c.createEnd());\r
+               new Mux(1, out.createEnd(), select.createReadOnlyEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd());\r
                Simulation.TIMELINE.executeAll();\r
 \r
                assertBitArrayEquals(out.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);\r
@@ -155,7 +155,7 @@ class ComponentTest
                selectIn.feedSignals(Bit.ZERO, Bit.ZERO);\r
                in.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);\r
 \r
-               new Demux(1, in.createEnd(), select.createEnd(), a.createEnd(), b.createEnd(), c.createEnd());\r
+               new Demux(1, in.createReadOnlyEnd(), select.createReadOnlyEnd(), a.createEnd(), b.createEnd(), c.createEnd());\r
                Simulation.TIMELINE.executeAll();\r
 \r
                assertBitArrayEquals(a.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);\r
@@ -182,7 +182,7 @@ class ComponentTest
        {\r
                Simulation.TIMELINE.reset();\r
                Wire a = new Wire(4, 1), b = new Wire(4, 3), c = new Wire(4, 1);\r
-               new AndGate(1, c.createEnd(), a.createEnd(), b.createEnd());\r
+               new AndGate(1, c.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd());\r
                a.createEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);\r
                b.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);\r
 \r
@@ -196,7 +196,7 @@ class ComponentTest
        {\r
                Simulation.TIMELINE.reset();\r
                Wire a = new Wire(4, 1), b = new Wire(4, 3), c = new Wire(4, 1);\r
-               new OrGate(1, c.createEnd(), a.createEnd(), b.createEnd());\r
+               new OrGate(1, c.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd());\r
                a.createEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);\r
                b.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);\r
 \r
@@ -210,7 +210,7 @@ class ComponentTest
        {\r
                Simulation.TIMELINE.reset();\r
                Wire a = new Wire(3, 1), b = new Wire(3, 2), c = new Wire(3, 1), d = new Wire(3, 1);\r
-               new XorGate(1, d.createEnd(), a.createEnd(), b.createEnd(), c.createEnd());\r
+               new XorGate(1, d.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd());\r
                a.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE);\r
                b.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);\r
                c.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);\r
@@ -225,7 +225,7 @@ class ComponentTest
        {\r
                Simulation.TIMELINE.reset();\r
                Wire a = new Wire(3, 1), b = new Wire(3, 2);\r
-               new NotGate(1, a.createEnd(), b.createEnd());\r
+               new NotGate(1, a.createReadOnlyEnd(), b.createEnd());\r
                a.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE);\r
 \r
                Simulation.TIMELINE.executeAll();\r
@@ -239,10 +239,10 @@ class ComponentTest
                Simulation.TIMELINE.reset();\r
                Wire r = new Wire(1, 1), s = new Wire(1, 1), t1 = new Wire(1, 15), t2 = new Wire(1, 1), q = new Wire(1, 1), nq = new Wire(1, 1);\r
 \r
-               new OrGate(1, t2.createEnd(), r.createEnd(), nq.createEnd());\r
-               new OrGate(1, t1.createEnd(), s.createEnd(), q.createEnd());\r
-               new NotGate(1, t2.createEnd(), q.createEnd());\r
-               new NotGate(1, t1.createEnd(), nq.createEnd());\r
+               new OrGate(1, t2.createEnd(), r.createReadOnlyEnd(), nq.createReadOnlyEnd());\r
+               new OrGate(1, t1.createEnd(), s.createReadOnlyEnd(), q.createReadOnlyEnd());\r
+               new NotGate(1, t2.createReadOnlyEnd(), q.createEnd());\r
+               new NotGate(1, t1.createReadOnlyEnd(), nq.createEnd());\r
 \r
                WireEnd sIn = s.createEnd(), rIn = r.createEnd();\r
 \r
@@ -321,8 +321,8 @@ class ComponentTest
                WireEnd bI = b.createEnd();\r
                WireEnd cI = c.createEnd();\r
 \r
-               TestBitDisplay test = new TestBitDisplay(c.createEnd());\r
-               TestBitDisplay test2 = new TestBitDisplay(a.createEnd());\r
+               TestBitDisplay test = new TestBitDisplay(c.createReadOnlyEnd());\r
+               TestBitDisplay test2 = new TestBitDisplay(a.createReadOnlyEnd());\r
                LongConsumer print = time -> System.out.format("Time %2d\n   a: %s\n   b: %s\n   c: %s\n", time, a, b, c);\r
 \r
                cI.feedSignals(Bit.ONE);\r

diff --git a/era.mi/src/era/mi/logic/tests/Connector.java b/era.mi/src/era/mi/logic/tests/Connector.java
deleted file mode 100644 (file)
index 39645bf..0000000
--- a/era.mi/src/era/mi/logic/tests/Connector.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package era.mi.logic.tests;
-
-import era.mi.logic.Bit;
-import era.mi.logic.Simulation;
-import era.mi.logic.wires.Wire;
-import era.mi.logic.wires.Wire.WireEnd;
-import era.mi.logic.wires.WireObserver;
-
-public class Connector implements WireObserver
-{
-       private final Wire a;
-//     private final WireArray b;
-       private final WireEnd aI;
-       private final WireEnd bI;
-
-       public Connector(Wire a, Wire b)
-       {
-               if (a.length != b.length)
-                       throw new IllegalArgumentException(String.format("WireArray width does not match: %d, %d", a.length, b.length));
-               this.a = a;
-//             this.b = b;
-               a.addObserver(this);
-               b.addObserver(this);
-               aI = a.createEnd();
-               bI = b.createEnd();
-       }
-
-       @Override
-       public void update(Wire initiator, Bit[] oldValues)
-       {
-               Simulation.TIMELINE.addEvent((e) ->
-               {
-                       if (initiator == a)
-                               bI.feedSignals(aI.wireValuesExcludingMe());
-                       else
-                               aI.feedSignals(bI.wireValuesExcludingMe());
-               }, 1);
-       }
-}

diff --git a/era.mi/src/era/mi/logic/tests/GUITest.java b/era.mi/src/era/mi/logic/tests/GUITest.java
index d72f847..adc4c32 100644 (file)
--- a/era.mi/src/era/mi/logic/tests/GUITest.java
+++ b/era.mi/src/era/mi/logic/tests/GUITest.java
@@ -282,7 +282,7 @@ public class GUITest extends JPanel
                                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

diff --git a/era.mi/src/era/mi/logic/wires/Wire.java b/era.mi/src/era/mi/logic/wires/Wire.java
index 4c24571..1b26a15 100644 (file)
--- a/era.mi/src/era/mi/logic/wires/Wire.java
+++ b/era.mi/src/era/mi/logic/wires/Wire.java
@@ -200,7 +200,15 @@ public class Wire
         */
        public WireEnd createEnd()
        {
-               return new WireEnd();
+               return new WireEnd(false);
+       }
+
+       /**
+        * Create a {@link WireEnd} object, which is tied to this {@link Wire}. This {@link WireEnd} cannot written to.
+        */
+       public WireEnd createReadOnlyEnd()
+       {
+               return new WireEnd(true);
        }
 
        private void registerInput(WireEnd toRegister)
@@ -220,17 +228,18 @@ public class Wire
                private boolean open;
                private Bit[] inputValues;
 
-               private WireEnd()
+               private WireEnd(boolean readOnly)
                {
                        super();
                        open = true;
                        initValues();
-                       registerInput(this);
+                       if (!readOnly)
+                               registerInput(this);
                }
 
                private void initValues()
                {
-                       inputValues = Bit.Z.makeArray(length);
+                       inputValues = Bit.U.makeArray(length);
                }
 
                /**
@@ -415,11 +424,11 @@ public class Wire
                @Override
                public String toString()
                {
-                       return Arrays.toString(values);
+                       return Arrays.toString(inputValues);
                        // return String.format("%s \nFeeding: %s", WireArray.this.toString(), Arrays.toString(inputValues));
                }
 
-               public void disconnect()
+               public void close()
                {
                        inputs.remove(this);
                        open = false;