X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FDemux.java;h=3b267dfef61843b5d5f6e0e4b9216c0e8b921d12;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=e5f49f419c997251f0283a4f9ff5fb7e6186588c;hpb=bcf8d773c7a836c2ee17e17a49c296ebf31d2777;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/Demux.java b/era.mi/src/era/mi/logic/components/Demux.java
index e5f49f41..3b267dfe 100644
--- a/era.mi/src/era/mi/logic/components/Demux.java
+++ b/era.mi/src/era/mi/logic/components/Demux.java
@@ -1,83 +1,82 @@
 package era.mi.logic.components;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayInput;
+import era.mi.logic.timeline.Timeline;
+import era.mi.logic.wires.Wire;
+import era.mi.logic.wires.Wire.ReadEnd;
+import era.mi.logic.wires.Wire.ReadWriteEnd;
 
 /**
- * Models a multiplexer. Takes an arbitrary amount of input {@link WireArray}s, one of which,
- * as determined by select, is put through to the output.
+ * Models a multiplexer. Takes an arbitrary amount of input {@link Wire}s, one of which, as determined by select, is put through to the
+ * output.
+ * 
  * @author Fabian Stemmler
  *
  */
 public class Demux extends BasicComponent
 {
-	private final WireArray select, in;
-	private final WireArray[] outputs;
-	private final WireArrayInput[] outputsI;
+	private final ReadEnd select, in;
+	private final ReadWriteEnd[] outputs;
 	private final int outputSize;
 	private int selected = -1;
-	
+
 	/**
-	 * Input {@link WireArray}s and out must be of uniform length
-	 * @param out Must be of uniform length with all inputs.
-	 * @param select Indexes the input array which is to be mapped to the output. Must have enough bits
-	 * to index all inputs.
-	 * @param outputs One of these inputs is mapped to the output, depending on the select bits
+	 * Output {@link Wire}s and in must be of uniform length
+	 * 
+	 * @param in      Must be of uniform length with all outputs.
+	 * @param select  Indexes the output array to which the input is mapped. Must have enough bits to index all outputs.
+	 * @param outputs One of these outputs receives the input signal, depending on the select bits
 	 */
-	public Demux(int processTime, WireArray in, WireArray select, WireArray... outputs)
+	public Demux(Timeline timeline, int processTime, ReadEnd in, ReadEnd select, ReadWriteEnd... outputs)
 	{
-		super(processTime);
-		outputSize = in.length;
-		
+		super(timeline, processTime);
+		outputSize = in.length();
+
 		this.in = in;
 		this.outputs = outputs;
-		this.outputsI = new WireArrayInput[outputs.length];
-		for(int i = 0; i < this.outputsI.length; i++)
+		for (int i = 0; i < this.outputs.length; i++)
 		{
-			if(outputs[i].length != outputSize)
+			if (outputs[i].length() != outputSize)
 				throw new IllegalArgumentException("All DEMUX wire arrays must be of uniform length!");
-			this.outputsI[i] = outputs[i].createInput();
+			this.outputs[i] = outputs[i];
 		}
-		
+
 		this.select = select;
 		select.addObserver(this);
-		
-		int maxInputs = 1 << select.length;
-		if(this.outputsI.length > maxInputs)
-			throw new IllegalArgumentException("There are more outputs ("
-					+ this.outputsI.length + ") to the DEMUX than supported by "
-					+ select.length + " select bits (" + maxInputs + ").");
+
+		int maxInputs = 1 << select.length();
+		if (this.outputs.length > maxInputs)
+			throw new IllegalArgumentException("There are more outputs (" + this.outputs.length + ") to the DEMUX than supported by "
+					+ select.length() + " select bits (" + maxInputs + ").");
 		in.addObserver(this);
 	}
 
 	@Override
-	public void compute() {
+	public void compute()
+	{
 		int selectValue = select.hasNumericValue() ? (int) select.getUnsignedValue() : -1;
-		if(selectValue >= outputsI.length)
+		if (selectValue >= outputs.length)
 			selectValue = -1;
-		
-		if(selected != selectValue && selected != -1)
-			outputsI[selected].clearSignals();
-		
+
+		if (selected != selectValue && selected != -1)
+			outputs[selected].clearSignals();
+
 		selected = selectValue;
-		
-		if(selectValue != -1)
-			outputsI[selectValue].feedSignals(in.getValues());
+
+		if (selectValue != -1)
+			outputs[selectValue].feedSignals(in.getValues());
 	}
 
 	@Override
-	public List<WireArray> getAllInputs()
+	public List<ReadEnd> getAllInputs()
 	{
-		return Collections.unmodifiableList(Arrays.asList(in, select));
+		return List.of(in, select);
 	}
 
 	@Override
-	public List<WireArray> getAllOutputs()
+	public List<ReadWriteEnd> getAllOutputs()
 	{
-		return Collections.unmodifiableList(Arrays.asList(outputs));
+		return List.of(outputs);
 	}
 }