From d0ff985c61536bff421055727906d08c7c9ec289 Mon Sep 17 00:00:00 2001 From: CBeelen Date: Fri, 6 Oct 2023 16:35:30 +0200 Subject: [PATCH 1/9] Add bonus check for other amicable numbers --- src/amicable_numbers.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/amicable_numbers.py b/src/amicable_numbers.py index fe4636a..63ad30b 100644 --- a/src/amicable_numbers.py +++ b/src/amicable_numbers.py @@ -18,6 +18,16 @@ def are_amicable(n, m): return False +def find_amicable(n): + n_divisors = get_divisors(n) + candidate = sum(n_divisors) + candidate_divisors = get_divisors(candidate) + if sum(candidate_divisors) == n: + return candidate + else: + return None + + def main(): parser = ArgumentParser() parser.add_argument('n', help="First number") @@ -31,6 +41,10 @@ def main(): f"which means that the sum of the proper divisors of one number is the other number, and vice versa.") else: print(f"Sorry, {n} and {m} are not amicable numbers :(") + for number in (n, m): + amicable_candidate = find_amicable(number) + if amicable_candidate: + print(f"However, {number} is amicable with {amicable_candidate}!") if __name__ == '__main__': From b21b528c13e6d634f7e55b0359fa4029c25e5db3 Mon Sep 17 00:00:00 2001 From: Charlotte Beelen <45456128+CBeelen@users.noreply.github.com> Date: Tue, 20 Feb 2024 10:59:25 +0100 Subject: [PATCH 2/9] Update src/amicable_numbers.py --- src/amicable_numbers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amicable_numbers.py b/src/amicable_numbers.py index 63ad30b..713a833 100644 --- a/src/amicable_numbers.py +++ b/src/amicable_numbers.py @@ -44,7 +44,7 @@ def main(): for number in (n, m): amicable_candidate = find_amicable(number) if amicable_candidate: - print(f"However, {number} is amicable with {amicable_candidate}!") + print(f"But {number} is amicable with {amicable_candidate}!") if __name__ == '__main__': From 433f93297752761d005e860ab2c4c3f9642ebb5f Mon Sep 17 00:00:00 2001 From: Charlotte Beelen <45456128+CBeelen@users.noreply.github.com> Date: Tue, 20 Feb 2024 11:08:25 +0100 Subject: [PATCH 3/9] test --- src/amicable_numbers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/amicable_numbers.py b/src/amicable_numbers.py index 713a833..445bb13 100644 --- a/src/amicable_numbers.py +++ b/src/amicable_numbers.py @@ -21,6 +21,7 @@ def are_amicable(n, m): def find_amicable(n): n_divisors = get_divisors(n) candidate = sum(n_divisors) + # test comment candidate_divisors = get_divisors(candidate) if sum(candidate_divisors) == n: return candidate From 801b0d4845ac86085c2f58aaec0a1e452650ceb7 Mon Sep 17 00:00:00 2001 From: Charlotte Beelen <45456128+CBeelen@users.noreply.github.com> Date: Tue, 13 Aug 2024 10:24:05 +0200 Subject: [PATCH 4/9] Added Test-diagram.drawio --- Test-diagram.drawio | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Test-diagram.drawio diff --git a/Test-diagram.drawio b/Test-diagram.drawio new file mode 100644 index 0000000..ed411cc --- /dev/null +++ b/Test-diagram.drawio @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + From ab4274051f95ef6af2654b60e046e269c3f67028 Mon Sep 17 00:00:00 2001 From: Charlotte Beelen <45456128+CBeelen@users.noreply.github.com> Date: Tue, 13 Aug 2024 10:25:57 +0200 Subject: [PATCH 5/9] Update Test-diagram.drawio --- Test-diagram.drawio | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Test-diagram.drawio b/Test-diagram.drawio index ed411cc..3b31493 100644 --- a/Test-diagram.drawio +++ b/Test-diagram.drawio @@ -1,20 +1,28 @@ - + - + - + + + + + + - + + + + From d7ccd18059fc698a86b31d99dfc3363b1971272a Mon Sep 17 00:00:00 2001 From: CBeelen Date: Tue, 13 Aug 2024 14:18:42 +0200 Subject: [PATCH 6/9] Update diagram from desktop app --- Test-diagram.drawio | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Test-diagram.drawio b/Test-diagram.drawio index 3b31493..c03f4e0 100644 --- a/Test-diagram.drawio +++ b/Test-diagram.drawio @@ -1,6 +1,6 @@ - + - + @@ -9,20 +9,26 @@ - + + + + - + + + + From 09f33bfa74ca13b82f0d0b875842ecab7171fc91 Mon Sep 17 00:00:00 2001 From: Charlotte Beelen <45456128+CBeelen@users.noreply.github.com> Date: Tue, 13 Aug 2024 14:27:18 +0200 Subject: [PATCH 7/9] test github.dev editor --- Test-diagram.drawio | 73 +++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 35 deletions(-) diff --git a/Test-diagram.drawio b/Test-diagram.drawio index c03f4e0..74ed4d3 100644 --- a/Test-diagram.drawio +++ b/Test-diagram.drawio @@ -1,35 +1,38 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 947f6a63b90bcb3930f62eff6510926c67a88d97 Mon Sep 17 00:00:00 2001 From: CBeelen Date: Tue, 13 Aug 2024 14:53:41 +0200 Subject: [PATCH 8/9] test pycharm plugin --- Test-diagram.drawio | 39 +-------------------------------------- 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/Test-diagram.drawio b/Test-diagram.drawio index 74ed4d3..8dbba62 100644 --- a/Test-diagram.drawio +++ b/Test-diagram.drawio @@ -1,38 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file From 00319ccd02f77629331b516c18e10d27897e2b57 Mon Sep 17 00:00:00 2001 From: CBeelen Date: Wed, 14 Aug 2024 13:39:03 +0200 Subject: [PATCH 9/9] Add d2 test --- Test-diagram.drawio => diagrams/Test-diagram.drawio | 0 diagrams/d2test.d2 | 10 ++++++++++ 2 files changed, 10 insertions(+) rename Test-diagram.drawio => diagrams/Test-diagram.drawio (100%) create mode 100644 diagrams/d2test.d2 diff --git a/Test-diagram.drawio b/diagrams/Test-diagram.drawio similarity index 100% rename from Test-diagram.drawio rename to diagrams/Test-diagram.drawio diff --git a/diagrams/d2test.d2 b/diagrams/d2test.d2 new file mode 100644 index 0000000..76b565a --- /dev/null +++ b/diagrams/d2test.d2 @@ -0,0 +1,10 @@ +ingest API -> elasticsearch.stage -> elasticsearch.bronze -> elasticsearch.silver -> elasticsearch.gold + +BM -> elasticsearch.gold +BM.shape: page +elasticsearch.stage.shape: cylinder +elasticsearch.bronze.shape: cylinder +elasticsearch.silver.shape: cylinder +elasticsearch.gold.shape: cylinder +elasticsearch.(stage -> bronze)[0]: stage_to_bronze +elasticsearch.(bronze -> bronze): Anomalies