From d7a35425e7dda7aeeeaeb404b7901d0928339467 Mon Sep 17 00:00:00 2001 From: "Alice (NovikovDM)" Date: Wed, 13 Sep 2023 23:59:49 +0300 Subject: [PATCH 1/2] max --- main.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/main.cpp b/main.cpp index 048e29e..9e05b69 100644 --- a/main.cpp +++ b/main.cpp @@ -5,11 +5,16 @@ using namespace std; int main() { cout << "Enter A and B: "; -int a, b; +double a, b, min, max; cin >> a >> b; cout << "A + B = " << a + b << '\n' - << "A - B = " << a - b << '\n'; -cout << "A * B = " << a * b << '\n' + << "A - B = " << a - b << '\n' << "A * B = " << a * b << '\n' + << "A / B = " << a / b << '\n'; +if (a > b) + a = max; + b = min; +cout << max; + return 0; } From 62a0b8a0ef67e1d2b21ae00ed818d7b07b0c045e Mon Sep 17 00:00:00 2001 From: "Alice (NovikovDM)" Date: Sun, 17 Sep 2023 23:32:02 +0300 Subject: [PATCH 2/2] max --- main.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/main.cpp b/main.cpp index 2a109a0..9ede62f 100644 --- a/main.cpp +++ b/main.cpp @@ -8,19 +8,13 @@ cout << "Enter A and B: "; double a, b, min, max; cin >> a >> b; cout << "A + B = " << a + b << '\n' -<<<<<<< HEAD << "A - B = " << a - b << '\n' << "A * B = " << a * b << '\n' << "A / B = " << a / b << '\n'; if (a > b) a = max; - b = min; cout << max; -======= - << "A - B = " << a - b << '\n'; - << "A * B = " << a * b << '\n' - << "A / B = " << a * b << '\n' ->>>>>>> f39ce63ab4bbe38fc28b8b5c64a4aff3c2eff450 - return 0; + +return 0; }