From 7d7e5bfc46bb0fc20152d7f8b4445c4395b9d310 Mon Sep 17 00:00:00 2001 From: Kevin Buffardi Date: Mon, 8 Sep 2025 11:26:56 -0700 Subject: [PATCH 1/5] add display at beginning, closes #62 --- main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/main.cpp b/main.cpp index 958ba61..8ef53eb 100644 --- a/main.cpp +++ b/main.cpp @@ -7,6 +7,7 @@ using std::endl; int main() { + cout << "THE FIRST EXAMPLE MATH DISPLAY!\n"; cout << "Hi, please enter two whole numbers: "; int x,y; From b4db3f7471bd7a0be17b8bba5bfc8bff5fc8a816 Mon Sep 17 00:00:00 2001 From: Dylan Dorey Date: Mon, 8 Sep 2025 11:27:53 -0700 Subject: [PATCH 2/5] Provided solution to #62 Addition and Subtraction, closes #62 --- main.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/main.cpp b/main.cpp index 958ba61..09ccca0 100644 --- a/main.cpp +++ b/main.cpp @@ -10,10 +10,19 @@ int main() cout << "Hi, please enter two whole numbers: "; int x,y; + double output; cin >> x >> y; - cout << "Addition: " << x + y << endl; - cout << "Subtraction: " << x - y << endl; + + //addition + output = x + y; + cout < Date: Tue, 9 Sep 2025 17:29:03 -0700 Subject: [PATCH 3/5] Update IO with a welcome and using std:: prefix --- main.cpp | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/main.cpp b/main.cpp index 8ef53eb..a495fc9 100644 --- a/main.cpp +++ b/main.cpp @@ -1,25 +1,21 @@ #include #include -using std::cin; -using std::cout; -using std::endl; - int main() { - cout << "THE FIRST EXAMPLE MATH DISPLAY!\n"; - cout << "Hi, please enter two whole numbers: "; + std::cout << "THE FIRST EXAMPLE MATH DISPLAY!\n"; + std::cout << "Hi, please enter two whole numbers: "; int x,y; - cin >> x >> y; - cout << "Addition: " << x + y << endl; - cout << "Subtraction: " << x - y << endl; - cout << "Multiplication: " << x * y << endl; - cout << "Division: " << x / y << endl; - cout << "Remainder: " << x % y << endl; - cout << "Square Root: " << sqrt(x) << endl; - cout << "Square: " << pow(x, y) << endl; + std::cin >> x >> y; + std::cout << "Addition: " << x + y << std::endl; + std::cout << "Subtraction: " << x - y << std::endl; + std::cout << "Multiplication: " << x * y << std::endl; + std::cout << "Division: " << x / y << std::endl; + std::cout << "Remainder: " << x % y << std::endl; + std::cout << "Square Root: " << sqrt(x) << std::endl; + std::cout << "Square: " << pow(x, y) << std::endl; return 0; } From 4caf010d87e0eb9065e7c8e0710c3a6a999da465 Mon Sep 17 00:00:00 2001 From: Dylan Dorey Date: Wed, 10 Sep 2025 12:20:26 -0700 Subject: [PATCH 4/5] test commit --- main.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index a495fc9..78d6933 100644 --- a/main.cpp +++ b/main.cpp @@ -7,9 +7,14 @@ int main() std::cout << "Hi, please enter two whole numbers: "; int x,y; + double output; std::cin >> x >> y; - std::cout << "Addition: " << x + y << std::endl; + + //addition + double output = x + y; + std::cout << x << " + " << y << " = " << output; + std::cout << "Subtraction: " << x - y << std::endl; std::cout << "Multiplication: " << x * y << std::endl; std::cout << "Division: " << x / y << std::endl; From dc2ebca3f7c6fe1ff7784a1ec61d749c0ae16524 Mon Sep 17 00:00:00 2001 From: Dylan Dorey Date: Wed, 10 Sep 2025 14:43:11 -0700 Subject: [PATCH 5/5] Updated std inclusion --- main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/main.cpp b/main.cpp index e51f017..99ac3fb 100644 --- a/main.cpp +++ b/main.cpp @@ -19,6 +19,7 @@ int main() output = x - y; std::cout <