projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Exchanged all Bit[] by BitVector, tests work
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
components
/
BitDisplay.java
diff --git
a/era.mi/src/era/mi/logic/components/BitDisplay.java
b/era.mi/src/era/mi/logic/components/BitDisplay.java
index
25ee2f8
..
f11fdf8
100644
(file)
--- a/
era.mi/src/era/mi/logic/components/BitDisplay.java
+++ b/
era.mi/src/era/mi/logic/components/BitDisplay.java
@@
-1,18
+1,18
@@
package era.mi.logic.components;
\r
\r
package era.mi.logic.components;
\r
\r
-import java.util.ArrayList;
\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.wires.WireArray;
\r
+import era.mi.logic.types.Bit;
\r
+import era.mi.logic.types.BitVector;
\r
+import era.mi.logic.wires.Wire.WireEnd;
\r
\r
\r
-public class BitDisplay extends BasicComponent {
\r
- private final WireArray in;
\r
- private Bit[] displayedValue;
\r
+public class BitDisplay extends BasicComponent
\r
+{
\r
+ private final WireEnd in;
\r
+ private BitVector displayedValue;
\r
\r
\r
- public BitDisplay(WireArray in) {
\r
+ public BitDisplay(WireEnd in)
\r
+ {
\r
super(1);
\r
this.in = in;
\r
in.addObserver(this);
\r
super(1);
\r
this.in = in;
\r
in.addObserver(this);
\r
@@
-20,25
+20,30
@@
public class BitDisplay extends BasicComponent {
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r
- protected void compute() {
\r
+ protected void compute()
\r
+ {
\r
displayedValue = in.getValues();
\r
}
\r
\r
displayedValue = in.getValues();
\r
}
\r
\r
- public Bit[] getDisplayedValue() {
\r
+ public BitVector getDisplayedValue()
\r
+ {
\r
return displayedValue;
\r
}
\r
\r
return displayedValue;
\r
}
\r
\r
- public boolean isDisplaying(Bit... values) {
\r
- return Arrays.equals(displayedValue, values);
\r
+ public boolean isDisplaying(Bit... values)
\r
+ {
\r
+ return displayedValue.equals(BitVector.of(values));
\r
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r
- public List<WireArray> getAllInputs() {
\r
- return Collections.unmodifiableList(Arrays.asList(in));
\r
+ public List<WireEnd> getAllInputs()
\r
+ {
\r
+ return List.of(in);
\r
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r
- public List<WireArray> getAllOutputs() {
\r
- return Collections.unmodifiableList(new ArrayList<WireArray>());
\r
+ public List<WireEnd> getAllOutputs()
\r
+ {
\r
+ return List.of();
\r
}
\r
}
\r
}
\r
}
\r