Merge remote-tracking branch 'upstream/master'

Author: archaengel

.github/workflows/build.yml

@@ -23,6 +23,6 @@ jobs:
           python -m pip install mypy pytest-cov -r requirements.txt
       - run: mypy --install-types --non-interactive .
       - name: Run tests
-        run: pytest --doctest-modules --ignore=project_euler/ --ignore=scripts/ --cov-report=term-missing:skip-covered --cov=. .
+        run: pytest --doctest-modules --ignore=project_euler/ --ignore=scripts/validate_solutions.py --cov-report=term-missing:skip-covered --cov=. .
       - if: ${{ success() }}
         run: scripts/build_directory_md.py 2>&1 | tee DIRECTORY.md

CONTRIBUTING.md

@@ -8,12 +8,12 @@ Welcome to [TheAlgorithms/Python](https://github.com/TheAlgorithms/Python)! Befo
 
 ### Contributor
 
-We are very happy that you consider implementing algorithms and data structure for others! This repository is referenced and used by learners from all over the globe. Being one of our contributors, you agree and confirm that:
+We are very happy that you consider implementing algorithms and data structures for others! This repository is referenced and used by learners from all over the globe. Being one of our contributors, you agree and confirm that:
 
 - You did your work - no plagiarism allowed
   - Any plagiarized work will not be merged.
 - Your work will be distributed under [MIT License](LICENSE.md) once your pull request is merged
-- You submitted work fulfils or mostly fulfils our styles and standards
+- Your submitted work fulfils or mostly fulfils our styles and standards
 
 __New implementation__ is welcome! For example, new solutions for a problem, different representations for a graph data structure or algorithm designs with different complexity but __identical implementation__ of an existing implementation is not allowed. Please check whether the solution is already implemented or not before submitting your pull request.
 
@@ -25,7 +25,7 @@ We appreciate any contribution, from fixing a grammar mistake in a comment to im
 
 Your contribution will be tested by our [automated testing on Travis CI](https://travis-ci.org/TheAlgorithms/Python/pull_requests) to save time and mental energy.  After you have submitted your pull request, you should see the Travis tests start to run at the bottom of your submission page.  If those tests fail, then click on the ___details___ button try to read through the Travis output to understand the failure.  If you do not understand, please leave a comment on your submission page and a community member will try to help.
 
-Please help us keep our issue list small by adding fixes: #{$ISSUE_NO} to the commit message of pull requests that resolve open issues. GitHub will use this tag to auto close the issue when the PR is merged.
+Please help us keep our issue list small by adding fixes: #{$ISSUE_NO} to the commit message of pull requests that resolve open issues. GitHub will use this tag to auto-close the issue when the PR is merged.
 
 #### What is an Algorithm?
 
@@ -53,7 +53,7 @@ Algorithms in this repo should not be how-to examples for existing Python packag
 Use [pre-commit](https://pre-commit.com/#installation) to automatically format your code to match our coding style:
 
 ```bash
-python3 -m pip install pre-commit  # required only once
+python3 -m pip install pre-commit  # only required the first time
 pre-commit install
 ```
 That's it! The plugin will run every time you commit any changes. If there are any errors found during the run, fix them and commit those changes. You can even run the plugin manually on all files:

DIRECTORY.md

@@ -1,7 +1,6 @@
-https://docs.python.org/3/reference/expressions.html#binary-bitwise-operations
-https://docs.python.org/3/reference/expressions.html#unary-arithmetic-and-bitwise-operations
-https://docs.python.org/3/library/stdtypes.html#bitwise-operations-on-integer-types
-
-https://wiki.python.org/moin/BitManipulation
-https://wiki.python.org/moin/BitwiseOperators
-https://www.tutorialspoint.com/python3/bitwise_operators_example.htm
+* https://docs.python.org/3/reference/expressions.html#binary-bitwise-operations
+* https://docs.python.org/3/reference/expressions.html#unary-arithmetic-and-bitwise-operations
+* https://docs.python.org/3/library/stdtypes.html#bitwise-operations-on-integer-types
+* https://wiki.python.org/moin/BitManipulation
+* https://wiki.python.org/moin/BitwiseOperators
+* https://www.tutorialspoint.com/python3/bitwise_operators_example.htm

bit_manipulation/README.md

@@ -22,7 +22,7 @@ def binary_and(a: int, b: int) -> str:
     >>> binary_and(0, -1)
     Traceback (most recent call last):
         ...
-    ValueError: the value of both input must be positive
+    ValueError: the value of both inputs must be positive
     >>> binary_and(0, 1.1)
     Traceback (most recent call last):
         ...
@@ -33,7 +33,7 @@ def binary_and(a: int, b: int) -> str:
     TypeError: '<' not supported between instances of 'str' and 'int'
     """
     if a < 0 or b < 0:
-        raise ValueError("the value of both input must be positive")
+        raise ValueError("the value of both inputs must be positive")
 
     a_binary = str(bin(a))[2:]  # remove the leading "0b"
     b_binary = str(bin(b))[2:]  # remove the leading "0b"

bit_manipulation/binary_and_operator.py

@@ -21,7 +21,7 @@ def binary_or(a: int, b: int) -> str:
     >>> binary_or(0, -1)
     Traceback (most recent call last):
         ...
-    ValueError: the value of both input must be positive
+    ValueError: the value of both inputs must be positive
     >>> binary_or(0, 1.1)
     Traceback (most recent call last):
         ...
@@ -32,7 +32,7 @@ def binary_or(a: int, b: int) -> str:
     TypeError: '<' not supported between instances of 'str' and 'int'
     """
     if a < 0 or b < 0:
-        raise ValueError("the value of both input must be positive")
+        raise ValueError("the value of both inputs must be positive")
     a_binary = str(bin(a))[2:]  # remove the leading "0b"
     b_binary = str(bin(b))[2:]
     max_len = max(len(a_binary), len(b_binary))

bit_manipulation/binary_or_operator.py

@@ -22,7 +22,7 @@ def binary_xor(a: int, b: int) -> str:
     >>> binary_xor(0, -1)
     Traceback (most recent call last):
         ...
-    ValueError: the value of both input must be positive
+    ValueError: the value of both inputs must be positive
     >>> binary_xor(0, 1.1)
     Traceback (most recent call last):
         ...
@@ -33,7 +33,7 @@ def binary_xor(a: int, b: int) -> str:
     TypeError: '<' not supported between instances of 'str' and 'int'
     """
     if a < 0 or b < 0:
-        raise ValueError("the value of both input must be positive")
+        raise ValueError("the value of both inputs must be positive")
 
     a_binary = str(bin(a))[2:]  # remove the leading "0b"
     b_binary = str(bin(b))[2:]  # remove the leading "0b"

bit_manipulation/binary_xor_operator.py

@@ -0,0 +1,43 @@
+def get_1s_count(number: int) -> int:
+    """
+    Count the number of set bits in a 32 bit integer using Brian Kernighan's way.
+    Ref - http://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetKernighan
+    >>> get_1s_count(25)
+    3
+    >>> get_1s_count(37)
+    3
+    >>> get_1s_count(21)
+    3
+    >>> get_1s_count(58)
+    4
+    >>> get_1s_count(0)
+    0
+    >>> get_1s_count(256)
+    1
+    >>> get_1s_count(-1)
+    Traceback (most recent call last):
+        ...
+    ValueError: the value of input must be positive
+    >>> get_1s_count(0.8)
+    Traceback (most recent call last):
+        ...
+    TypeError: Input value must be an 'int' type
+    """
+    if number < 0:
+        raise ValueError("the value of input must be positive")
+    elif isinstance(number, float):
+        raise TypeError("Input value must be an 'int' type")
+    count = 0
+    while number:
+        # This way we arrive at next set bit (next 1) instead of looping
+        # through each bit and checking for 1s hence the
+        # loop won't run 32 times it will only run the number of `1` times
+        number &= number - 1
+        count += 1
+    return count
+
+
+if __name__ == "__main__":
+    import doctest
+
+    doctest.testmod()

bit_manipulation/count_1s_brian_kernighan_method.py

@@ -146,10 +146,10 @@ def prime_implicant_chart(
     return chart
 
 
-def main():
+def main() -> None:
     no_of_variable = int(input("Enter the no. of variables\n"))
     minterms = [
-        int(x)
+        float(x)
         for x in input(
             "Enter the decimal representation of Minterms 'Spaces Separated'\n"
         ).split()

boolean_algebra/quine_mc_cluskey.py

@@ -70,7 +70,7 @@ def new_generation(cells: list[list[int]]) -> list[list[int]]:
     return next_generation
 
 
-def generate_images(cells: list[list[int]], frames) -> list[Image.Image]:
+def generate_images(cells: list[list[int]], frames: int) -> list[Image.Image]:
     """
     Generates a list of images of subsequent Game of Life states.
     """

cellular_automata/conways_game_of_life.py

@@ -40,18 +40,18 @@
 random.shuffle(choice)
 
 
-def create_canvas(size):
+def create_canvas(size: int) -> list[list[bool]]:
     canvas = [[False for i in range(size)] for j in range(size)]
     return canvas
 
 
-def seed(canvas):
+def seed(canvas: list[list[bool]]) -> None:
     for i, row in enumerate(canvas):
         for j, _ in enumerate(row):
             canvas[i][j] = bool(random.getrandbits(1))
 
 
-def run(canvas):
+def run(canvas: list[list[bool]]) -> list[list[bool]]:
     """This  function runs the rules of game through all points, and changes their
     status accordingly.(in the same canvas)
     @Args:
@@ -62,21 +62,22 @@ def run(canvas):
     --
     None
     """
-    canvas = np.array(canvas)
-    next_gen_canvas = np.array(create_canvas(canvas.shape[0]))
-    for r, row in enumerate(canvas):
+    current_canvas = np.array(canvas)
+    next_gen_canvas = np.array(create_canvas(current_canvas.shape[0]))
+    for r, row in enumerate(current_canvas):
         for c, pt in enumerate(row):
             # print(r-1,r+2,c-1,c+2)
             next_gen_canvas[r][c] = __judge_point(
-                pt, canvas[r - 1 : r + 2, c - 1 : c + 2]
+                pt, current_canvas[r - 1 : r + 2, c - 1 : c + 2]
             )
 
-    canvas = next_gen_canvas
+    current_canvas = next_gen_canvas
     del next_gen_canvas  # cleaning memory as we move on.
-    return canvas.tolist()
+    return_canvas: list[list[bool]] = current_canvas.tolist()
+    return return_canvas
 
 
-def __judge_point(pt, neighbours):
+def __judge_point(pt: bool, neighbours: list[list[bool]]) -> bool:
     dead = 0
     alive = 0
     # finding dead or alive neighbours count.

cellular_automata/game_of_life.py

@@ -0,0 +1,89 @@
+"""
+Program to encode and decode Baconian or Bacon's Cipher
+Wikipedia reference : https://en.wikipedia.org/wiki/Bacon%27s_cipher
+"""
+
+encode_dict = {
+    "a": "AAAAA",
+    "b": "AAAAB",
+    "c": "AAABA",
+    "d": "AAABB",
+    "e": "AABAA",
+    "f": "AABAB",
+    "g": "AABBA",
+    "h": "AABBB",
+    "i": "ABAAA",
+    "j": "BBBAA",
+    "k": "ABAAB",
+    "l": "ABABA",
+    "m": "ABABB",
+    "n": "ABBAA",
+    "o": "ABBAB",
+    "p": "ABBBA",
+    "q": "ABBBB",
+    "r": "BAAAA",
+    "s": "BAAAB",
+    "t": "BAABA",
+    "u": "BAABB",
+    "v": "BBBAB",
+    "w": "BABAA",
+    "x": "BABAB",
+    "y": "BABBA",
+    "z": "BABBB",
+    " ": " ",
+}
+
+
+decode_dict = {value: key for key, value in encode_dict.items()}
+
+
+def encode(word: str) -> str:
+    """
+    Encodes to Baconian cipher
+
+    >>> encode("hello")
+    'AABBBAABAAABABAABABAABBAB'
+    >>> encode("hello world")
+    'AABBBAABAAABABAABABAABBAB BABAAABBABBAAAAABABAAAABB'
+    >>> encode("hello world!")
+    Traceback (most recent call last):
+        ...
+    Exception: encode() accepts only letters of the alphabet and spaces
+    """
+    encoded = ""
+    for letter in word.lower():
+        if letter.isalpha() or letter == " ":
+            encoded += encode_dict[letter]
+        else:
+            raise Exception("encode() accepts only letters of the alphabet and spaces")
+    return encoded
+
+
+def decode(coded: str) -> str:
+    """
+    Decodes from Baconian cipher
+
+    >>> decode("AABBBAABAAABABAABABAABBAB BABAAABBABBAAAAABABAAAABB")
+    'hello world'
+    >>> decode("AABBBAABAAABABAABABAABBAB")
+    'hello'
+    >>> decode("AABBBAABAAABABAABABAABBAB BABAAABBABBAAAAABABAAAABB!")
+    Traceback (most recent call last):
+        ...
+    Exception: decode() accepts only 'A', 'B' and spaces
+    """
+    if set(coded) - {"A", "B", " "} != set():
+        raise Exception("decode() accepts only 'A', 'B' and spaces")
+    decoded = ""
+    for word in coded.split():
+        while len(word) != 0:
+            decoded += decode_dict[word[:5]]
+            word = word[5:]
+        decoded += " "
+    return decoded.strip()
+
+
+if __name__ == "__main__":
+    from doctest import testmod
+
+    testmod()

ciphers/baconian_cipher.py

@@ -1,13 +1,42 @@
 import base64
 
 
-def main() -> None:
-    inp = input("->")
-    encoded = inp.encode("utf-8")  # encoded the input (we need a bytes like object)
-    b32encoded = base64.b32encode(encoded)  # b32encoded the encoded string
-    print(b32encoded)
-    print(base64.b32decode(b32encoded).decode("utf-8"))  # decoded it
+def base32_encode(string: str) -> bytes:
+    """
+    Encodes a given string to base32, returning a bytes-like object
+    >>> base32_encode("Hello World!")
+    b'JBSWY3DPEBLW64TMMQQQ===='
+    >>> base32_encode("123456")
+    b'GEZDGNBVGY======'
+    >>> base32_encode("some long complex string")
+    b'ONXW2ZJANRXW4ZZAMNXW24DMMV4CA43UOJUW4ZY='
+    """
+
+    # encoded the input (we need a bytes like object)
+    # then, b32encoded the bytes-like object
+    return base64.b32encode(string.encode("utf-8"))
+
+
+def base32_decode(encoded_bytes: bytes) -> str:
+    """
+    Decodes a given bytes-like object to a string, returning a string
+    >>> base32_decode(b'JBSWY3DPEBLW64TMMQQQ====')
+    'Hello World!'
+    >>> base32_decode(b'GEZDGNBVGY======')
+    '123456'
+    >>> base32_decode(b'ONXW2ZJANRXW4ZZAMNXW24DMMV4CA43UOJUW4ZY=')
+    'some long complex string'
+    """
+
+    # decode the bytes from base32
+    # then, decode the bytes-like object to return as a string
+    return base64.b32decode(encoded_bytes).decode("utf-8")
 
 
 if __name__ == "__main__":
-    main()
+    test = "Hello World!"
+    encoded = base32_encode(test)
+    print(encoded)
+
+    decoded = base32_decode(encoded)
+    print(decoded)

ciphers/base32.py

@@ -7,7 +7,7 @@ def base64_encode(data: bytes) -> bytes:
     The data is first transformed to binary and appended with binary digits so that its
     length becomes a multiple of 6, then each 6 binary digits will match a character in
     the B64_CHARSET string. The number of appended binary digits would later determine
-    how many "=" sign should be added, the padding.
+    how many "=" signs should be added, the padding.
     For every 2 binary digits added, a "=" sign is added in the output.
     We can add any binary digits to make it a multiple of 6, for instance, consider the
     following example: