Timeline now passed via constructor

[Mograsim.git] / era.mi / src / era / mi / logic / components / Demux.java

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