X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FSplitter.java;h=360ff431f6c0668606397d720598bd65f57b6973;hb=74aebd92f41d03f4a44c9a455ef8c05465136412;hp=58d48e7c563861d3555d1d862dabd6dca3f68c2c;hpb=ebe86d1517aea138ffb6485b7bd2dff31fdb1253;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/Splitter.java b/era.mi/src/era/mi/logic/components/Splitter.java
index 58d48e7c..360ff431 100644
--- a/era.mi/src/era/mi/logic/components/Splitter.java
+++ b/era.mi/src/era/mi/logic/components/Splitter.java
@@ -2,52 +2,39 @@ package era.mi.logic.components;
 
 import era.mi.logic.Bit;
 import era.mi.logic.wires.WireArray;
+import era.mi.logic.wires.WireArray.WireArrayInput;
 import era.mi.logic.wires.WireArrayObserver;
 
-public class Splitter implements WireArrayObserver
-{
+public class Splitter implements WireArrayObserver {
 	private WireArray input;
-	private WireArray[] outputs;
-	
-	public Splitter(WireArray input, WireArray... outputs)
-	{
+	private WireArrayInput[] outputs;
+
+	public Splitter(WireArray input, WireArray... outputs) {
 		this.input = input;
-		this.outputs = outputs;
+		this.outputs = WireArray.extractInputs(outputs);
 		input.addObserver(this);
 		int length = 0;
-		for(WireArray out : outputs)
+		for (WireArray out : outputs)
 			length += out.length;
-		
-		if(input.length != length)
-			throw new IllegalArgumentException("The input of splitting one into n WireArrays must have length = a1.length() + a2.length() + ... + an.length().");
+
+		if (input.length != length)
+			throw new IllegalArgumentException(
+					"The input of splitting one into n WireArrays must have length = a1.length() + a2.length() + ... + an.length().");
 	}
 
-	protected void compute()
-	{
+	protected void compute() {
 		int startIndex = 0;
 		Bit[] inputBits = input.getValues();
-		for(int i = 0; i < outputs.length; i++)
-		{
-			Bit[] outputBits = new Bit[outputs[i].length];
-			System.arraycopy(inputBits, startIndex, outputBits, 0, outputs[i].length);
+		for (int i = 0; i < outputs.length; i++) {
+			Bit[] outputBits = new Bit[outputs[i].owner.length];
+			System.arraycopy(inputBits, startIndex, outputBits, 0, outputs[i].owner.length);
 			outputs[i].feedSignals(outputBits);
-			startIndex += outputs[i].length;
+			startIndex += outputs[i].owner.length;
 		}
 	}
 
-	public WireArray getInput()
-	{
-		return input;
-	}
-	
-	public WireArray[] getOutputs()
-	{
-		return outputs.clone();
-	}
-	
 	@Override
-	public void update(WireArray initiator)
-	{
+	public void update(WireArray initiator, Bit[] oldValues) {
 		compute();
 	}
 }