X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FMerger.java;h=ab38066558adeef215f56adfba0ea7f9134f3528;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=17d1b57db8412fe0e1c87cfd14d492875fea2848;hpb=4712d3e6ee08461b7754dbfba1c9e82372bb474d;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/Merger.java b/era.mi/src/era/mi/logic/components/Merger.java
index 17d1b57d..ab380665 100644
--- a/era.mi/src/era/mi/logic/components/Merger.java
+++ b/era.mi/src/era/mi/logic/components/Merger.java
@@ -1,84 +1,85 @@
 package era.mi.logic.components;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
-import era.mi.logic.Bit;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayEnd;
-import era.mi.logic.wires.WireArrayObserver;
+import era.mi.logic.timeline.Timeline;
+import era.mi.logic.types.BitVector;
+import era.mi.logic.wires.Wire;
+import era.mi.logic.wires.Wire.ReadEnd;
+import era.mi.logic.wires.Wire.ReadWriteEnd;
+import era.mi.logic.wires.WireObserver;
 
-public class Merger implements WireArrayObserver, Component
+public class Merger extends Component implements WireObserver
 {
-	private WireArrayEnd outI;
-	private WireArray[] inputs;
+	private ReadWriteEnd out;
+	private ReadEnd[] inputs;
 	private int[] beginningIndex;
 
 	/**
 	 * 
-	 * @param union  The output of merging n {@link WireArray}s into one. Must have length = a1.length() + a2.length() + ... + an.length().
+	 * @param union  The output of merging n {@link Wire}s into one. Must have length = a1.length() + a2.length() + ... + an.length().
 	 * @param inputs The inputs to be merged into the union
 	 */
-	public Merger(WireArray union, WireArray... inputs)
+	public Merger(Timeline timeline, ReadWriteEnd union, ReadEnd... inputs)
 	{
+		super(timeline);
 		this.inputs = inputs;
-		this.outI = union.createInput();
+		this.out = union;
 		this.beginningIndex = new int[inputs.length];
 
 		int length = 0;
 		for (int i = 0; i < inputs.length; i++)
 		{
 			beginningIndex[i] = length;
-			length += inputs[i].length;
+			length += inputs[i].length();
 			inputs[i].addObserver(this);
 		}
 
-		if (length != union.length)
+		if (length != union.length())
 			throw new IllegalArgumentException(
 					"The output of merging n WireArrays into one must have length = a1.length() + a2.length() + ... + an.length().");
 	}
 
-	public WireArray getInput(int index)
+	public ReadEnd getInput(int index)
 	{
 		return inputs[index];
 	}
 
-	public WireArray getUnion()
+	public ReadEnd getUnion()
 	{
-		return outI.owner;
+		return out;
 	}
 
 	@Override
-	public void update(WireArray initiator, Bit[] oldValues)
+	public void update(ReadEnd initiator, BitVector oldValues)
 	{
 		int index = find(initiator);
 		int beginning = beginningIndex[index];
-		outI.feedSignals(beginning, initiator.getValues());
+		out.feedSignals(beginning, inputs[index].getValues());
 	}
 
-	private int find(WireArray w)
+	private int find(ReadEnd r)
 	{
 		for (int i = 0; i < inputs.length; i++)
-			if (inputs[i] == w)
+			if (inputs[i] == r)
 				return i;
 		return -1;
 	}
 
-	public WireArray[] getInputs()
+	public ReadEnd[] getInputs()
 	{
 		return inputs.clone();
 	}
 
 	@Override
-	public List<WireArray> getAllInputs()
+	public List<ReadEnd> getAllInputs()
 	{
-		return Collections.unmodifiableList(Arrays.asList(inputs));
+		return List.of(inputs);
 	}
 
 	@Override
-	public List<WireArray> getAllOutputs()
+	public List<ReadWriteEnd> getAllOutputs()
 	{
-		return Collections.unmodifiableList(Arrays.asList(outI.owner));
+		return List.of(out);
 	}
 }