X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftests%2FConnector.java;h=5e9c5761c19ebcfeae35ee58e916011857e92ec0;hb=2174689b35611c63b60f61c1e076ebb689977a6a;hp=112f6fc7cc34384526d564d72acd46aa52eac184;hpb=9ea0dc9cec7c1fd6adba4bb3806e328470416bd9;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 112f6fc7..5e9c5761 100644 --- a/era.mi/src/era/mi/logic/tests/Connector.java +++ b/era.mi/src/era/mi/logic/tests/Connector.java @@ -1,23 +1,24 @@ 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.WireArray.WireArrayEnd; import era.mi.logic.wires.WireArrayObserver; public class Connector implements WireArrayObserver { private final WireArray a; - private final WireArray b; - private final WireArrayInput aI; - private final WireArrayInput bI; +// private final WireArray b; + private final WireArrayEnd aI; + private final WireArrayEnd bI; public Connector(WireArray a, WireArray b) { if (a.length != b.length) - throw new IllegalArgumentException(String.format("WireArray width does not match: %o, %o", 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,7 +26,7 @@ public class Connector implements WireArrayObserver } @Override - public void update(WireArray initiator) + public void update(WireArray initiator, Bit[] oldValues) { Simulation.TIMELINE.addEvent((e) -> {