X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FSplitter.java;h=09321f1760eadc2e5a7126ce4bbf9042eea561bd;hb=dcbba0b189fd37135adc4487f1b8b645e7045bc4;hp=2a52327a3b4f998eeb02a0950e5976e01d26fa4c;hpb=bcf8d773c7a836c2ee17e17a49c296ebf31d2777;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 2a52327a..09321f17 100644
--- a/era.mi/src/era/mi/logic/components/Splitter.java
+++ b/era.mi/src/era/mi/logic/components/Splitter.java
@@ -1,43 +1,44 @@
 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;
+import era.mi.logic.types.Bit;
+import era.mi.logic.wires.Wire;
+import era.mi.logic.wires.Wire.WireEnd;
+import era.mi.logic.wires.WireObserver;
 
-public class Splitter implements WireArrayObserver
+public class Splitter implements WireObserver
 {
-	private WireArray input;
-	private WireArrayInput[] outputs;
-	
-	public Splitter(WireArray input, WireArray... outputs)
+	private WireEnd input;
+	private WireEnd[] outputs;
+
+	public Splitter(WireEnd input, WireEnd... outputs)
 	{
 		this.input = input;
-		this.outputs = WireArray.extractInputs(outputs);
+		this.outputs = 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 (WireEnd 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].owner.length];
-			System.arraycopy(inputBits, startIndex, outputBits, 0, outputs[i].owner.length);
+			Bit[] outputBits = new Bit[outputs[i].length()];
+			System.arraycopy(inputBits, startIndex, outputBits, 0, outputs[i].length());
 			outputs[i].feedSignals(outputBits);
-			startIndex += outputs[i].owner.length;
+			startIndex += outputs[i].length();
 		}
 	}
-	
+
 	@Override
-	public void update(WireArray initiator, Bit[] oldValues)
+	public void update(Wire initiator, Bit[] oldValues)
 	{
 		compute();
 	}