projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrated new types, tests still work, not used yet
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
components
/
gates
/
MultiInputGate.java
diff --git
a/era.mi/src/era/mi/logic/components/gates/MultiInputGate.java
b/era.mi/src/era/mi/logic/components/gates/MultiInputGate.java
index
bf83dea
..
7d0e485
100644
(file)
--- a/
era.mi/src/era/mi/logic/components/gates/MultiInputGate.java
+++ b/
era.mi/src/era/mi/logic/components/gates/MultiInputGate.java
@@
-1,11
+1,9
@@
package era.mi.logic.components.gates;
\r
\r
package era.mi.logic.components.gates;
\r
\r
-import java.util.Arrays;
\r
-import java.util.Collections;
\r
import java.util.List;
\r
\r
import java.util.List;
\r
\r
-import era.mi.logic.Bit;
\r
import era.mi.logic.components.BasicComponent;
\r
import era.mi.logic.components.BasicComponent;
\r
+import era.mi.logic.types.Bit;
\r
import era.mi.logic.wires.Wire.WireEnd;
\r
\r
public abstract class MultiInputGate extends BasicComponent
\r
import era.mi.logic.wires.Wire.WireEnd;
\r
\r
public abstract class MultiInputGate extends BasicComponent
\r
@@
-35,15
+33,16
@@
public abstract class MultiInputGate extends BasicComponent
@Override
\r
public List<WireEnd> getAllInputs()
\r
{
\r
@Override
\r
public List<WireEnd> getAllInputs()
\r
{
\r
- return
Collections.unmodifiableList(Arrays.asList(in)
);
\r
+ return
List.of(in
);
\r
}
\r
\r
@Override
\r
public List<WireEnd> getAllOutputs()
\r
{
\r
}
\r
\r
@Override
\r
public List<WireEnd> getAllOutputs()
\r
{
\r
- return
Collections.unmodifiableList(Arrays.asList(out)
);
\r
+ return
List.of(out
);
\r
}
\r
\r
}
\r
\r
+ @Override
\r
protected void compute()
\r
{
\r
Bit[] result = in[0].getValues();
\r
protected void compute()
\r
{
\r
Bit[] result = in[0].getValues();
\r