X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FBasicComponent.java;h=47a3057a09cdbbab8922b87574aa521b0de6c49d;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=0a22950f20c17aa3891b8be4f9c3837bd214143e;hpb=dcbba0b189fd37135adc4487f1b8b645e7045bc4;p=Mograsim.git diff --git a/era.mi/src/era/mi/logic/components/BasicComponent.java b/era.mi/src/era/mi/logic/components/BasicComponent.java index 0a22950f..47a3057a 100644 --- a/era.mi/src/era/mi/logic/components/BasicComponent.java +++ b/era.mi/src/era/mi/logic/components/BasicComponent.java @@ -1,8 +1,8 @@ package era.mi.logic.components; -import era.mi.logic.Simulation; -import era.mi.logic.types.Bit; -import era.mi.logic.wires.Wire; +import era.mi.logic.timeline.Timeline; +import era.mi.logic.types.BitVector; +import era.mi.logic.wires.Wire.ReadEnd; import era.mi.logic.wires.WireObserver; /** @@ -10,7 +10,7 @@ import era.mi.logic.wires.WireObserver; * * @author Fabian Stemmler */ -public abstract class BasicComponent implements WireObserver, Component +public abstract class BasicComponent extends Component implements WireObserver { private int processTime; @@ -20,15 +20,16 @@ public abstract class BasicComponent implements WireObserver, Component * * @author Fabian Stemmler */ - public BasicComponent(int processTime) + public BasicComponent(Timeline timeline, int processTime) { + super(timeline); this.processTime = processTime > 0 ? processTime : 1; } @Override - public void update(Wire initiator, Bit[] oldValues) + public void update(ReadEnd initiator, BitVector oldValues) { - Simulation.TIMELINE.addEvent(e -> compute(), processTime); + timeline.addEvent(e -> compute(), processTime); } protected abstract void compute();