X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FSplitter.java;h=37e940157090ce93ff62679a8180c7e37baf21b0;hb=4712d3e6ee08461b7754dbfba1c9e82372bb474d;hp=48db52d99416ee278b2ad4dbc6fa1fe30e9c150f;hpb=a4c5cfb856026771dfcf31eb22434b8b6ff20ad4;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 48db52d9..37e94015 100644
--- a/era.mi/src/era/mi/logic/components/Splitter.java
+++ b/era.mi/src/era/mi/logic/components/Splitter.java
@@ -1,52 +1,44 @@
 package era.mi.logic.components;
 
 import era.mi.logic.Bit;
-import era.mi.logic.WireArray;
-import era.mi.logic.WireArrayObserver;
+import era.mi.logic.wires.WireArray;
+import era.mi.logic.wires.WireArray.WireArrayEnd;
+import era.mi.logic.wires.WireArrayObserver;
 
 public class Splitter implements WireArrayObserver
 {
 	private WireArray input;
-	private WireArray[] outputs;
-	
+	private WireArrayEnd[] 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)
-			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().");
+		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().");
 	}
 
 	protected void compute()
 	{
 		int startIndex = 0;
 		Bit[] inputBits = input.getValues();
-		for(int i = 0; i < outputs.length; i++)
+		for (int i = 0; i < outputs.length; i++)
 		{
-			Bit[] outputBits = new Bit[outputs[i].length()];
-			System.arraycopy(inputBits, startIndex, outputBits, 0, outputs[i].length());
+			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();
 	}