X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FSplitter.java;h=8c54d0f9f6e6475ae72aea6c7c8c8f48c22a4abb;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=5475fa1746d416a3a02d93659cd2b79f77bcb83a;hpb=49f569b513c36e8ad421fd5a547bf34bd830652a;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 5475fa17..8c54d0f9 100644
--- a/era.mi/src/era/mi/logic/components/Splitter.java
+++ b/era.mi/src/era/mi/logic/components/Splitter.java
@@ -1,44 +1,59 @@
 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 java.util.List;
 
-public class Splitter implements WireArrayObserver
+import era.mi.logic.timeline.Timeline;
+import era.mi.logic.types.BitVector;
+import era.mi.logic.wires.Wire.ReadEnd;
+import era.mi.logic.wires.Wire.ReadWriteEnd;
+import era.mi.logic.wires.WireObserver;
+
+public class Splitter extends Component implements WireObserver
 {
-	private WireArray input;
-	private WireArrayInput[] outputs;
-	
-	public Splitter(WireArray input, WireArray... outputs)
+	private ReadEnd input;
+	private ReadWriteEnd[] outputs;
+
+	public Splitter(Timeline timeline, ReadEnd input, ReadWriteEnd... outputs)
 	{
+		super(timeline);
 		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 (ReadEnd 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()
 	{
+		BitVector inputBits = input.getValues();
 		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);
-			outputs[i].feedSignals(outputBits);
-			startIndex += outputs[i].owner.length;
+			outputs[i].feedSignals(inputBits.subVector(startIndex, startIndex + outputs[i].length()));
+			startIndex += outputs[i].length();
 		}
 	}
-	
+
 	@Override
-	public void update(WireArray initiator)
+	public void update(ReadEnd initiator, BitVector oldValues)
 	{
 		compute();
 	}
+
+	@Override
+	public List<ReadEnd> getAllInputs()
+	{
+		return List.of(input);
+	}
+
+	@Override
+	public List<ReadWriteEnd> getAllOutputs()
+	{
+		return List.of(outputs);
+	}
 }