X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftests%2FConnector.java;h=99975dae67c763ebcd55568d8d4c861cdd063df9;hb=74aebd92f41d03f4a44c9a455ef8c05465136412;hp=23ec1bca1dc8fa22f67523d8a214305d72b6ca2d;hpb=830af2a47f501b4d31f68663b609d225eae603cd;p=Mograsim.git diff --git a/era.mi/src/era/mi/logic/tests/Connector.java b/era.mi/src/era/mi/logic/tests/Connector.java index 23ec1bca..99975dae 100644 --- a/era.mi/src/era/mi/logic/tests/Connector.java +++ b/era.mi/src/era/mi/logic/tests/Connector.java @@ -1,23 +1,22 @@ package era.mi.logic.tests; +import era.mi.logic.Bit; import era.mi.logic.Simulation; import era.mi.logic.wires.WireArray; import era.mi.logic.wires.WireArray.WireArrayInput; import era.mi.logic.wires.WireArrayObserver; -public class Connector implements WireArrayObserver -{ +public class Connector implements WireArrayObserver { private final WireArray a; - private final WireArray b; +// private final WireArray b; private final WireArrayInput aI; private final WireArrayInput bI; - public Connector(WireArray a, WireArray b) - { + public Connector(WireArray a, WireArray b) { if (a.length != b.length) - throw new IllegalArgumentException("WireArray width does not match: " + 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; +// this.b = b; a.addObserver(this); b.addObserver(this); aI = a.createInput(); @@ -25,10 +24,8 @@ public class Connector implements WireArrayObserver } @Override - public void update(WireArray initiator) - { - Simulation.TIMELINE.addEvent((e) -> - { + public void update(WireArray initiator, Bit[] oldValues) { + Simulation.TIMELINE.addEvent((e) -> { if (initiator == a) bI.feedSignals(aI.wireValuesExcludingMe()); else