From 9a953178849857ada7a1a53b12704b6a73663c05 Mon Sep 17 00:00:00 2001 From: dfdf11-cpu Date: Fri, 7 Nov 2025 12:51:19 +0000 Subject: [PATCH 01/14] add file .gitignore --- .gitignore | 207 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 207 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b7faf40 --- /dev/null +++ b/.gitignore @@ -0,0 +1,207 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[codz] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py.cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# UV +# Similar to Pipfile.lock, it is generally recommended to include uv.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +#uv.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock +#poetry.toml + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +# pdm recommends including project-wide configuration in pdm.toml, but excluding .pdm-python. +# https://pdm-project.org/en/latest/usage/project/#working-with-version-control +#pdm.lock +#pdm.toml +.pdm-python +.pdm-build/ + +# pixi +# Similar to Pipfile.lock, it is generally recommended to include pixi.lock in version control. +#pixi.lock +# Pixi creates a virtual environment in the .pixi directory, just like venv module creates one +# in the .venv directory. It is recommended not to include this directory in version control. +.pixi + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.envrc +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ + +# Abstra +# Abstra is an AI-powered process automation framework. +# Ignore directories containing user credentials, local state, and settings. +# Learn more at https://abstra.io/docs +.abstra/ + +# Visual Studio Code +# Visual Studio Code specific template is maintained in a separate VisualStudioCode.gitignore +# that can be found at https://github.com/github/gitignore/blob/main/Global/VisualStudioCode.gitignore +# and can be added to the global gitignore or merged into this file. However, if you prefer, +# you could uncomment the following to ignore the entire vscode folder +# .vscode/ + +# Ruff stuff: +.ruff_cache/ + +# PyPI configuration file +.pypirc + +# Cursor +# Cursor is an AI-powered code editor. `.cursorignore` specifies files/directories to +# exclude from AI features like autocomplete and code analysis. Recommended for sensitive data +# refer to https://docs.cursor.com/context/ignore-files +.cursorignore +.cursorindexingignore + +# Marimo +marimo/_static/ +marimo/_lsp/ +__marimo__/ From d24149ddf8be587385abb94a1a27ff44af65bccb Mon Sep 17 00:00:00 2001 From: dfdf11-cpu Date: Fri, 7 Nov 2025 12:54:39 +0000 Subject: [PATCH 02/14] add file LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..1cf69e3 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Екатерина Евневич + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From ba8b35ac152c116b3e90b1bfc05170db49074844 Mon Sep 17 00:00:00 2001 From: dfdf11-cpu Date: Fri, 7 Nov 2025 13:13:36 +0000 Subject: [PATCH 03/14] correcting the checksum calculation --- src/checksum.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/checksum.py b/src/checksum.py index 74b4fb0..c0d0e14 100644 --- a/src/checksum.py +++ b/src/checksum.py @@ -1,14 +1,16 @@ def modulo11Checksum(ISBNNumber: str): - digits = [int(char) for char in ISBNNumber if char.isdigit()] - + + if len(digits) != 10: + raise ValueError("ISBN number must contain exactly 10 digits") + 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 + + checksum = total + return checksum % 11 == checkDigit From 626186cee0739659309b7361ffeb0c7eff0d3092 Mon Sep 17 00:00:00 2001 From: dfdf11-cpu Date: Fri, 7 Nov 2025 13:17:16 +0000 Subject: [PATCH 04/14] adding control processing of the digit X --- src/checksum.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/checksum.py b/src/checksum.py index c0d0e14..63b493a 100644 --- a/src/checksum.py +++ b/src/checksum.py @@ -1,5 +1,10 @@ def modulo11Checksum(ISBNNumber: str): - digits = [int(char) for char in ISBNNumber if char.isdigit()] + digits = [] + for char in ISBNNumber: + if char.isdigit(): + digits.append(int(char)) + elif char.upper() == 'X' and len(digits) == 9: + digits.append(10) if len(digits) != 10: raise ValueError("ISBN number must contain exactly 10 digits") From e2ff2d364ed60300acf538a38289699176d5619f Mon Sep 17 00:00:00 2001 From: dfdf11-cpu Date: Fri, 7 Nov 2025 13:19:32 +0000 Subject: [PATCH 05/14] adding checks for empty strings and invalid characters --- src/checksum.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/checksum.py b/src/checksum.py index 63b493a..e43ca62 100644 --- a/src/checksum.py +++ b/src/checksum.py @@ -1,10 +1,15 @@ def modulo11Checksum(ISBNNumber: str): + if not ISBNNumber: + raise ValueError("ISBN number cannot be empty") + digits = [] for char in ISBNNumber: if char.isdigit(): digits.append(int(char)) elif char.upper() == 'X' and len(digits) == 9: digits.append(10) + elif not char in ['-', ' ']: + raise ValueError(f"Invalid character '{char}' in ISBN number") if len(digits) != 10: raise ValueError("ISBN number must contain exactly 10 digits") From 347f28942c4730a90106f1acb3bf50377c6a1b9c Mon Sep 17 00:00:00 2001 From: dfdf11-cpu Date: Fri, 7 Nov 2025 13:21:51 +0000 Subject: [PATCH 06/14] checking the X position --- src/checksum.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/checksum.py b/src/checksum.py index e43ca62..b52db27 100644 --- a/src/checksum.py +++ b/src/checksum.py @@ -3,11 +3,15 @@ def modulo11Checksum(ISBNNumber: str): raise ValueError("ISBN number cannot be empty") digits = [] - for char in ISBNNumber: + for i, char in enumerate(ISBNNumber): if char.isdigit(): digits.append(int(char)) - elif char.upper() == 'X' and len(digits) == 9: - digits.append(10) + elif char.upper() == 'X': + remaining_chars = ISBNNumber[i:].replace('-', '').replace(' ', '') + if len(remaining_chars) == 1 and len(digits) == 9: + digits.append(10) + else: + raise ValueError("X can only be used as the last check digit") elif not char in ['-', ' ']: raise ValueError(f"Invalid character '{char}' in ISBN number") From eb24d554f744ff9281f95c0c2e41ae371ccc1984 Mon Sep 17 00:00:00 2001 From: dfdf11-cpu Date: Fri, 7 Nov 2025 13:29:57 +0000 Subject: [PATCH 07/14] add information to file README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index e93444f..e163dc6 100644 --- a/README.md +++ b/README.md @@ -19,3 +19,5 @@ - Сделать **pull request** (один на обе задачи) с решением в main ветку этого репозитория - **pull request** должен содержать описание проделанной работы, ваше ФИО и номер группы - Если не получилось/забыли сделать адекватное описание исправленных ошибок в описании к **commit**, то нужно сделать это хотя бы в комментариях к **pull request** + +student: Евневич Екатерина. From add41fc54cde09e9a2deb7da93ba3163535b6203 Mon Sep 17 00:00:00 2001 From: dfdf11-cpu Date: Fri, 7 Nov 2025 13:33:55 +0000 Subject: [PATCH 08/14] correcting a cycle condition --- src/binary_search.py | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 src/binary_search.py diff --git a/src/binary_search.py b/src/binary_search.py new file mode 100644 index 0000000..3c91f7d --- /dev/null +++ b/src/binary_search.py @@ -0,0 +1,11 @@ +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 From dde194e9dba698be91df29bde235910c451e2fc6 Mon Sep 17 00:00:00 2001 From: dfdf11-cpu Date: Fri, 7 Nov 2025 13:35:38 +0000 Subject: [PATCH 09/14] adding processing of an empty array --- src/binary_search.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/binary_search.py b/src/binary_search.py index 3c91f7d..c5c186b 100644 --- a/src/binary_search.py +++ b/src/binary_search.py @@ -1,4 +1,7 @@ def binSearch(xs: list[int], x: int): + if not xs: + return -1 + left, right = 0, len(xs) - 1 while left <= right: mid = (left + right) // 2 From 63ae39d3c42b1f95a1307df3ac72ae6866a2bc2e Mon Sep 17 00:00:00 2001 From: dfdf11-cpu Date: Fri, 7 Nov 2025 13:38:44 +0000 Subject: [PATCH 10/14] adding an array sorting check --- src/binary_search.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/binary_search.py b/src/binary_search.py index c5c186b..9de9359 100644 --- a/src/binary_search.py +++ b/src/binary_search.py @@ -2,6 +2,10 @@ def binSearch(xs: list[int], x: int): if not xs: return -1 + for i in range(1, len(xs)): + if xs[i] < xs[i-1]: + raise ValueError("Array must be sorted for binary search") + left, right = 0, len(xs) - 1 while left <= right: mid = (left + right) // 2 From 9da3cbd098553c0edb39e5d5534a61b23618adbe Mon Sep 17 00:00:00 2001 From: dfdf11-cpu Date: Fri, 7 Nov 2025 13:52:32 +0000 Subject: [PATCH 11/14] deleted an extra file --- src/bin_search.py | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 src/bin_search.py diff --git a/src/bin_search.py b/src/bin_search.py deleted file mode 100644 index 713abfc..0000000 --- a/src/bin_search.py +++ /dev/null @@ -1,11 +0,0 @@ -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 From 1acba8323cf5a07457d7dc7970af7200c7f33ed0 Mon Sep 17 00:00:00 2001 From: dfdf11-cpu Date: Fri, 7 Nov 2025 14:05:52 +0000 Subject: [PATCH 12/14] errors fixed: 'not' removed, 'continue' added --- src/checksum.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/checksum.py b/src/checksum.py index b52db27..6c168fa 100644 --- a/src/checksum.py +++ b/src/checksum.py @@ -12,7 +12,9 @@ def modulo11Checksum(ISBNNumber: str): digits.append(10) else: raise ValueError("X can only be used as the last check digit") - elif not char in ['-', ' ']: + elif char in ['-', ' ']: + continue + else: raise ValueError(f"Invalid character '{char}' in ISBN number") if len(digits) != 10: From 85201d0ad5fad935893a2f1a4f8c03107edb6e64 Mon Sep 17 00:00:00 2001 From: dfdf11-cpu Date: Fri, 7 Nov 2025 14:07:45 +0000 Subject: [PATCH 13/14] errors fixed: fixed 'total' --- src/checksum.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/checksum.py b/src/checksum.py index 6c168fa..8b7417b 100644 --- a/src/checksum.py +++ b/src/checksum.py @@ -28,5 +28,5 @@ def modulo11Checksum(ISBNNumber: str): digit = digits[i] total += digit * weight - checksum = total - return checksum % 11 == checkDigit + calculated_checksum = total % 11 + return calculated_checksum == checkDigit From 505d14175bc7c65abe9ec856283ca6774c411aa9 Mon Sep 17 00:00:00 2001 From: dfdf11-cpu Date: Fri, 7 Nov 2025 14:16:55 +0000 Subject: [PATCH 14/14] errors fixed: deleted checking --- src/binary_search.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/binary_search.py b/src/binary_search.py index 9de9359..9c4869d 100644 --- a/src/binary_search.py +++ b/src/binary_search.py @@ -1,12 +1,6 @@ -def binSearch(xs: list[int], x: int): - if not xs: - return -1 - - for i in range(1, len(xs)): - if xs[i] < xs[i-1]: - raise ValueError("Array must be sorted for binary search") - +def binSearch(xs: list[int], x: int) -> int: left, right = 0, len(xs) - 1 + while left <= right: mid = (left + right) // 2 if xs[mid] == x: @@ -15,4 +9,5 @@ def binSearch(xs: list[int], x: int): left = mid + 1 else: right = mid - 1 + return -1