Integrated new types, tests still work, not used yet

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

diff --git a/era.mi/src/era/mi/logic/components/Splitter.java b/era.mi/src/era/mi/logic/components/Splitter.java
index ff23e5c..760da8f 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Splitter.java
+++ b/era.mi/src/era/mi/logic/components/Splitter.java
@@ -1,40 +1,45 @@
 package era.mi.logic.components;\r
 \r
-import era.mi.logic.Bit;\r
-import era.mi.logic.wires.WireArray;\r
-import era.mi.logic.wires.WireArray.WireArrayInput;\r
-import era.mi.logic.wires.WireArrayObserver;\r
+import era.mi.logic.types.Bit;\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 Splitter implements WireArrayObserver {\r
-       private WireArray input;\r
-       private WireArrayInput[] outputs;\r
+public class Splitter implements WireObserver\r
+{\r
+       private WireEnd input;\r
+       private WireEnd[] outputs;\r
 \r
-       public Splitter(WireArray input, WireArray... outputs) {\r
+       public Splitter(WireEnd input, WireEnd... outputs)\r
+       {\r
                this.input = input;\r
-               this.outputs = WireArray.extractInputs(outputs);\r
+               this.outputs = outputs;\r
                input.addObserver(this);\r
                int length = 0;\r
-               for (WireArray out : outputs)\r
-                       length += out.length;\r
+               for (WireEnd out : outputs)\r
+                       length += out.length();\r
 \r
-               if (input.length != length)\r
+               if (input.length() != length)\r
                        throw new IllegalArgumentException(\r
                                        "The input of splitting one into n WireArrays must have length = a1.length() + a2.length() + ... + an.length().");\r
        }\r
 \r
-       protected void compute() {\r
+       protected void compute()\r
+       {\r
                int startIndex = 0;\r
                Bit[] inputBits = input.getValues();\r
-               for (int i = 0; i < outputs.length; i++) {\r
-                       Bit[] outputBits = new Bit[outputs[i].owner.length];\r
-                       System.arraycopy(inputBits, startIndex, outputBits, 0, outputs[i].owner.length);\r
+               for (int i = 0; i < outputs.length; i++)\r
+               {\r
+                       Bit[] outputBits = new Bit[outputs[i].length()];\r
+                       System.arraycopy(inputBits, startIndex, outputBits, 0, outputs[i].length());\r
                        outputs[i].feedSignals(outputBits);\r
-                       startIndex += outputs[i].owner.length;\r
+                       startIndex += outputs[i].length();\r
                }\r
        }\r
 \r
        @Override\r
-       public void update(WireArray initiator, Bit[] oldValues) {\r
+       public void update(Wire initiator, Bit[] oldValues)\r
+       {\r
                compute();\r
        }\r
 }\r