Тупикова Екатерина Викторовна, Б42

.github/workflows/ruff.yml

@@ -6,3 +6,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: astral-sh/ruff-action@v3
+      - run: ruff check .

.python-version

@@ -0,0 +1 @@
+3.12.2

src/bin_search.py

@@ -1,6 +1,10 @@
-def binSearch(xs: list[int], x: int):
+def bin_search(xs: list[int], x: int):
+
+    if type(x) != int:
+        raise "x is not int"
+
     left, right = 0, len(xs) - 1
-    while left < right:
+    while left <= right:
         mid = (left + right) // 2
         if xs[mid] == x:
             return mid
@@ -9,3 +13,4 @@ def binSearch(xs: list[int], x: int):
         else:
             right = mid - 1
     return -1
+

src/checksum.py

@@ -2,13 +2,37 @@ def modulo11Checksum(ISBNNumber: str):
 
     digits = [int(char) for char in ISBNNumber if char.isdigit()]
 
-    checkDigit = digits[-1]
+    assert (len(digits) == 9 and ISBNNumber[-1] == "X") or len(digits) == 10, "invalid lenght"
+
+    if (ISBNNumber[-1] == "X"):
+        #trash number
+        digits += [-1]
+        checkDigit = 10
+    else:
+        checkDigit = digits[-1]
 
     total = 0
     for i in range(len(digits) - 1):
-        weight = 10
+        weight = 10 - i
         digit = digits[i]
         total += digit * weight
 
     checksum = total + checkDigit
     return checksum % 11 == 0
+
+if __name__ == "__main__":
+    while True:
+        isbn = input("Enter number: ")
+
+        if isbn == "-1":
+            break
+
+        try:
+            result = modulo11Checksum(isbn)
+            if result:
+                print("correct")
+            else:
+                print("incorrect")
+        except Exception as e:
+            print(f"{type(e).__name__}: {e}")
+

test/test_bin_searh.py

@@ -1,13 +1,22 @@
-from src.bin_search import binSearch
+from src.bin_search import bin_search
 
 
 def test_middle():
-    assert binSearch([1, 2, 3, 4, 5], 4) == 3
+    assert bin_search([1, 2, 3, 4, 5], 4) == 3
 
 
 def test_start():
-    assert binSearch([1, 2, 3, 4], 2) == 1
+    assert bin_search([1, 2, 3, 4], 2) == 1
 
 
 def test_not_in_list():
-    assert binSearch([1, 2, 3, 4], 5) == -1
+    assert bin_search([1, 2, 3, 4], 5) == -1
+
+
+def test_binary_lenght_middle_left():
+    assert bin_search([1, 2, 3, 4, 5, 6, 7, 8], 4) == 3
+
+
+def test_binary_lenght_middle_right():
+    assert bin_search([1, 2, 3, 4, 5, 6, 7, 8], 5) == 4
+

test/test_checksum.py

@@ -2,7 +2,7 @@
 
 
 def test_good():
-    assert modulo11Checksum("2-266-11156-8")
+    assert modulo11Checksum("2-266-11156-6")
 
 
 def test_bad():