Revision 1:6be4deab8fdc, committed 2014-08-29

Comitter:

triple

Date:

Fri Aug 29 08:02:38 2014 +0000

Parent:

0:67282ecd81b7

Child:

2:f1d3afaf7e93

Commit message:

Minor changes to original

Changed in this revision

--- a/Calculator.cpp	Thu Aug 28 20:33:44 2014 +0000
+++ b/Calculator.cpp	Fri Aug 29 08:02:38 2014 +0000
@@ -3,9 +3,9 @@
 
 // Constructor
 // Default values should be specified in declaration only
-Calculator::Calculator(double number1, double number2){
-    this->number1 = number1;
-    this->number2 = number2;
+Calculator::Calculator(double num1, double num2){
+    number1 = num1;
+    number2 = num2;
 };
 
 // Public getter for data member number1
@@ -14,8 +14,8 @@
 }
 
 // Public setter for data member number1
-void Calculator::setNumber1(double number1) {
-    this->number1 = number1;
+void Calculator::setNumber1(double num1) {
+    number1 = num1;
 }
 
 // Public getter for data member number2
@@ -24,8 +24,8 @@
 }
 
 // Public setter for data member number1
-void Calculator::setNumber2(double number2) {
-    this->number2 = number2;
+void Calculator::setNumber2(double num2) {
+    number2 = num2;
 }
 
 // A public member function to sum number1 and number2

--- a/Calculator.h	Thu Aug 28 20:33:44 2014 +0000
+++ b/Calculator.h	Fri Aug 29 08:02:38 2014 +0000
@@ -1,5 +1,5 @@
 /* The Calculator class header (Calculator.h) */
-//#include "mbed.h"
+#include "mbed.h"
 using namespace std;
 
 //Calculator class declaration

--- 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());
  }