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 360ff43..09321f1 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;
 
-import era.mi.logic.Bit;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayInput;
-import era.mi.logic.wires.WireArrayObserver;
+import era.mi.logic.types.Bit;
+import era.mi.logic.wires.Wire;
+import era.mi.logic.wires.Wire.WireEnd;
+import era.mi.logic.wires.WireObserver;
 
-public class Splitter implements WireArrayObserver {
-       private WireArray input;
-       private WireArrayInput[] outputs;
+public class Splitter implements WireObserver
+{
+       private WireEnd input;
+       private WireEnd[] outputs;
 
-       public Splitter(WireArray input, WireArray... outputs) {
+       public Splitter(WireEnd input, WireEnd... outputs)
+       {
                this.input = input;
-               this.outputs = WireArray.extractInputs(outputs);
+               this.outputs = outputs;
                input.addObserver(this);
                int length = 0;
-               for (WireArray out : outputs)
-                       length += out.length;
+               for (WireEnd out : outputs)
+                       length += out.length();
 
-               if (input.length != length)
+               if (input.length() != length)
                        throw new IllegalArgumentException(
                                        "The input of splitting one into n WireArrays must have length = a1.length() + a2.length() + ... + an.length().");
        }
 
-       protected void compute() {
+       protected void compute()
+       {
                int startIndex = 0;
                Bit[] inputBits = input.getValues();
-               for (int i = 0; i < outputs.length; i++) {
-                       Bit[] outputBits = new Bit[outputs[i].owner.length];
-                       System.arraycopy(inputBits, startIndex, outputBits, 0, outputs[i].owner.length);
+               for (int i = 0; i < outputs.length; i++)
+               {
+                       Bit[] outputBits = new Bit[outputs[i].length()];
+                       System.arraycopy(inputBits, startIndex, outputBits, 0, outputs[i].length());
                        outputs[i].feedSignals(outputBits);
-                       startIndex += outputs[i].owner.length;
+                       startIndex += outputs[i].length();
                }
        }
 
        @Override
-       public void update(WireArray initiator, Bit[] oldValues) {
+       public void update(Wire initiator, Bit[] oldValues)
+       {
                compute();
        }
 }