Exchanged all Bit[] by BitVector, tests work

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

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