Fixed Merger, Mux, Splitter: onedirectional again. Tests added.
[Mograsim.git] / era.mi / src / era / mi / logic / tests / ComponentTest.java
index f5ec68c..a18228b 100644 (file)
@@ -8,13 +8,15 @@ import org.junit.jupiter.api.Test;
 
 import era.mi.logic.Bit;
 import era.mi.logic.Simulation;
-import era.mi.logic.WireArray;
-import era.mi.logic.components.Merger2;
+import era.mi.logic.components.Merger;
 import era.mi.logic.components.Mux;
 import era.mi.logic.components.Splitter;
+import era.mi.logic.components.TriStateBuffer;
 import era.mi.logic.components.gates.AndGate;
 import era.mi.logic.components.gates.NotGate;
 import era.mi.logic.components.gates.OrGate;
+import era.mi.logic.wires.WireArray;
+import era.mi.logic.wires.WireArray.WireArrayInput;
 
 class ComponentTest
 {
@@ -27,180 +29,315 @@ class ComponentTest
                                f = new WireArray(1, 1), g = new WireArray(1, 1), h = new WireArray(2, 1), i = new WireArray(2, 1), j = new WireArray(1, 1), k = new WireArray(1, 1);
                new AndGate(1, a, b, f);
                new NotGate(1, f, g);
-               new Merger2(h, c, g);
-               new Mux(1, h, d, e, i);
+               new Merger(h, c, g);
+               new Mux(1, i, e, h, d);
                new Splitter(i, k, j);
                
-               a.feedSignals(Bit.ZERO);
-               b.feedSignals(Bit.ONE);
-               c.feedSignals(Bit.ZERO);
-               d.feedSignals(Bit.ONE, Bit.ONE);
-               e.feedSignals(Bit.ONE);
+               a.createInput().feedSignals(Bit.ZERO);
+               b.createInput().feedSignals(Bit.ONE);
+               c.createInput().feedSignals(Bit.ZERO);
+               d.createInput().feedSignals(Bit.ONE, Bit.ONE);
+               e.createInput().feedSignals(Bit.ZERO);
                
                while(Simulation.TIMELINE.hasNext())
                {
                        Simulation.TIMELINE.executeNext();
                }
                
-               assertEquals(Simulation.TIMELINE.getSimulationTime(), 14);
                assertEquals(Bit.ONE, j.getValue());
                assertEquals(Bit.ZERO, k.getValue());
        }
 
-       @Test
-       void splitterTest()
+    @Test
+    void splitterTest()
+    {
+       Simulation.TIMELINE.reset();
+       WireArray a = new WireArray(3, 1), b = new WireArray(2, 1), c = new WireArray(3, 1), in = new WireArray(8, 1);
+       in.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
+       new Splitter(in, a, b, c);
+
+       while (Simulation.TIMELINE.hasNext())
        {
-               Simulation.TIMELINE.reset();
-               WireArray a = new WireArray(3, 1), b = new WireArray(2, 1), c = new WireArray(3, 1), in = new WireArray(8, 1);
-               in.feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO,Bit.ONE, Bit.ZERO, Bit.ONE);
-               new Splitter(in, a, b, c);
-               
-               while(Simulation.TIMELINE.hasNext())
-               {
-                       Simulation.TIMELINE.executeNext();
-               }
-               
-               assertTrue(Arrays.equals(a.getValues(), new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO }));
-               assertTrue(Arrays.equals(b.getValues(), new Bit[] { Bit.ONE, Bit.ZERO }));
-               assertTrue(Arrays.equals(c.getValues(), new Bit[] { Bit.ONE, Bit.ZERO, Bit.ONE }));
+           Simulation.TIMELINE.executeNext();
        }
-       
-       @Test
-       void mergerTest()
+
+       assertTrue(Arrays.equals(a.getValues(), new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO }));
+       assertTrue(Arrays.equals(b.getValues(), new Bit[] { Bit.ONE, Bit.ZERO }));
+       assertTrue(Arrays.equals(c.getValues(), new Bit[] { Bit.ONE, Bit.ZERO, Bit.ONE }));
+    }
+
+    @Test
+    void mergerTest()
+    {
+       Simulation.TIMELINE.reset();
+       WireArray a = new WireArray(3, 1), b = new WireArray(2, 1), c = new WireArray(3, 1), out = new WireArray(8, 1);
+       a.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO);
+       b.createInput().feedSignals(Bit.ONE, Bit.ZERO);
+       c.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);
+
+       new Merger(out, a, b, c);
+
+       while (Simulation.TIMELINE.hasNext())
        {
-               Simulation.TIMELINE.reset();
-               WireArray a = new WireArray(3, 1), b = new WireArray(2, 1), c = new WireArray(3, 1), out = new WireArray(8, 1);
-               a.feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO);
-               b.feedSignals(Bit.ONE, Bit.ZERO);
-               c.feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);
-               
-               new Merger2(out, a, b, c);
-               
-               while(Simulation.TIMELINE.hasNext())
-               {
-                       Simulation.TIMELINE.executeNext();
-               }
-               
-               assertTrue(Arrays.equals(out.getValues(), new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }));
+           Simulation.TIMELINE.executeNext();
        }
-       
-       @Test
-       void muxTest()
+
+       assertTrue(Arrays.equals(out.getValues(),
+               new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }));
+    }
+
+    @Test
+    void triStateBufferTest()
+    {
+       WireArray a = new WireArray(1, 1), b = new WireArray(1, 1), en = new WireArray(1, 1),
+               notEn = new WireArray(1, 1);
+       new NotGate(1, en, notEn);
+       new TriStateBuffer(1, a, b, en);
+       new TriStateBuffer(1, b, a, notEn);
+
+       WireArrayInput enI = en.createInput(), aI = a.createInput(), bI = b.createInput();
+       enI.feedSignals(Bit.ONE);
+       aI.feedSignals(Bit.ONE);
+
+       while (Simulation.TIMELINE.hasNext())
        {
-               Simulation.TIMELINE.reset();
-               WireArray a = new WireArray(1, 1), b = new WireArray(1, 1), select = new WireArray(1, 1), out = new WireArray(1, 1);
-               
-               select.feedSignals(Bit.ONE);
-               a.feedSignals(Bit.ONE);
-               b.feedSignals(Bit.ZERO);
-               
-               new Mux(1, a, b, select, out);
-               assertEquals(out.getValue(), Bit.X);
-               while(Simulation.TIMELINE.hasNext())
-               {
-                       Simulation.TIMELINE.executeNext();
-               }
+           Simulation.TIMELINE.executeNext();
+       }
 
-               assertEquals(out.getValue(), Bit.ONE);
-               select.feedSignals(Bit.ZERO);
-               while(Simulation.TIMELINE.hasNext())
-               {
-                       Simulation.TIMELINE.executeNext();
-               }
-               
-               assertEquals(out.getValue(), Bit.ZERO);
+       assertEquals(Bit.ONE, b.getValue());
+
+       bI.feedSignals(Bit.ZERO);
+
+       while (Simulation.TIMELINE.hasNext())
+       {
+           Simulation.TIMELINE.executeNext();
        }
-       
-       @Test
-       void andTest()
+
+       assertEquals(Bit.X, b.getValue());
+       assertEquals(Bit.ONE, a.getValue());
+
+       aI.clearSignals();
+       enI.feedSignals(Bit.ZERO);
+
+       while (Simulation.TIMELINE.hasNext())
        {
-               Simulation.TIMELINE.reset();
-               AndGate gate = new AndGate(1, new WireArray(4, 1), new WireArray(4, 1), new WireArray(4, 1));
-               gate.getA().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
-               gate.getB().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
-               
-               
-               while(Simulation.TIMELINE.hasNext())
-               {
-                       Simulation.TIMELINE.executeNext();
-               }
-               assertTrue(Arrays.equals(gate.getOut().getValues(), new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ZERO }));
+           Simulation.TIMELINE.executeNext();
        }
-       
-       @Test
-       void orTest()
+
+       assertEquals(Bit.ZERO, a.getValue());
+
+    }
+
+    @Test
+    void muxTest()
+    {
+       Simulation.TIMELINE.reset();
+       WireArray a = new WireArray(4, 3), b = new WireArray(4, 6), c = new WireArray(4, 4),
+               select = new WireArray(2, 5), out = new WireArray(4, 1);
+       WireArrayInput selectIn = select.createInput();
+
+       selectIn.feedSignals(Bit.ZERO, Bit.ZERO);
+       a.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);
+       c.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
+
+       new Mux(1, out, select, a, b, c);
+       while (Simulation.TIMELINE.hasNext())
        {
-               Simulation.TIMELINE.reset();
-               OrGate gate = new OrGate(1, new WireArray(4, 1), new WireArray(4, 1), new WireArray(4, 1));
-               gate.getA().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
-               gate.getB().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
-               
-               
-               while(Simulation.TIMELINE.hasNext())
-               {
-                       Simulation.TIMELINE.executeNext();
-               }
-               assertTrue(Arrays.equals(gate.getOut().getValues(), new Bit[] { Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ONE }));
+           Simulation.TIMELINE.executeNext();
        }
-       
-       @Test
-       void rsLatchCircuitTest()
+
+       assertTrue(Arrays.equals(new Bit[] { Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO }, out.getValues()));
+       selectIn.feedSignals(Bit.ZERO, Bit.ONE);
+       while (Simulation.TIMELINE.hasNext())
        {
-               Simulation.TIMELINE.reset();
-               WireArray r = new WireArray(1, 1), s = new WireArray(1, 1), t1 = new WireArray(1, 15), t2 = new WireArray(1, 1), q = new WireArray(1, 1),
-                               nq = new WireArray(1, 1);
-               
-               new OrGate(1, r, nq, t2);
-               new OrGate(1, s, q, t1);
-               new NotGate(1, t2, q);
-               new NotGate(1, t1, nq);
-       
-               s.feedSignals(Bit.ONE);
-               r.feedSignals(Bit.ZERO);
-               
-               while(Simulation.TIMELINE.hasNext())
-               {
-                       Simulation.TIMELINE.executeNext();
-               }
-               
-               assertEquals(q.getValue(), Bit.ONE);
-               assertEquals(nq.getValue(), Bit.ZERO);
-               
-               s.feedSignals(Bit.ZERO);
-               
-               while(Simulation.TIMELINE.hasNext())
-               {
-                       Simulation.TIMELINE.executeNext();
-               }
-               
-               assertEquals(q.getValue(), Bit.ONE);
-               assertEquals(nq.getValue(), Bit.ZERO);
-               
-               r.feedSignals(Bit.ONE);
-               
-               while(Simulation.TIMELINE.hasNext())
-               {
-                       Simulation.TIMELINE.executeNext();
-               }
-               
-               assertEquals(q.getValue(), Bit.ZERO);
-               assertEquals(nq.getValue(), Bit.ONE);
+           Simulation.TIMELINE.executeNext();
        }
-       
-       @Test
-       void numericValueTest()
+
+       assertTrue(Arrays.equals(new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }, out.getValues()));
+
+       selectIn.feedSignals(Bit.ONE, Bit.ONE);
+       while (Simulation.TIMELINE.hasNext())
        {
-               Simulation.TIMELINE.reset();
-               
-               WireArray a = new WireArray(4, 1);
-               a.feedSignals(Bit.ONE, Bit.ONE, Bit.ONE, Bit.ONE);
-               
-               while(Simulation.TIMELINE.hasNext())
-               {
-                       Simulation.TIMELINE.executeNext();
-               }
-               
-               assertEquals(a.getUnsignedValue(), 15);
-               assertEquals(a.getSignedValue(), -1);
+           Simulation.TIMELINE.executeNext();
        }
+
+       assertTrue(Arrays.equals(new Bit[] { Bit.Z, Bit.Z, Bit.Z, Bit.Z }, out.getValues()));
+
+    }
+
+    @Test
+    void andTest()
+    {
+       Simulation.TIMELINE.reset();
+       AndGate gate = new AndGate(1, new WireArray(4, 1), new WireArray(4, 1), new WireArray(4, 1));
+       gate.getA().createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
+       gate.getB().createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
+
+       while (Simulation.TIMELINE.hasNext())
+       {
+           Simulation.TIMELINE.executeNext();
+       }
+       assertTrue(Arrays.equals(gate.getOut().getValues(), new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ZERO }));
+    }
+
+    @Test
+    void orTest()
+    {
+       Simulation.TIMELINE.reset();
+       OrGate gate = new OrGate(1, new WireArray(4, 1), new WireArray(4, 1), new WireArray(4, 1));
+       gate.getA().createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);
+       gate.getB().createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);
+
+       while (Simulation.TIMELINE.hasNext())
+       {
+           Simulation.TIMELINE.executeNext();
+       }
+
+       assertTrue(Arrays.equals(gate.getOut().getValues(), new Bit[] { Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ONE }));
+    }
+
+    @Test
+    void rsLatchCircuitTest()
+    {
+       Simulation.TIMELINE.reset();
+       WireArray r = new WireArray(1, 1), s = new WireArray(1, 1), t1 = new WireArray(1, 15), t2 = new WireArray(1, 1),
+               q = new WireArray(1, 1), nq = new WireArray(1, 1);
+
+       new OrGate(1, r, nq, t2);
+       new OrGate(1, s, q, t1);
+       new NotGate(1, t2, q);
+       new NotGate(1, t1, nq);
+
+       WireArrayInput sIn = s.createInput(), rIn = r.createInput();
+
+       sIn.feedSignals(Bit.ONE);
+       rIn.feedSignals(Bit.ZERO);
+
+       while (Simulation.TIMELINE.hasNext())
+       {
+           Simulation.TIMELINE.executeNext();
+       }
+
+       assertEquals(q.getValue(), Bit.ONE);
+       assertEquals(nq.getValue(), Bit.ZERO);
+
+       sIn.feedSignals(Bit.ZERO);
+
+       while (Simulation.TIMELINE.hasNext())
+       {
+           Simulation.TIMELINE.executeNext();
+       }
+
+       assertEquals(q.getValue(), Bit.ONE);
+       assertEquals(nq.getValue(), Bit.ZERO);
+
+       rIn.feedSignals(Bit.ONE);
+
+       while (Simulation.TIMELINE.hasNext())
+       {
+           Simulation.TIMELINE.executeNext();
+       }
+
+       assertEquals(q.getValue(), Bit.ZERO);
+       assertEquals(nq.getValue(), Bit.ONE);
+    }
+
+    @Test
+    void numericValueTest()
+    {
+       Simulation.TIMELINE.reset();
+
+       WireArray a = new WireArray(4, 1);
+       a.createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ONE, Bit.ONE);
+
+       while (Simulation.TIMELINE.hasNext())
+       {
+           Simulation.TIMELINE.executeNext();
+       }
+
+       assertEquals(a.getUnsignedValue(), 15);
+       assertEquals(a.getSignedValue(), -1);
+    }
+
+    @Test
+    void multipleInputs()
+    {
+       Simulation.TIMELINE.reset();
+       WireArray w = new WireArray(2, 1);
+       WireArrayInput wI1 = w.createInput(), wI2 = w.createInput();
+       wI1.feedSignals(Bit.ONE, Bit.Z);
+       wI2.feedSignals(Bit.Z, Bit.X);
+       while (Simulation.TIMELINE.hasNext())
+       {
+           Simulation.TIMELINE.executeNext();
+       }
+       assertTrue(Arrays.equals(w.getValues(), new Bit[] { Bit.ONE, Bit.X }));
+
+       wI2.feedSignals(Bit.ZERO, Bit.Z);
+       while (Simulation.TIMELINE.hasNext())
+       {
+           Simulation.TIMELINE.executeNext();
+       }
+       assertTrue(Arrays.equals(w.getValues(), new Bit[] { Bit.X, Bit.Z }));
+
+       wI2.feedSignals(Bit.Z, Bit.Z);
+       while (Simulation.TIMELINE.hasNext())
+       {
+           Simulation.TIMELINE.executeNext();
+       }
+       assertTrue(Arrays.equals(w.getValues(), new Bit[] { Bit.ONE, Bit.Z }));
+
+       wI2.feedSignals(Bit.ONE, Bit.Z);
+       w.addObserver((i) -> fail("WireArray notified observer, although value did not change."));
+       while (Simulation.TIMELINE.hasNext())
+       {
+           Simulation.TIMELINE.executeNext();
+       }
+       assertTrue(Arrays.equals(w.getValues(), new Bit[] { Bit.ONE, Bit.Z }));
+    }
+
+//     @Test
+//     void wireConnections()
+//     {
+//             // Nur ein Experiment, was über mehrere 'passive' Bausteine hinweg passieren würde
+//             
+//             Simulation.TIMELINE.reset();
+//
+//             WireArray a = new WireArray(1, 2);
+//             WireArray b = new WireArray(1, 2);
+//             WireArray c = new WireArray(1, 2);
+//             WireArrayInput aI = a.createInput();
+//             WireArrayInput bI = b.createInput();
+//             WireArrayInput cI = c.createInput();
+//
+//             TestBitDisplay test = new TestBitDisplay(c);
+//             LongConsumer print = time -> System.out.format("Time %2d\n   %s\n   %s\n   %s\n", time, a, b, c);
+//
+//             cI.feedSignals(Bit.ONE);
+//             test.assertAfterSimulationIs(print, Bit.ONE);
+//
+//             cI.feedSignals(Bit.X);
+//             test.assertAfterSimulationIs(print, Bit.X);
+//
+//             cI.feedSignals(Bit.X);
+//             cI.feedSignals(Bit.Z);
+//             test.assertAfterSimulationIs(print, Bit.Z);
+//
+//             Connector c1 = new Connector(b, c);
+//             test.assertAfterSimulationIs(print, Bit.Z);
+//             System.out.println("ONE");
+//             bI.feedSignals(Bit.ONE);
+//             test.assertAfterSimulationIs(print, Bit.ONE);
+//             System.out.println("ZERO");
+//             bI.feedSignals(Bit.ZERO);
+//             test.assertAfterSimulationIs(print, Bit.ZERO);
+//             System.out.println("Z");
+//             bI.feedSignals(Bit.Z);
+//             test.assertAfterSimulationIs(Bit.Z);
+//     }
+
+    private static void assertBitArrayEquals(Bit[] actual, Bit... expected)
+    {
+       assertArrayEquals(expected, actual);
+    }
 }