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
c482115
..
685bc22
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,52
+1,50
@@
package era.mi.logic.components.gates;
package era.mi.logic.components.gates;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.List;
-import era.mi.logic.Util;
import era.mi.logic.components.BasicComponent;
import era.mi.logic.components.BasicComponent;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayEnd;
+import era.mi.logic.timeline.Timeline;
+import era.mi.logic.wires.Wire.ReadEnd;
+import era.mi.logic.wires.Wire.ReadWriteEnd;
public class NotGate extends BasicComponent
{
public class NotGate extends BasicComponent
{
- private
WireArray in, out
;
- private
WireArrayEnd outI
;
+ private
ReadEnd in
;
+ private
ReadWriteEnd out
;
- public NotGate(
int processTime, WireArray in, WireArray
out)
+ public NotGate(
Timeline timeline, int processTime, ReadEnd in, ReadWriteEnd
out)
{
{
- super(processTime);
+ super(
timeline,
processTime);
this.in = in;
in.addObserver(this);
this.out = out;
this.in = in;
in.addObserver(this);
this.out = out;
- outI = out.createInput();
}
}
- public void compute()
+ @Override
+ protected void compute()
{
{
- out
I.feedSignals(Util.not(in.getValues()
));
+ out
.feedSignals(in.getValues().not(
));
}
}
- public
WireArray
getIn()
+ public
ReadEnd
getIn()
{
return in;
}
{
return in;
}
- public
WireArray
getOut()
+ public
ReadEnd
getOut()
{
return out;
}
@Override
{
return out;
}
@Override
- public List<
WireArray
> getAllInputs()
+ public List<
ReadEnd
> getAllInputs()
{
{
- return
Collections.unmodifiableList(Arrays.asList(in)
);
+ return
List.of(in
);
}
@Override
}
@Override
- public List<
WireArray
> getAllOutputs()
+ public List<
ReadWriteEnd
> getAllOutputs()
{
{
- return
Collections.unmodifiableList(Arrays.asList(out)
);
+ return
List.of(out
);
}
}
}
}