Теврюков Илья Андреевич Б42

src/bin_search.py

@@ -1,11 +1,12 @@
-def binSearch(xs: list[int], x: int):
-    left, right = 0, len(xs) - 1
-    while left < right:
-        mid = (left + right) // 2
-        if xs[mid] == x:
-            return mid
-        if xs[mid] < x:
-            left = mid + 1
-        else:
-            right = mid - 1
-    return -1
+def binSearch(xs: list[int], x: int):
+    xs = sorted(xs)
+    left, right = 0, len(xs) - 1
+    while left <= right:
+        mid = (left + right) // 2
+        if xs[mid] == x:
+            return mid
+        if xs[mid] < x:
+            left = mid + 1
+        else:
+            right = mid - 1
+    return -1

src/checksum.py

@@ -1,14 +1,25 @@
-def modulo11Checksum(ISBNNumber: str):
-
-    digits = [int(char) for char in ISBNNumber if char.isdigit()]
-
-    checkDigit = digits[-1]
-
-    total = 0
-    for i in range(len(digits) - 1):
-        weight = 10
-        digit = digits[i]
-        total += digit * weight
-
-    checksum = total + checkDigit
-    return checksum % 11 == 0
+def modulo11Checksum(ISBNNumber: str):
+    digits = [int(char) for char in ISBNNumber if char.isdigit()]
+    if len(digits) != 10:
+        return -1  
+    checkDigit = digits[-1]
+    total = 0
+    for i in range(len(digits) - 1):
+        weight = 10 - i
+        digit = digits[i]
+        total += digit * weight
+    checksum = total + checkDigit
+    return checksum % 11 == 0
+
+ISBNNumber = input()
+
+while ISBNNumber != '-1':
+    res = modulo11Checksum(ISBNNumber)
+    if res == 1:
+        print('correct')
+    elif res == -1:
+        print('Incorrect number length')
+    else:
+        print('incorrect')
+    ISBNNumber = input()
+

test/test_bin_searh.py

@@ -1,13 +1,23 @@
-from src.bin_search import binSearch
-
-
-def test_middle():
-    assert binSearch([1, 2, 3, 4, 5], 4) == 3
-
-
-def test_start():
-    assert binSearch([1, 2, 3, 4], 2) == 1
-
-
-def test_not_in_list():
-    assert binSearch([1, 2, 3, 4], 5) == -1
+from src.bin_search import binSearch
+def test_middle():
+    assert binSearch([1, 2, 3, 4, 5], 4) == 3
+
+
+def test_start():
+    assert binSearch([1, 2, 3, 4], 2) == 1
+
+
+def test_last_element():
+    assert binSearch([1, 2, 3, 4, 5], 5) == 4
+
+
+def test_single_element_found():
+    assert binSearch([42], 42) == 0
+
+
+def test_single_element_not_found():
+    assert binSearch([42], 100) == -1
+
+
+def test_empty_array():
+    assert binSearch([], 5) == -1

test/test_checksum.py

@@ -1,9 +1,21 @@
-from src.checksum import modulo11Checksum
-
-
-def test_good():
-    assert modulo11Checksum("2-266-11156-8")
-
-
-def test_bad():
-    assert not modulo11Checksum("2-266-11156-3")
+from src.checksum import modulo11Checksum
+
+
+def test_bad():
+    assert not modulo11Checksum("2-266-11156-3")
+
+
+def test_good_without_hyphens():
+    assert modulo11Checksum("2266111568")
+
+
+def test_good_with_x_check_digit():
+    assert modulo11Checksum("0-304-33376-")
+
+
+def test_bad_wrong_length_long():
+    assert modulo11Checksum("1234567890123") == -1
+
+
+def test_bad_wrong_length_short():
+    assert modulo11Checksum("12345") == -1