Exchanged all Bit[] by BitVector, tests work

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

diff --git a/era.mi/src/era/mi/logic/components/gates/AndGate.java b/era.mi/src/era/mi/logic/components/gates/AndGate.java
index 762eeef..a24acc7 100644 (file)
--- a/era.mi/src/era/mi/logic/components/gates/AndGate.java
+++ b/era.mi/src/era/mi/logic/components/gates/AndGate.java
@@ -1,40 +1,12 @@
-package era.mi.logic.components.gates;
-
-import era.mi.logic.Util;
-import era.mi.logic.WireArray;
-import era.mi.logic.components.BasicComponent;
-
-public class AndGate extends BasicComponent
-{
-       private WireArray a, b, out;
-       
-       public AndGate(int processTime, WireArray a, WireArray b, WireArray out)
-       {
-               super(processTime);
-               this.a = a;
-               a.addObserver(this);
-               this.b = b;
-               b.addObserver(this);
-               this.out = out;
-       }
-
-       protected void compute()
-       {
-               out.feedSignals(Util.and(a.getValues(), b.getValues()));
-       }
-
-       public WireArray getA()
-       {
-               return a;
-       }
-
-       public WireArray getB()
-       {
-               return b;
-       }
-
-       public WireArray getOut()
-       {
-               return out;
-       }
-}
+package era.mi.logic.components.gates;\r
+\r
+import era.mi.logic.types.BitVector.BitVectorMutator;\r
+import era.mi.logic.wires.Wire.WireEnd;\r
+\r
+public class AndGate extends MultiInputGate\r
+{\r
+       public AndGate(int processTime, WireEnd out, WireEnd... in)\r
+       {\r
+               super(processTime, BitVectorMutator::and, out, in);\r
+       }\r
+}\r