From a2745e4a089a9f4357db2183b283fdafb55be8c1 Mon Sep 17 00:00:00 2001 From: Katarzyna-W <39034151+Katarzyna-W@users.noreply.github.com> Date: Mon, 7 Jul 2025 16:01:41 +0200 Subject: [PATCH 1/4] Update nwdNww.hpp --- homework/nwd-nnw/nwdNww.hpp | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/homework/nwd-nnw/nwdNww.hpp b/homework/nwd-nnw/nwdNww.hpp index 0491a2c9..99a54790 100644 --- a/homework/nwd-nnw/nwdNww.hpp +++ b/homework/nwd-nnw/nwdNww.hpp @@ -1,11 +1,21 @@ #pragma once int NWD(int lhs, int rhs) { - // TODO: Implement me :) - return -1; + if (lhs == 0){ + return rhs; + } + return NWD(rhs % lhs, lhs); } int NWW(int lhs, int rhs) { - // TODO: Implement me :) - return -1; + int smaller = std::min(lhs, rhs); + int bigger = std::max(lhs, rhs); + + for (std::size_t i = bigger; i < lhs * rhs; i += bigger){ + if (i % smaller == 0){ + return i; + } + + } + return lhs * rhs; } From 2c21b4dbfa13aca3de730aee344af7caab6e7476 Mon Sep 17 00:00:00 2001 From: Katarzyna-W <39034151+Katarzyna-W@users.noreply.github.com> Date: Tue, 8 Jul 2025 10:55:58 +0200 Subject: [PATCH 2/4] Update nwdNww.hpp --- homework/nwd-nnw/nwdNww.hpp | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/homework/nwd-nnw/nwdNww.hpp b/homework/nwd-nnw/nwdNww.hpp index 99a54790..f2f6045e 100644 --- a/homework/nwd-nnw/nwdNww.hpp +++ b/homework/nwd-nnw/nwdNww.hpp @@ -8,14 +8,25 @@ int NWD(int lhs, int rhs) { } int NWW(int lhs, int rhs) { - int smaller = std::min(lhs, rhs); - int bigger = std::max(lhs, rhs); + int bigger = std::abs(std::max(lhs, rhs)); + int lcm {}; + if (lhs == 0 or rhs == 0) { + return 0; + } + if (lhs == rhs) { + return std::abs(lhs); + } - for (std::size_t i = bigger; i < lhs * rhs; i += bigger){ - if (i % smaller == 0){ - return i; + do + { + if (bigger % lhs == 0 && bigger % rhs == 0) + { + lcm = bigger; + break; } - - } - return lhs * rhs; + else + ++bigger; + } while (true); + return lcm; + } From 4a332d7e2e298ab72ba0aef9d37a1df954a29549 Mon Sep 17 00:00:00 2001 From: Katarzyna-W <39034151+Katarzyna-W@users.noreply.github.com> Date: Tue, 8 Jul 2025 11:00:09 +0200 Subject: [PATCH 3/4] Update nwdNww.hpp --- homework/nwd-nnw/nwdNww.hpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/homework/nwd-nnw/nwdNww.hpp b/homework/nwd-nnw/nwdNww.hpp index f2f6045e..02c70283 100644 --- a/homework/nwd-nnw/nwdNww.hpp +++ b/homework/nwd-nnw/nwdNww.hpp @@ -1,15 +1,15 @@ #pragma once int NWD(int lhs, int rhs) { - if (lhs == 0){ + if (lhs == 0) { return rhs; } - return NWD(rhs % lhs, lhs); + return std::abs(NWD(rhs % lhs, lhs)); } int NWW(int lhs, int rhs) { int bigger = std::abs(std::max(lhs, rhs)); - int lcm {}; + int lcm{}; if (lhs == 0 or rhs == 0) { return 0; } @@ -17,16 +17,12 @@ int NWW(int lhs, int rhs) { return std::abs(lhs); } - do - { - if (bigger % lhs == 0 && bigger % rhs == 0) - { + do { + if (bigger % lhs == 0 && bigger % rhs == 0) { lcm = bigger; break; - } - else + } else ++bigger; } while (true); - return lcm; - + return lcm; } From 5ad795fe76e38060329e5d80884752907944a2fb Mon Sep 17 00:00:00 2001 From: Katarzyna-W <39034151+Katarzyna-W@users.noreply.github.com> Date: Tue, 8 Jul 2025 11:04:25 +0200 Subject: [PATCH 4/4] Update nwdNww.hpp --- homework/nwd-nnw/nwdNww.hpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/homework/nwd-nnw/nwdNww.hpp b/homework/nwd-nnw/nwdNww.hpp index 02c70283..cba114ce 100644 --- a/homework/nwd-nnw/nwdNww.hpp +++ b/homework/nwd-nnw/nwdNww.hpp @@ -16,7 +16,6 @@ int NWW(int lhs, int rhs) { if (lhs == rhs) { return std::abs(lhs); } - do { if (bigger % lhs == 0 && bigger % rhs == 0) { lcm = bigger; @@ -24,5 +23,5 @@ int NWW(int lhs, int rhs) { } else ++bigger; } while (true); - return lcm; + return lcm; }