From aab776c5ae406408e0c88bfd47ef909cdf7e8ea5 Mon Sep 17 00:00:00 2001 From: Akshay Dubey Date: Tue, 15 Nov 2022 18:57:39 +0530 Subject: [PATCH 1/8] feat: Add juggler sequence --- maths/juggler_sequence.py | 59 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 maths/juggler_sequence.py diff --git a/maths/juggler_sequence.py b/maths/juggler_sequence.py new file mode 100644 index 000000000000..79e8c9bcb078 --- /dev/null +++ b/maths/juggler_sequence.py @@ -0,0 +1,59 @@ +""" +== Juggler Sequence == +Juggler sequence start with any positive integer n. The next term is +obtained as follows: + If n term is even, the next term is floor value of square root of n . + If n is odd, the next term is floor value of 3 time the square root of n. + +https://en.wikipedia.org/wiki/Juggler_sequence +""" + +# Author : Akshay Dubey (https://github.com/itsAkshayDubey) +import math + + +def juggler_sequence(number: int) -> list[int]: + """ + # doctest: +NORMALIZE_WHITESPACE + >>> juggler_sequence(0) + Traceback (most recent call last): + ... + TypeError: Input value of [number=0] must be greater than 0 + >>> juggler_sequence(1) + [1] + >>> juggler_sequence(2) + [2, 1] + >>> juggler_sequence(3) + [3, 5, 11, 36, 6, 2, 1] + >>> juggler_sequence(5) + [5, 11, 36, 6, 2, 1] + >>> juggler_sequence(6.0) + Traceback (most recent call last): + ... + TypeError: Input value of [number=6.0] must be an integer + >>> juggler_sequence(-1) + Traceback (most recent call last): + ... + TypeError: Input value of [number=-1] must be positive + """ + if not isinstance(number, int): + raise TypeError(f"Input value of [number={number}] must be an integer") + if number < 0: + raise TypeError(f"Input value of [number={number}] must be positive") + if number == 0: + raise TypeError(f"Input value of [number={number}] must be greater than 0") + sequence = [number] + while number!=1: + if number % 2 == 0: + temp = int(math.floor(math.sqrt(number))) + else: + temp = int(math.floor(math.sqrt(number) * math.sqrt(number) * math.sqrt(number))) + number = temp + sequence.append(number) + return sequence + + +if __name__ == "__main__": + import doctest + + doctest.testmod() From d9c8d06da0f23aaf3ea10368a2ecc6061460c159 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 15 Nov 2022 13:30:29 +0000 Subject: [PATCH 2/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- maths/juggler_sequence.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/maths/juggler_sequence.py b/maths/juggler_sequence.py index 79e8c9bcb078..204fadab1aad 100644 --- a/maths/juggler_sequence.py +++ b/maths/juggler_sequence.py @@ -43,11 +43,13 @@ def juggler_sequence(number: int) -> list[int]: if number == 0: raise TypeError(f"Input value of [number={number}] must be greater than 0") sequence = [number] - while number!=1: + while number != 1: if number % 2 == 0: temp = int(math.floor(math.sqrt(number))) else: - temp = int(math.floor(math.sqrt(number) * math.sqrt(number) * math.sqrt(number))) + temp = int( + math.floor(math.sqrt(number) * math.sqrt(number) * math.sqrt(number)) + ) number = temp sequence.append(number) return sequence From f67bf3e910837091ef13f48a1ce5ff293309cc64 Mon Sep 17 00:00:00 2001 From: Akshay Dubey Date: Tue, 15 Nov 2022 20:34:34 +0530 Subject: [PATCH 3/8] refactor: Remove temp variable --- maths/juggler_sequence.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/maths/juggler_sequence.py b/maths/juggler_sequence.py index 204fadab1aad..d320cfae8581 100644 --- a/maths/juggler_sequence.py +++ b/maths/juggler_sequence.py @@ -45,12 +45,11 @@ def juggler_sequence(number: int) -> list[int]: sequence = [number] while number != 1: if number % 2 == 0: - temp = int(math.floor(math.sqrt(number))) + number = int(math.floor(math.sqrt(number))) else: - temp = int( + number = int( math.floor(math.sqrt(number) * math.sqrt(number) * math.sqrt(number)) ) - number = temp sequence.append(number) return sequence From a0a875a711c68b1b5139915da6b8cc7d772418e8 Mon Sep 17 00:00:00 2001 From: Akshay Dubey Date: Tue, 15 Nov 2022 22:37:50 +0530 Subject: [PATCH 4/8] refactor: Change error type for negative numbers --- maths/juggler_sequence.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/maths/juggler_sequence.py b/maths/juggler_sequence.py index d320cfae8581..30cc896a49a7 100644 --- a/maths/juggler_sequence.py +++ b/maths/juggler_sequence.py @@ -18,7 +18,7 @@ def juggler_sequence(number: int) -> list[int]: >>> juggler_sequence(0) Traceback (most recent call last): ... - TypeError: Input value of [number=0] must be greater than 0 + ValueError: Input value of [number=0] must be a positive integer >>> juggler_sequence(1) [1] >>> juggler_sequence(2) @@ -34,14 +34,12 @@ def juggler_sequence(number: int) -> list[int]: >>> juggler_sequence(-1) Traceback (most recent call last): ... - TypeError: Input value of [number=-1] must be positive + ValueError: Input value of [number=-1] must be a positive integer """ if not isinstance(number, int): raise TypeError(f"Input value of [number={number}] must be an integer") - if number < 0: - raise TypeError(f"Input value of [number={number}] must be positive") - if number == 0: - raise TypeError(f"Input value of [number={number}] must be greater than 0") + if number < 1: + raise ValueError(f"Input value of [number={number}] must be a positive integer") sequence = [number] while number != 1: if number % 2 == 0: From 74484766de80911f390881f89d96985916f47b77 Mon Sep 17 00:00:00 2001 From: Akshay Dubey Date: Wed, 16 Nov 2022 08:34:06 +0530 Subject: [PATCH 5/8] refactor: Remove # doctest: +NORMALIZE_WHITESPACE --- maths/juggler_sequence.py | 1 - 1 file changed, 1 deletion(-) diff --git a/maths/juggler_sequence.py b/maths/juggler_sequence.py index 30cc896a49a7..8ebd01b20cdf 100644 --- a/maths/juggler_sequence.py +++ b/maths/juggler_sequence.py @@ -14,7 +14,6 @@ def juggler_sequence(number: int) -> list[int]: """ - # doctest: +NORMALIZE_WHITESPACE >>> juggler_sequence(0) Traceback (most recent call last): ... From dc5db724bd939e08a44ae13fa9030be0734b8582 Mon Sep 17 00:00:00 2001 From: Akshay Dubey Date: Fri, 18 Nov 2022 12:33:29 +0530 Subject: [PATCH 6/8] refactor: Remove int typecasting --- maths/juggler_sequence.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/maths/juggler_sequence.py b/maths/juggler_sequence.py index 8ebd01b20cdf..6ed818105ea6 100644 --- a/maths/juggler_sequence.py +++ b/maths/juggler_sequence.py @@ -42,11 +42,9 @@ def juggler_sequence(number: int) -> list[int]: sequence = [number] while number != 1: if number % 2 == 0: - number = int(math.floor(math.sqrt(number))) + number = math.floor(math.sqrt(number)) else: - number = int( - math.floor(math.sqrt(number) * math.sqrt(number) * math.sqrt(number)) - ) + number = math.floor(math.sqrt(number) * math.sqrt(number) * math.sqrt(number)) sequence.append(number) return sequence From 20da7a3d70f10535153cbcba6bb2f1d8088a69ad Mon Sep 17 00:00:00 2001 From: Akshay Dubey Date: Fri, 18 Nov 2022 12:38:44 +0530 Subject: [PATCH 7/8] test: Add unit tests for n=10 and n=25 --- maths/juggler_sequence.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/maths/juggler_sequence.py b/maths/juggler_sequence.py index 6ed818105ea6..4daba6197e10 100644 --- a/maths/juggler_sequence.py +++ b/maths/juggler_sequence.py @@ -26,6 +26,10 @@ def juggler_sequence(number: int) -> list[int]: [3, 5, 11, 36, 6, 2, 1] >>> juggler_sequence(5) [5, 11, 36, 6, 2, 1] + >>> juggler_sequence(10) + [10, 3, 5, 11, 36, 6, 2, 1] + >>> juggler_sequence(25) + [25, 125, 1397, 52214, 228, 15, 58, 7, 18, 4, 2, 1] >>> juggler_sequence(6.0) Traceback (most recent call last): ... From 2aa506fb50a939b30240695c00a7ef172101ef49 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 18 Nov 2022 07:10:35 +0000 Subject: [PATCH 8/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- maths/juggler_sequence.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/maths/juggler_sequence.py b/maths/juggler_sequence.py index 4daba6197e10..9daba8bc0e8a 100644 --- a/maths/juggler_sequence.py +++ b/maths/juggler_sequence.py @@ -48,7 +48,9 @@ def juggler_sequence(number: int) -> list[int]: if number % 2 == 0: number = math.floor(math.sqrt(number)) else: - number = math.floor(math.sqrt(number) * math.sqrt(number) * math.sqrt(number)) + number = math.floor( + math.sqrt(number) * math.sqrt(number) * math.sqrt(number) + ) sequence.append(number) return sequence