Milan Stefko
/
Calculator
Test of the class Calculator
Diff: main.cpp
- Revision:
- 1:6be4deab8fdc
- Parent:
- 0:67282ecd81b7
- Child:
- 2:f1d3afaf7e93
--- a/main.cpp Thu Aug 28 20:33:44 2014 +0000 +++ b/main.cpp Fri Aug 29 08:02:38 2014 +0000 @@ -11,22 +11,25 @@ USBSerial serial; int main() { - double number1, number2; + double num1, num2; // Construct an instance of Calculator calc Calculator calc(0.0, 0.0);//(number1, number2); - - // Ask user for a number1 - serial.scanf("f\r\n", number1); - // Ask user for a number2 - serial.scanf("f\r\n", number2); + + wait(5); + // Ask user for a number1 + serial.printf("Enter number1: "); + serial.scanf("%f", num1); + // Ask user for a number2 + serial.printf("Enter numbe2: "); + serial.scanf("\r\n%f", num2); // Set number1 and number2 to user inputs - calc.setNumber1(number1); - calc.setNumber2(number2); - serial.printf("number1: %f.2\r\n", calc.getNumber1()); - serial.printf("number2: %f.2\r\n", calc.getNumber2()); - serial.printf("sum: %f.2\r\n", calc.addNumbers()); - serial.printf("subtraction: %f.2\r\n", calc.subtractNumbers()); - serial.printf("multiplication: %f.2\r\n", calc.multiplyNumbers()); - serial.printf("division: %f.2\r\n", calc.divideNumbers()); + calc.setNumber1(num1); + calc.setNumber2(num2); + serial.printf("Number1 is: %.3f\r\n", calc.getNumber1()); + serial.printf("Number2 is: %.3f\r\n", calc.getNumber2()); + serial.printf("Sum: %.3f\r\n", calc.addNumbers()); + serial.printf("Subtraction: %.3f\r\n", calc.subtractNumbers()); + serial.printf("Multiplication: %.3f\r\n", calc.multiplyNumbers()); + serial.printf("Division: %.3f\r\n", calc.divideNumbers()); }