From 8d80caf9b96128140e6de2bf5b7202d82c68afda Mon Sep 17 00:00:00 2001
From: "Alice (MarkovNS)" <MarkovNikS@mpei.ru>
Date: Tue, 23 Apr 2024 23:05:30 +0300
Subject: [PATCH 1/4] =?UTF-8?q?code=20:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?=
=?UTF-8?q?=D0=B8=D0=BB=20=D0=BC=D0=B0=D0=BA=D1=81=D0=B8=D0=BC=D1=83=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
main.cpp | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/main.cpp b/main.cpp
index f1d48a8..c29e8bd 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,11 +5,18 @@ using namespace std;
int main()
{
cout << "Enter A and B: ";
- int a, b;
+ int a, b, mx;
cin >> a >> b;
+ if (a>b){
+ mx=a;
+ }
+ else{
+ mx=b;
+ }
cout << "A + B = " << a + b << '\n'
<< "A - B = " << a - b << '\n'
<< "A * B = " << a * b << '\n'
<< "A * B = " << a * b << '\n'
- << "A / B = " << a / b << '\n';
+ << "A / B = " << a / b << '\n'
+ << "Max(A,B)= " << mx;
}
From e55c623baeb092c5836895211a5fee7eddf2fe48 Mon Sep 17 00:00:00 2001
From: "Alice (MarkovNS)" <MarkovNikS@mpei.ru>
Date: Wed, 24 Apr 2024 00:41:20 +0300
Subject: [PATCH 2/4] code: double
---
main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.cpp b/main.cpp
index c29e8bd..aec7f72 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,7 +5,7 @@ using namespace std;
int main()
{
cout << "Enter A and B: ";
- int a, b, mx;
+ double a, b, mx;
cin >> a >> b;
if (a>b){
mx=a;
From d7cbcb1251a4d2399b8f5185b8668be598a6713b Mon Sep 17 00:00:00 2001
From: "Alice (MarkovNS)" <MarkovNikS@mpei.ru>
Date: Wed, 24 Apr 2024 15:34:35 +0300
Subject: [PATCH 3/4] code:double
---
main.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/main.cpp b/main.cpp
index aec7f72..b803e1c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -16,7 +16,6 @@ int main()
cout << "A + B = " << a + b << '\n'
<< "A - B = " << a - b << '\n'
<< "A * B = " << a * b << '\n'
- << "A * B = " << a * b << '\n'
<< "A / B = " << a / b << '\n'
<< "Max(A,B)= " << mx;
}
From 146e9038519dae36cbc926de7ebe4f2dc3496786 Mon Sep 17 00:00:00 2001
From: "Alice (MarkovNS)" <MarkovNikS@mpei.ru>
Date: Wed, 24 Apr 2024 15:56:35 +0300
Subject: [PATCH 4/4] =?UTF-8?q?code:=20=D0=BF=D0=BE=D0=BC=D0=B5=D0=BD?=
=?UTF-8?q?=D1=8F=D0=BB=20int=20=D0=BD=D0=B0=20double?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
main.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/main.cpp b/main.cpp
index b803e1c..e626841 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,7 +5,7 @@ using namespace std;
int main()
{
cout << "Enter A and B: ";
- double a, b, mx;
+ double a, b, mx, mn;
cin >> a >> b;
if (a>b){
mx=a;
@@ -13,9 +13,16 @@ int main()
else{
mx=b;
}
+ if (a>b){
+ mn=b;
+ }
+ else{
+ mn=a;
+ }
cout << "A + B = " << a + b << '\n'
<< "A - B = " << a - b << '\n'
<< "A * B = " << a * b << '\n'
<< "A / B = " << a / b << '\n'
+ << "Min(A,B)= " << mn << '\n'
<< "Max(A,B)= " << mx;
}