X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2Fgates%2FAndGate.java;h=e045982fd5e6c4cbd74e55b650003f0ac75c1517;hb=b7ce41467a2cbd9f45554982730741810e99feaa;hp=5c814064ae6b24db0f53351a7a3641f051c6821f;hpb=bcf8d773c7a836c2ee17e17a49c296ebf31d2777;p=Mograsim.git

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 5c814064..e045982f 100644
--- a/era.mi/src/era/mi/logic/components/gates/AndGate.java
+++ b/era.mi/src/era/mi/logic/components/gates/AndGate.java
@@ -1,59 +1,13 @@
 package era.mi.logic.components.gates;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
+import era.mi.logic.types.BitVector.BitVectorMutator;
+import era.mi.logic.wires.Wire.ReadEnd;
+import era.mi.logic.wires.Wire.ReadWriteEnd;
 
-import era.mi.logic.Util;
-import era.mi.logic.components.BasicComponent;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayInput;
-
-public class AndGate extends BasicComponent
+public class AndGate extends MultiInputGate
 {
-	private WireArray a, b, out;
-	private WireArrayInput outI;
-	
-	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;
-		outI = out.createInput();
-	}
-
-	protected void compute()
-	{
-		outI.feedSignals(Util.and(a.getValues(), b.getValues()));
-	}
-
-	public WireArray getA()
-	{
-		return a;
-	}
-
-	public WireArray getB()
-	{
-		return b;
-	}
-
-	public WireArray getOut()
-	{
-		return out;
-	}
-
-	@Override
-	public List<WireArray> getAllInputs()
-	{
-		return Collections.unmodifiableList(Arrays.asList(a, b));
-	}
-
-	@Override
-	public List<WireArray> getAllOutputs()
+	public AndGate(int processTime, ReadWriteEnd out, ReadEnd... in)
 	{
-		return Collections.unmodifiableList(Arrays.asList(out));
+		super(processTime, BitVectorMutator::and, out, in);
 	}
 }