Timeline now passed via constructor

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

diff --git a/era.mi/src/era/mi/logic/components/Mux.java b/era.mi/src/era/mi/logic/components/Mux.java
index 675c070..818a175 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Mux.java
+++ b/era.mi/src/era/mi/logic/components/Mux.java
@@ -5,8 +5,10 @@ import java.util.Arrays;
 import java.util.Collections;\r
 import java.util.List;\r
 \r
+import era.mi.logic.timeline.Timeline;\r
 import era.mi.logic.wires.Wire;\r
-import era.mi.logic.wires.Wire.WireEnd;\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 Wire}s, one of which, as determined by select, is put through to the\r
@@ -17,9 +19,9 @@ import era.mi.logic.wires.Wire.WireEnd;
  */\r
 public class Mux extends BasicComponent\r
 {\r
-       private WireEnd select;\r
-       private WireEnd out;\r
-       private WireEnd[] inputs;\r
+       private ReadEnd select;\r
+       private ReadWriteEnd out;\r
+       private ReadEnd[] inputs;\r
        private final int outputSize;\r
 \r
        /**\r
@@ -29,9 +31,9 @@ public class Mux extends BasicComponent
         * @param select Indexes the input array which is to be mapped to the output. Must have enough bits to index all inputs.\r
         * @param inputs One of these inputs is mapped to the output, depending on the select bits\r
         */\r
-       public Mux(int processTime, WireEnd out, WireEnd select, WireEnd... inputs)\r
+       public Mux(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd select, ReadEnd... inputs)\r
        {\r
-               super(processTime);\r
+               super(timeline, processTime);\r
                outputSize = out.length();\r
 \r
                this.inputs = inputs.clone();\r
@@ -53,12 +55,12 @@ public class Mux extends BasicComponent
                this.out = out;\r
        }\r
 \r
-       public WireEnd getOut()\r
+       public ReadEnd getOut()\r
        {\r
                return out;\r
        }\r
 \r
-       public WireEnd getSelect()\r
+       public ReadEnd getSelect()\r
        {\r
                return select;\r
        }\r
@@ -73,20 +75,20 @@ public class Mux extends BasicComponent
                        return;\r
                }\r
 \r
-               WireEnd active = inputs[selectValue];\r
+               ReadEnd active = inputs[selectValue];\r
                out.feedSignals(active.getValues());\r
        }\r
 \r
        @Override\r
-       public List<WireEnd> getAllInputs()\r
+       public List<ReadEnd> getAllInputs()\r
        {\r
-               ArrayList<WireEnd> wires = new ArrayList<WireEnd>(Arrays.asList(inputs));\r
+               ArrayList<ReadEnd> wires = new ArrayList<ReadEnd>(Arrays.asList(inputs));\r
                wires.add(select);\r
                return Collections.unmodifiableList(wires);\r
        }\r
 \r
        @Override\r
-       public List<WireEnd> getAllOutputs()\r
+       public List<ReadWriteEnd> getAllOutputs()\r
        {\r
                return List.of(out);\r
        }\r