X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FSplitter.java;h=5475fa1746d416a3a02d93659cd2b79f77bcb83a;hb=49f569b513c36e8ad421fd5a547bf34bd830652a;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..5475fa17 100644
--- a/era.mi/src/era/mi/logic/components/Splitter.java
+++ b/era.mi/src/era/mi/logic/components/Splitter.java
@@ -1,24 +1,25 @@
 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.WireArrayInput;
+import era.mi.logic.wires.WireArrayObserver;
 
 public class Splitter implements WireArrayObserver
 {
 	private WireArray input;
-	private 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)
-			length += out.length();
+			length += out.length;
 		
-		if(input.length() != 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().");
 	}
 
@@ -28,22 +29,12 @@ public class Splitter implements WireArrayObserver
 		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());
+			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)