X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2Fgates%2FXorGate.java;h=a177695e709726c72286aa2191fd6750bf74b439;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=b13dd2bc9a2b78633418e8b1e4bd6280dca4e59f;hpb=bcf8d773c7a836c2ee17e17a49c296ebf31d2777;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/gates/XorGate.java b/era.mi/src/era/mi/logic/components/gates/XorGate.java
index b13dd2bc..a177695e 100644
--- a/era.mi/src/era/mi/logic/components/gates/XorGate.java
+++ b/era.mi/src/era/mi/logic/components/gates/XorGate.java
@@ -1,58 +1,20 @@
 package era.mi.logic.components.gates;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-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 XorGate extends BasicComponent
+import era.mi.logic.timeline.Timeline;
+import era.mi.logic.types.BitVector.BitVectorMutator;
+import era.mi.logic.wires.Wire.ReadEnd;
+import era.mi.logic.wires.Wire.ReadWriteEnd;
+
+/**
+ * Outputs 1 when the number of 1 inputs is odd.
+ * 
+ * @author Fabian Stemmler
+ */
+public class XorGate extends MultiInputGate
 {
-	private WireArray a, b, out;
-	private WireArrayInput outI;
-	
-	public XorGate(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()
-	{
-		outI.feedSignals(Util.xor(a.getValues(), b.getValues()));
-	}
-
-	public WireArray getA()
-	{
-		return a;
-	}
-
-	public WireArray getB()
+	public XorGate(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd... in)
 	{
-		return b;
+		super(timeline, processTime, BitVectorMutator::xor, out, in);
 	}
 
-	public WireArray getOut()
-	{
-		return out;
-	}
-	
-	@Override
-	public List<WireArray> getAllInputs()
-	{
-		return Collections.unmodifiableList(Arrays.asList(a, b));
-	}
-
-	@Override
-	public List<WireArray> getAllOutputs()
-	{
-		return Collections.unmodifiableList(Arrays.asList(out));
-	}
 }