projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Timeline now passed via constructor
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
components
/
gates
/
NotGate.java
diff --git
a/era.mi/src/era/mi/logic/components/gates/NotGate.java
b/era.mi/src/era/mi/logic/components/gates/NotGate.java
index
eb719b1
..
7831cd2
100644
(file)
--- a/
era.mi/src/era/mi/logic/components/gates/NotGate.java
+++ b/
era.mi/src/era/mi/logic/components/gates/NotGate.java
@@
-1,21
+1,20
@@
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.Util;
\r
import era.mi.logic.components.BasicComponent;
\r
import era.mi.logic.components.BasicComponent;
\r
-import era.mi.logic.wires.Wire.WireEnd;
\r
+import era.mi.logic.timeline.Timeline;
\r
+import era.mi.logic.wires.Wire.ReadEnd;
\r
+import era.mi.logic.wires.Wire.ReadWriteEnd;
\r
\r
public class NotGate extends BasicComponent
\r
{
\r
\r
public class NotGate extends BasicComponent
\r
{
\r
- private
Wire
End in;
\r
- private
Wir
eEnd out;
\r
+ private
Read
End in;
\r
+ private
ReadWrit
eEnd out;
\r
\r
\r
- public NotGate(
int processTime, WireEnd in, Wir
eEnd out)
\r
+ public NotGate(
Timeline timeline, int processTime, ReadEnd in, ReadWrit
eEnd out)
\r
{
\r
{
\r
- super(processTime);
\r
+ super(
timeline,
processTime);
\r
this.in = in;
\r
in.addObserver(this);
\r
this.out = out;
\r
this.in = in;
\r
in.addObserver(this);
\r
this.out = out;
\r
@@
-24,28
+23,28
@@
public class NotGate extends BasicComponent
@Override
\r
protected void compute()
\r
{
\r
@Override
\r
protected void compute()
\r
{
\r
- out.feedSignals(
Util.not(in.getValues()
));
\r
+ out.feedSignals(
in.getValues().not(
));
\r
}
\r
\r
}
\r
\r
- public
Wire
End getIn()
\r
+ public
Read
End getIn()
\r
{
\r
return in;
\r
}
\r
\r
{
\r
return in;
\r
}
\r
\r
- public
Wire
End getOut()
\r
+ public
Read
End getOut()
\r
{
\r
return out;
\r
}
\r
\r
@Override
\r
{
\r
return out;
\r
}
\r
\r
@Override
\r
- public List<
Wire
End> getAllInputs()
\r
+ public List<
Read
End> getAllInputs()
\r
{
\r
{
\r
- return
Collections.unmodifiableList(Arrays.asList(in)
);
\r
+ return
List.of(in
);
\r
}
\r
\r
@Override
\r
}
\r
\r
@Override
\r
- public List<
Wir
eEnd> getAllOutputs()
\r
+ public List<
ReadWrit
eEnd> getAllOutputs()
\r
{
\r
{
\r
- return
Collections.unmodifiableList(Arrays.asList(out)
);
\r
+ return
List.of(out
);
\r
}
\r
}
\r
}
\r
}
\r