projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged logicui 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
225a35a
..
34ba217
100644
(file)
--- a/
era.mi/src/era/mi/logic/components/Merger.java
+++ b/
era.mi/src/era/mi/logic/components/Merger.java
@@
-1,15
+1,13
@@
package era.mi.logic.components;
package era.mi.logic.components;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.List;
-import era.mi.logic.
Bit
;
+import era.mi.logic.
types.BitVector
;
import era.mi.logic.wires.Wire;
import era.mi.logic.wires.Wire.WireEnd;
import era.mi.logic.wires.Wire;
import era.mi.logic.wires.Wire.WireEnd;
-import era.mi.logic.wires.Wire
Array
Observer;
+import era.mi.logic.wires.WireObserver;
-public class Merger implements Wire
Array
Observer, Component
+public class Merger implements WireObserver, Component
{
private WireEnd out;
private WireEnd[] inputs;
{
private WireEnd out;
private WireEnd[] inputs;
@@
-50,7
+48,7
@@
public class Merger implements WireArrayObserver, Component
}
@Override
}
@Override
- public void update(Wire initiator, Bit
[]
oldValues)
+ public void update(Wire initiator, Bit
Vector
oldValues)
{
int index = find(initiator);
int beginning = beginningIndex[index];
{
int index = find(initiator);
int beginning = beginningIndex[index];
@@
-73,12
+71,12
@@
public class Merger implements WireArrayObserver, Component
@Override
public List<WireEnd> getAllInputs()
{
@Override
public List<WireEnd> getAllInputs()
{
- return
Collections.unmodifiableList(Arrays.asList(inputs)
);
+ return
List.of(inputs
);
}
@Override
public List<WireEnd> getAllOutputs()
{
}
@Override
public List<WireEnd> getAllOutputs()
{
- return
Collections.unmodifiableList(Arrays.asList(out)
);
+ return
List.of(out
);
}
}
}
}