Exchanged all Bit[] by BitVector, tests work

[Mograsim.git] / era.mi / src / era / mi / logic / components / gates / NotGate.java

diff --git a/era.mi/src/era/mi/logic/components/gates/NotGate.java b/era.mi/src/era/mi/logic/components/gates/NotGate.java
index eaa9aec..7baf606 100644 (file)
--- a/era.mi/src/era/mi/logic/components/gates/NotGate.java
+++ b/era.mi/src/era/mi/logic/components/gates/NotGate.java
@@ -2,49 +2,46 @@ package era.mi.logic.components.gates;
 \r
 import java.util.List;\r
 \r
-import era.mi.logic.Util;\r
 import era.mi.logic.components.BasicComponent;\r
-import era.mi.logic.wires.WireArray;\r
-import era.mi.logic.wires.WireArray.WireArrayEnd;\r
+import era.mi.logic.wires.Wire.WireEnd;\r
 \r
 public class NotGate extends BasicComponent\r
 {\r
-       private WireArray in, out;\r
-       private WireArrayEnd outI;\r
+       private WireEnd in;\r
+       private WireEnd out;\r
 \r
-       public NotGate(int processTime, WireArray in, WireArray out)\r
+       public NotGate(int processTime, WireEnd in, WireEnd out)\r
        {\r
                super(processTime);\r
                this.in = in;\r
                in.addObserver(this);\r
                this.out = out;\r
-               outI = out.createInput();\r
        }\r
 \r
        @Override\r
-       public void compute()\r
+       protected void compute()\r
        {\r
-               outI.feedSignals(Util.not(in.getValues()));\r
+               out.feedSignals(in.getValues().not());\r
        }\r
 \r
-       public WireArray getIn()\r
+       public WireEnd getIn()\r
        {\r
                return in;\r
        }\r
 \r
-       public WireArray getOut()\r
+       public WireEnd getOut()\r
        {\r
                return out;\r
        }\r
 \r
        @Override\r
-       public List<WireArray> getAllInputs()\r
+       public List<WireEnd> getAllInputs()\r
        {\r
                return List.of(in);\r
        }\r
 \r
        @Override\r
-       public List<WireArray> getAllOutputs()\r
+       public List<WireEnd> getAllOutputs()\r
        {\r
                return List.of(out);\r
        }\r