Added project specific format; Default values in WireArray are now U

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

diff --git a/era.mi/src/era/mi/logic/components/gates/OrGate.java b/era.mi/src/era/mi/logic/components/gates/OrGate.java
index 06296ba..0050a77 100644 (file)
--- a/era.mi/src/era/mi/logic/components/gates/OrGate.java
+++ b/era.mi/src/era/mi/logic/components/gates/OrGate.java
@@ -1,40 +1,12 @@
 package era.mi.logic.components.gates;
 
 import era.mi.logic.Util;
-import era.mi.logic.WireArray;
-import era.mi.logic.components.BasicComponent;
+import era.mi.logic.wires.WireArray;
 
-public class OrGate extends BasicComponent
+public class OrGate extends MultiInputGate
 {
-       private WireArray a, b, out;
-       
-       public OrGate(int processTime, WireArray a, WireArray b, WireArray out)
+       public OrGate(int processTime, WireArray out, WireArray... in)
        {
-               super(processTime);
-               this.a = a;
-               a.addObserver(this);
-               this.b = b;
-               b.addObserver(this);
-               this.out = out;
-       }
-
-       protected void compute()
-       {
-               out.feedSignals(Util.or(a.getValues(), b.getValues()));
-       }
-
-       public WireArray getA()
-       {
-               return a;
-       }
-
-       public WireArray getB()
-       {
-               return b;
-       }
-
-       public WireArray getOut()
-       {
-               return out;
+               super(processTime, Util::or, out, in);
        }
 }