X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Ftests%2FConnector.java;h=39645bfc3af569b92ea2ceea5db06a2517bab56f;hb=953984f215af2b455477d42db469b119c016439b;hp=9a8d3fc004f1088f010736778229642f447ec96c;hpb=4712d3e6ee08461b7754dbfba1c9e82372bb474d;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 9a8d3fc0..39645bfc 100644 --- a/era.mi/src/era/mi/logic/tests/Connector.java +++ b/era.mi/src/era/mi/logic/tests/Connector.java @@ -2,18 +2,18 @@ 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.WireArrayEnd; -import era.mi.logic.wires.WireArrayObserver; +import era.mi.logic.wires.Wire; +import era.mi.logic.wires.Wire.WireEnd; +import era.mi.logic.wires.WireObserver; -public class Connector implements WireArrayObserver +public class Connector implements WireObserver { - private final WireArray a; + private final Wire a; // private final WireArray b; - private final WireArrayEnd aI; - private final WireArrayEnd bI; + private final WireEnd aI; + private final WireEnd bI; - public Connector(WireArray a, WireArray b) + 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)); @@ -21,12 +21,12 @@ public class Connector implements WireArrayObserver // this.b = b; a.addObserver(this); b.addObserver(this); - aI = a.createInput(); - bI = b.createInput(); + aI = a.createEnd(); + bI = b.createEnd(); } @Override - public void update(WireArray initiator, Bit[] oldValues) + public void update(Wire initiator, Bit[] oldValues) { Simulation.TIMELINE.addEvent((e) -> {