Изменил(а) на 'cv3/program.c'
This commit is contained in:
parent
c388fee424
commit
4c98f69b4d
@ -33,13 +33,13 @@ bool calculatorLogic(char buffer[SIZE][SIZE]){
|
|||||||
|
|
||||||
switch(buffer[currentlyInBuffer][0]){
|
switch(buffer[currentlyInBuffer][0]){
|
||||||
case '+':
|
case '+':
|
||||||
temporaryDecimal = round(atof(buffer[currentlyInBuffer-2])*100)/100 + round(atof(buffer[currentlyInBuffer-1])*100)/100;
|
temporaryDecimal = (double)(round(atof(buffer[currentlyInBuffer-2])*100)/100) + (double)(round(atof(buffer[currentlyInBuffer-1])*100)/100);
|
||||||
break;
|
break;
|
||||||
case '-':
|
case '-':
|
||||||
temporaryDecimal = round(atof(buffer[currentlyInBuffer-2])*100)/100 - round(atof(buffer[currentlyInBuffer-1])*100)/100;
|
temporaryDecimal = (double)(round(atof(buffer[currentlyInBuffer-2])*100)/100) - (double)(round(atof(buffer[currentlyInBuffer-1])*100)/100);
|
||||||
break;
|
break;
|
||||||
case '*':
|
case '*':
|
||||||
temporaryDecimal = round(atof(buffer[currentlyInBuffer-2])*100)/100 * round(atof(buffer[currentlyInBuffer-1])*100)/100;
|
temporaryDecimal = (double)(round(atof(buffer[currentlyInBuffer-2])*100)/100) * (double)(round(atof(buffer[currentlyInBuffer-1])*100)/100);
|
||||||
break;
|
break;
|
||||||
case '/':
|
case '/':
|
||||||
if(atof(buffer[currentlyInBuffer-1]) == 0.0) {
|
if(atof(buffer[currentlyInBuffer-1]) == 0.0) {
|
||||||
@ -47,7 +47,7 @@ bool calculatorLogic(char buffer[SIZE][SIZE]){
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
temporaryDecimal = round(atof(buffer[currentlyInBuffer-2])*100)/100 / round(atof(buffer[currentlyInBuffer-1])*100)/100;
|
temporaryDecimal = (double)(round(atof(buffer[currentlyInBuffer-2])*100)/100) / (double)(round(atof(buffer[currentlyInBuffer-1])*100)/100);
|
||||||
}
|
}
|
||||||
|
|
||||||
for(int i = currentlyInBuffer-2; currentlyInBuffer > i; currentlyInBuffer--)
|
for(int i = currentlyInBuffer-2; currentlyInBuffer > i; currentlyInBuffer--)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user