Merged logic into master

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