Merge branch 'master' of https://gitlab.com/AluminumTank/radec
This commit is contained in:
		@@ -10,16 +10,13 @@ AndGate::AndGate(int d, Wire* wire1, Wire* wire2, Wire* wire3) {
 | 
			
		||||
}
 | 
			
		||||
Event AndGate::evaluate(int evTime) {
 | 
			
		||||
	if (in1->getValue(evTime) == 0 || in2->getValue(evTime) == 0) {
 | 
			
		||||
		if (out->getValue(evTime + delay) != 0) {
 | 
			
		||||
		return Event(-1, 0, evTime + delay, out);
 | 
			
		||||
		}
 | 
			
		||||
		
 | 
			
		||||
	}
 | 
			
		||||
	else if(in1->getValue(evTime) == 1 && in2->getValue(evTime) == 1){
 | 
			
		||||
		if (out->getValue(evTime + delay) != 1) {
 | 
			
		||||
		return Event(-1, 1, evTime + delay, out);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int AndGate::getDelay()
 | 
			
		||||
{
 | 
			
		||||
 
 | 
			
		||||
@@ -11,16 +11,12 @@ NandGate::NandGate(int d, Wire * wire1, Wire * wire2, Wire * wire3)
 | 
			
		||||
Event NandGate::evaluate(int evTime)
 | 
			
		||||
{
 | 
			
		||||
	if (in1->getValue(evTime) == 0 || in2->getValue(evTime) == 0) {
 | 
			
		||||
		if (out->getValue(evTime + delay) != 1) {
 | 
			
		||||
		return Event(-1, 1, evTime + delay, out);
 | 
			
		||||
	}
 | 
			
		||||
	}
 | 
			
		||||
	else {
 | 
			
		||||
		if (out->getValue(evTime + delay) != 0) {
 | 
			
		||||
		return Event(-1, 0, evTime + delay, out);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int NandGate::getDelay()
 | 
			
		||||
{
 | 
			
		||||
 
 | 
			
		||||
@@ -10,16 +10,12 @@ NotGate::NotGate(int d, Wire* wire1, Wire* wire2) {
 | 
			
		||||
 | 
			
		||||
Event NotGate::evaluate(int evTime) {
 | 
			
		||||
	if (in1->getValue(evTime) == 0) {
 | 
			
		||||
		if (out->getValue(evTime + delay) != 0) {
 | 
			
		||||
			return Event(-1, 0, evTime + delay, out);
 | 
			
		||||
	}
 | 
			
		||||
	}
 | 
			
		||||
	else{
 | 
			
		||||
		if (out->getValue(evTime + delay) != 1) {
 | 
			
		||||
			return Event(-1, 1, evTime + delay, out);
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int NotGate::getDelay()
 | 
			
		||||
{
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user