TnSb/radec
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove old code from evaluate functions for and and not gates.

Browse Source
This commit is contained in:
daniel 2017-04-24 22:25:29 -04:00
parent fe794c6725
commit 1958336d29
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/AndGate.cpp
View File

@ -10,15 +10,12 @@ AndGate::AndGate(int d, Wire* wire1, Wire* wire2, Wire* wire3) {
} }
Event AndGate::evaluate(int evTime) { Event AndGate::evaluate(int evTime) {
if (in1->getValue(evTime) == 0 || in2->getValue(evTime) == 0) { if (in1->getValue(evTime) == 0 || in2->getValue(evTime) == 0) {
if (out->getValue(evTime + delay) != 0) {
return Event(-1, 0, evTime + delay, out); return Event(-1, 0, evTime + delay, out);
}
} }
else if(in1->getValue(evTime) == 1 && in2->getValue(evTime) == 1){ else if(in1->getValue(evTime) == 1 && in2->getValue(evTime) == 1){
if (out->getValue(evTime + delay) != 1) {
return Event(-1, 1, evTime + delay, out); return Event(-1, 1, evTime + delay, out);
} }
}
} }
int AndGate::getDelay() int AndGate::getDelay()

4
src/NandGate.cpp
View File

@ -11,15 +11,11 @@ NandGate::NandGate(int d, Wire * wire1, Wire * wire2, Wire * wire3)
Event NandGate::evaluate(int evTime) Event NandGate::evaluate(int evTime)
{ {
if (in1->getValue(evTime) == 0 || in2->getValue(evTime) == 0) { if (in1->getValue(evTime) == 0 || in2->getValue(evTime) == 0) {
if (out->getValue(evTime + delay) != 1) {
return Event(-1, 1, evTime + delay, out); return Event(-1, 1, evTime + delay, out);
} }
}
else { else {
if (out->getValue(evTime + delay) != 0) {
return Event(-1, 0, evTime + delay, out); return Event(-1, 0, evTime + delay, out);
} }
}
} }
int NandGate::getDelay() int NandGate::getDelay()

4
src/NotGate.cpp
View File

@ -10,15 +10,11 @@ NotGate::NotGate(int d, Wire* wire1, Wire* wire2) {
Event NotGate::evaluate(int evTime) { Event NotGate::evaluate(int evTime) {
if (in1->getValue(evTime) == 0) { if (in1->getValue(evTime) == 0) {
if (out->getValue(evTime + delay) != 0) {
return Event(-1, 0, evTime + delay, out); return Event(-1, 0, evTime + delay, out);
} }
}
else{ else{
if (out->getValue(evTime + delay) != 1) {
return Event(-1, 1, evTime + delay, out); return Event(-1, 1, evTime + delay, out);
} }
}
} }
int NotGate::getDelay() int NotGate::getDelay()