X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FDemux.java;h=24fd29baa431d6e91c3f09d2d293be2e0ac80e89;hb=f2cd90fa2b844507bc9697d3af1f3e18aac80b37;hp=f77aa382b25ae7e2c474d2a1901ec43fa86c733b;hpb=72b00816f86e5d34d871c87fea76a94ffca25246;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 f77aa382..24fd29ba 100644
--- a/era.mi/src/era/mi/logic/components/Demux.java
+++ b/era.mi/src/era/mi/logic/components/Demux.java
@@ -1,41 +1,42 @@
 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.wires.WireArray.WireArrayEnd;
 
 /**
- * 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 outputs {@link WireArray}s, one of which, as determined by select, receives the input
+ * signal.
  * 
  * @author Fabian Stemmler
  *
  */
-public class Demux extends BasicComponent {
+public class Demux extends BasicComponent
+{
 	private final WireArray select, in;
 	private final WireArray[] outputs;
-	private final WireArrayInput[] outputsI;
+	private final WireArrayEnd[] outputsI;
 	private final int outputSize;
 	private int selected = -1;
 
 	/**
-	 * Input {@link WireArray}s and out must be of uniform length
+	 * Output {@link WireArray}s and in 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
+	 * @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(int processTime, WireArray in, WireArray select, WireArray... outputs)
+	{
 		super(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++) {
+		this.outputsI = new WireArrayEnd[outputs.length];
+		for (int i = 0; i < this.outputsI.length; i++)
+		{
 			if (outputs[i].length != outputSize)
 				throw new IllegalArgumentException("All DEMUX wire arrays must be of uniform length!");
 			this.outputsI[i] = outputs[i].createInput();
@@ -52,7 +53,8 @@ public class Demux extends BasicComponent {
 	}
 
 	@Override
-	public void compute() {
+	public void compute()
+	{
 		int selectValue = select.hasNumericValue() ? (int) select.getUnsignedValue() : -1;
 		if (selectValue >= outputsI.length)
 			selectValue = -1;
@@ -67,12 +69,14 @@ public class Demux extends BasicComponent {
 	}
 
 	@Override
-	public List<WireArray> getAllInputs() {
-		return Collections.unmodifiableList(Arrays.asList(in, select));
+	public List<WireArray> getAllInputs()
+	{
+		return List.of(in, select);
 	}
 
 	@Override
-	public List<WireArray> getAllOutputs() {
-		return Collections.unmodifiableList(Arrays.asList(outputs));
+	public List<WireArray> getAllOutputs()
+	{
+		return List.of(outputs);
 	}
 }