From 4b0c476d3a09c4ce1dd3ca09dade1903ef1ef13b Mon Sep 17 00:00:00 2001 From: Pontikol Date: Wed, 30 Nov 2022 23:23:12 +0100 Subject: [PATCH 1/3] adding works --- homework/calculate/calculate.hpp | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/homework/calculate/calculate.hpp b/homework/calculate/calculate.hpp index 7a933a25..19be1564 100644 --- a/homework/calculate/calculate.hpp +++ b/homework/calculate/calculate.hpp @@ -2,6 +2,28 @@ #include std::string calculate(const std::string& command, int first, int second) { - // TODO: Implement your solution here and return proper value - return ""; + int wynik = 0; + + if (command == "add") { + wynik = first + second; + } + else if (command == "subtract") { + wynik = first - second; + } + else if (command == "multiply") { + wynik = first * second; + } + else if (command == "divide" && second != 0) { + wynik = first / second; + } + else if (command == "divide" && second == 0) { + return "Division by 0"; + } + else { + return "Invalid data"; + } + + std::string s = std::to_string(wynik); + + return s; } From a22c16be2d51f175f28c64794ff233f7d132d8f7 Mon Sep 17 00:00:00 2001 From: Pontikol Date: Thu, 1 Dec 2022 16:28:06 +0100 Subject: [PATCH 2/3] calculate working --- homework/calculate/calculate.hpp | 39 +++++++++++++------------------- 1 file changed, 16 insertions(+), 23 deletions(-) diff --git a/homework/calculate/calculate.hpp b/homework/calculate/calculate.hpp index 19be1564..9022370a 100644 --- a/homework/calculate/calculate.hpp +++ b/homework/calculate/calculate.hpp @@ -2,28 +2,21 @@ #include std::string calculate(const std::string& command, int first, int second) { - int wynik = 0; + int wynik = 0; - if (command == "add") { - wynik = first + second; - } - else if (command == "subtract") { - wynik = first - second; - } - else if (command == "multiply") { - wynik = first * second; - } - else if (command == "divide" && second != 0) { - wynik = first / second; - } - else if (command == "divide" && second == 0) { - return "Division by 0"; - } - else { - return "Invalid data"; - } - - std::string s = std::to_string(wynik); - - return s; + if (command == "add") { + wynik = first + second; + } else if (command == "subtract") { + wynik = first - second; + } else if (command == "multiply") { + wynik = first * second; + } else if (command == "divide" && second != 0) { + wynik = first / second; + } else if (command == "divide" && second == 0) { + return "Division by 0"; + } else { + return "Invalid data"; + } + std::string s = std::to_string(wynik); + return s; } From 769b831496b176e257c2f2952b6a0c3aaa9fecf1 Mon Sep 17 00:00:00 2001 From: Pontikol Date: Thu, 1 Dec 2022 16:47:46 +0100 Subject: [PATCH 3/3] adding works --- homework/calculate/calculate.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/homework/calculate/calculate.hpp b/homework/calculate/calculate.hpp index 9022370a..fca9c696 100644 --- a/homework/calculate/calculate.hpp +++ b/homework/calculate/calculate.hpp @@ -5,9 +5,9 @@ std::string calculate(const std::string& command, int first, int second) { int wynik = 0; if (command == "add") { - wynik = first + second; + wynik = first + second; } else if (command == "subtract") { - wynik = first - second; + wynik = first - second; } else if (command == "multiply") { wynik = first * second; } else if (command == "divide" && second != 0) { @@ -15,7 +15,7 @@ std::string calculate(const std::string& command, int first, int second) { } else if (command == "divide" && second == 0) { return "Division by 0"; } else { - return "Invalid data"; + return "Invalid data"; } std::string s = std::to_string(wynik); return s;