\r
import static org.junit.jupiter.api.Assertions.*;\r
\r
-import java.util.Arrays;\r
import java.util.function.LongConsumer;\r
\r
import org.junit.jupiter.api.Test;\r
\r
-import era.mi.logic.Bit;\r
import era.mi.logic.Simulation;\r
+import era.mi.logic.components.Connector;\r
import era.mi.logic.components.Demux;\r
import era.mi.logic.components.Merger;\r
import era.mi.logic.components.Mux;\r
import era.mi.logic.components.gates.NotGate;\r
import era.mi.logic.components.gates.OrGate;\r
import era.mi.logic.components.gates.XorGate;\r
-import era.mi.logic.wires.WireArray;\r
-import era.mi.logic.wires.WireArray.WireArrayInput;\r
+import era.mi.logic.types.Bit;\r
+import era.mi.logic.types.BitVector;\r
+import era.mi.logic.wires.Wire;\r
+import era.mi.logic.wires.Wire.WireEnd;\r
\r
-class ComponentTest {\r
+@SuppressWarnings("unused")\r
+class ComponentTest\r
+{\r
\r
@Test\r
- void circuitExampleTest() {\r
+ void circuitExampleTest()\r
+ {\r
Simulation.TIMELINE.reset();\r
- WireArray a = new WireArray(1, 1), b = new WireArray(1, 1), c = new WireArray(1, 10), d = new WireArray(2, 1),\r
- e = new WireArray(1, 1), f = new WireArray(1, 1), g = new WireArray(1, 1), h = new WireArray(2, 1), i = new WireArray(2, 1),\r
- j = new WireArray(1, 1), k = new WireArray(1, 1);\r
- new AndGate(1, f, a, b);\r
- new NotGate(1, f, g);\r
- new Merger(h, c, g);\r
- new Mux(1, i, e, h, d);\r
- new Splitter(i, k, j);\r
-\r
- a.createInput().feedSignals(Bit.ZERO);\r
- b.createInput().feedSignals(Bit.ONE);\r
- c.createInput().feedSignals(Bit.ZERO);\r
- d.createInput().feedSignals(Bit.ONE, Bit.ONE);\r
- e.createInput().feedSignals(Bit.ZERO);\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.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
+ c.createEnd().feedSignals(Bit.ZERO);\r
+ d.createEnd().feedSignals(Bit.ONE, Bit.ONE);\r
+ e.createEnd().feedSignals(Bit.ZERO);\r
\r
Simulation.TIMELINE.executeAll();\r
\r
}\r
\r
@Test\r
- void splitterTest() {\r
+ void splitterTest()\r
+ {\r
Simulation.TIMELINE.reset();\r
- WireArray a = new WireArray(3, 1), b = new WireArray(2, 1), c = new WireArray(3, 1), in = new WireArray(8, 1);\r
- in.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);\r
- new Splitter(in, a, b, c);\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.createReadOnlyEnd(), a.createEnd(), b.createEnd(), c.createEnd());\r
\r
Simulation.TIMELINE.executeAll();\r
\r
}\r
\r
@Test\r
- void mergerTest() {\r
+ void mergerTest()\r
+ {\r
Simulation.TIMELINE.reset();\r
- WireArray a = new WireArray(3, 1), b = new WireArray(2, 1), c = new WireArray(3, 1), out = new WireArray(8, 1);\r
- a.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO);\r
- b.createInput().feedSignals(Bit.ONE, Bit.ZERO);\r
- c.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);\r
+ Wire a = new Wire(3, 1), b = new Wire(2, 1), c = new Wire(3, 1), out = new Wire(8, 1);\r
+ a.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO);\r
+ b.createEnd().feedSignals(Bit.ONE, Bit.ZERO);\r
+ c.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);\r
\r
- new Merger(out, a, b, c);\r
+ new Merger(out.createEnd(), a.createReadOnlyEnd(), b.createReadOnlyEnd(), c.createReadOnlyEnd());\r
\r
Simulation.TIMELINE.executeAll();\r
\r
- assertTrue(\r
- Arrays.equals(out.getValues(), new Bit[] { Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE }));\r
+ assertBitArrayEquals(out.getValues(), Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);\r
}\r
\r
@Test\r
- void triStateBufferTest() {\r
- WireArray a = new WireArray(1, 1), b = new WireArray(1, 1), en = new WireArray(1, 1), notEn = new WireArray(1, 1);\r
- new NotGate(1, en, notEn);\r
- new TriStateBuffer(1, a, b, en);\r
- new TriStateBuffer(1, b, a, notEn);\r
-\r
- WireArrayInput enI = en.createInput(), aI = a.createInput(), bI = b.createInput();\r
+ 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.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
aI.feedSignals(Bit.ONE);\r
+ bI.feedSignals(Bit.Z);\r
\r
Simulation.TIMELINE.executeAll();\r
\r
}\r
\r
@Test\r
- void muxTest() {\r
+ void muxTest()\r
+ {\r
Simulation.TIMELINE.reset();\r
- WireArray a = new WireArray(4, 3), b = new WireArray(4, 6), c = new WireArray(4, 4), select = new WireArray(2, 5),\r
- out = new WireArray(4, 1);\r
- WireArrayInput selectIn = select.createInput();\r
+ Wire a = new Wire(4, 3), b = new Wire(4, 6), c = new Wire(4, 4), select = new Wire(2, 5), out = new Wire(4, 1);\r
+ WireEnd selectIn = select.createEnd();\r
\r
selectIn.feedSignals(Bit.ZERO, Bit.ZERO);\r
- a.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);\r
- c.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);\r
+ 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, select, a, b, c);\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
}\r
\r
@Test\r
- void demuxTest() {\r
+ void demuxTest()\r
+ {\r
Simulation.TIMELINE.reset();\r
- WireArray a = new WireArray(4, 3), b = new WireArray(4, 6), c = new WireArray(4, 4), select = new WireArray(2, 5),\r
- in = new WireArray(4, 1);\r
- WireArrayInput selectIn = select.createInput();\r
+ Wire a = new Wire(4, 3), b = new Wire(4, 6), c = new Wire(4, 4), select = new Wire(2, 5), in = new Wire(4, 1);\r
+ WireEnd selectIn = select.createEnd();\r
\r
selectIn.feedSignals(Bit.ZERO, Bit.ZERO);\r
- in.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);\r
+ in.createEnd().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);\r
\r
- new Demux(1, in, select, a, b, c);\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
- assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);\r
- assertBitArrayEquals(c.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);\r
+ assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U, Bit.U);\r
+ assertBitArrayEquals(c.getValues(), Bit.U, Bit.U, Bit.U, Bit.U);\r
selectIn.feedSignals(Bit.ZERO, Bit.ONE);\r
Simulation.TIMELINE.executeAll();\r
\r
assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);\r
- assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);\r
+ assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U, Bit.U);\r
assertBitArrayEquals(c.getValues(), Bit.ONE, Bit.ZERO, Bit.ONE, Bit.ZERO);\r
\r
selectIn.feedSignals(Bit.ONE, Bit.ONE);\r
Simulation.TIMELINE.executeAll();\r
\r
assertBitArrayEquals(a.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);\r
- assertBitArrayEquals(b.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);\r
+ assertBitArrayEquals(b.getValues(), Bit.U, Bit.U, Bit.U, Bit.U);\r
assertBitArrayEquals(c.getValues(), Bit.Z, Bit.Z, Bit.Z, Bit.Z);\r
\r
}\r
\r
@Test\r
- void andTest() {\r
+ void andTest()\r
+ {\r
Simulation.TIMELINE.reset();\r
- WireArray a = new WireArray(4, 1), b = new WireArray(4, 3), c = new WireArray(4, 1);\r
- new AndGate(1, c, a, b);\r
- a.createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);\r
- b.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);\r
+ Wire a = new Wire(4, 1), b = new Wire(4, 3), c = new Wire(4, 1);\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
Simulation.TIMELINE.executeAll();\r
\r
}\r
\r
@Test\r
- void orTest() {\r
+ void orTest()\r
+ {\r
Simulation.TIMELINE.reset();\r
- WireArray a = new WireArray(4, 1), b = new WireArray(4, 3), c = new WireArray(4, 1);\r
- new OrGate(1, c, a, b);\r
- a.createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ZERO, Bit.ZERO);\r
- b.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ZERO, Bit.ONE);\r
+ Wire a = new Wire(4, 1), b = new Wire(4, 3), c = new Wire(4, 1);\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
Simulation.TIMELINE.executeAll();\r
\r
}\r
\r
@Test\r
- void xorTest() {\r
+ void xorTest()\r
+ {\r
Simulation.TIMELINE.reset();\r
- WireArray a = new WireArray(3, 1), b = new WireArray(3, 2), c = new WireArray(3, 1), d = new WireArray(3, 1);\r
- new XorGate(1, d, a, b, c);\r
- a.createInput().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE);\r
- b.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);\r
- c.createInput().feedSignals(Bit.ONE, Bit.ZERO, Bit.ONE);\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.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
\r
Simulation.TIMELINE.executeAll();\r
\r
}\r
\r
@Test\r
- void rsLatchCircuitTest() {\r
+ void notTest()\r
+ {\r
+ Simulation.TIMELINE.reset();\r
+ Wire a = new Wire(3, 1), b = new Wire(3, 2);\r
+ new NotGate(1, a.createReadOnlyEnd(), b.createEnd());\r
+ a.createEnd().feedSignals(Bit.ZERO, Bit.ONE, Bit.ONE);\r
+\r
+ Simulation.TIMELINE.executeAll();\r
+\r
+ assertBitArrayEquals(b.getValues(), Bit.ONE, Bit.ZERO, Bit.ZERO);\r
+ }\r
+\r
+ @Test\r
+ void rsLatchCircuitTest()\r
+ {\r
Simulation.TIMELINE.reset();\r
- WireArray r = new WireArray(1, 1), s = new WireArray(1, 1), t1 = new WireArray(1, 15), t2 = new WireArray(1, 1),\r
- q = new WireArray(1, 1), nq = new WireArray(1, 1);\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, r, nq);\r
- new OrGate(1, t1, s, q);\r
- new NotGate(1, t2, q);\r
- new NotGate(1, t1, nq);\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
- WireArrayInput sIn = s.createInput(), rIn = r.createInput();\r
+ WireEnd sIn = s.createEnd(), rIn = r.createEnd();\r
\r
sIn.feedSignals(Bit.ONE);\r
rIn.feedSignals(Bit.ZERO);\r
}\r
\r
@Test\r
- void numericValueTest() {\r
+ void numericValueTest()\r
+ {\r
Simulation.TIMELINE.reset();\r
\r
- WireArray a = new WireArray(4, 1);\r
- a.createInput().feedSignals(Bit.ONE, Bit.ONE, Bit.ONE, Bit.ONE);\r
+ Wire a = new Wire(4, 1);\r
+ a.createEnd().feedSignals(Bit.ONE, Bit.ONE, Bit.ONE, Bit.ONE);\r
\r
Simulation.TIMELINE.executeAll();\r
\r
}\r
\r
@Test\r
- void multipleInputs() {\r
+ void multipleInputs()\r
+ {\r
Simulation.TIMELINE.reset();\r
- WireArray w = new WireArray(2, 1);\r
- WireArrayInput wI1 = w.createInput(), wI2 = w.createInput();\r
+ Wire w = new Wire(2, 1);\r
+ WireEnd wI1 = w.createEnd(), wI2 = w.createEnd();\r
wI1.feedSignals(Bit.ONE, Bit.Z);\r
wI2.feedSignals(Bit.Z, Bit.X);\r
Simulation.TIMELINE.executeAll();\r
}\r
\r
@Test\r
- void wireConnections() {\r
+ void wireConnections()\r
+ {\r
// Nur ein Experiment, was über mehrere 'passive' Bausteine hinweg passieren würde\r
\r
Simulation.TIMELINE.reset();\r
\r
- WireArray a = new WireArray(1, 2);\r
- WireArray b = new WireArray(1, 2);\r
- WireArray c = new WireArray(1, 2);\r
- WireArrayInput aI = a.createInput();\r
- WireArrayInput bI = b.createInput();\r
- WireArrayInput cI = c.createInput();\r
+ Wire a = new Wire(1, 2);\r
+ Wire b = new Wire(1, 2);\r
+ Wire c = new Wire(1, 2);\r
+ WireEnd aI = a.createEnd();\r
+ WireEnd bI = b.createEnd();\r
+ WireEnd cI = c.createEnd();\r
\r
- TestBitDisplay test = new TestBitDisplay(c);\r
- TestBitDisplay test2 = new TestBitDisplay(a);\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
cI.feedSignals(Bit.Z);\r
test.assertAfterSimulationIs(print, Bit.Z);\r
\r
- new Connector(b, c);\r
+ new Connector(b.createEnd(), c.createEnd()).connect();\r
test.assertAfterSimulationIs(print, Bit.Z);\r
System.err.println("ONE");\r
bI.feedSignals(Bit.ONE);\r
bI.feedSignals(Bit.Z);\r
test.assertAfterSimulationIs(print, Bit.Z);\r
\r
- new Connector(a, b);\r
+ new Connector(a.createEnd(), b.createEnd()).connect();\r
System.err.println("Z 2");\r
aI.feedSignals(Bit.Z);\r
test.assertAfterSimulationIs(print, Bit.Z);\r
test2.assertAfterSimulationIs(Bit.ONE);\r
}\r
\r
- private static void assertBitArrayEquals(Bit[] actual, Bit... expected) {\r
- assertArrayEquals(expected, actual);\r
+ private static void assertBitArrayEquals(BitVector actual, Bit... expected)\r
+ {\r
+ assertArrayEquals(expected, actual.getBits());\r
}\r
}\r