diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ad4a1f1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,176 @@ +# Created by https://www.toptal.com/developers/gitignore/api/python +# Edit at https://www.toptal.com/developers/gitignore?templates=python + +### Python ### +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$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 + +# 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 + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/#use-with-ide +.pdm.toml + +# 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 +.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/ + +### Python Patch ### +# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration +poetry.toml + +# ruff +.ruff_cache/ + +# LSP config files +pyrightconfig.json + +# End of https://www.toptal.com/developers/gitignore/api/python diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..dd87ca8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 rmnsmnsk + +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. diff --git a/README.md b/README.md index e93444f..3f64f31 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ Темы: Git и GitHub, стандарты оформления кода, хорошие практики, тестирование. +Работу выполнил Семенский Роман Николаевич из группы Б-42. + ## Этапы выполнения работы - Сделать **fork** этого репозитория diff --git a/src/__pycache__/bin_search.cpython-312.pyc b/src/__pycache__/bin_search.cpython-312.pyc new file mode 100644 index 0000000..d964acb Binary files /dev/null and b/src/__pycache__/bin_search.cpython-312.pyc differ diff --git a/src/__pycache__/checksum.cpython-312.pyc b/src/__pycache__/checksum.cpython-312.pyc new file mode 100644 index 0000000..5763b32 Binary files /dev/null and b/src/__pycache__/checksum.cpython-312.pyc differ diff --git a/src/bin_search.py b/src/bin_search.py index 713abfc..312a585 100644 --- a/src/bin_search.py +++ b/src/bin_search.py @@ -1,6 +1,21 @@ -def binSearch(xs: list[int], x: int): +def bin_search(xs: list[int], x: int): + + if not isinstance(xs, list) or not xs: + return -1 + + if not isinstance(x, int): + return -1 + + for i in xs: + if not isinstance(i, int): + return -1 + + if xs != sorted(xs): + return -1 + left, right = 0, len(xs) - 1 - while left < right: + + while left <= right: mid = (left + right) // 2 if xs[mid] == x: return mid diff --git a/src/checksum.py b/src/checksum.py index 74b4fb0..6eaf316 100644 --- a/src/checksum.py +++ b/src/checksum.py @@ -1,14 +1,35 @@ -def modulo11Checksum(ISBNNumber: str): +def modulo11_checksum(isbn_number: str): - digits = [int(char) for char in ISBNNumber if char.isdigit()] + if not isinstance(isbn_number, str): + return False - checkDigit = digits[-1] + digits = [int(char) for char in isbn_number if char.isdigit()] + if len(digits) != 10: + return False + + check_digit = 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 + total += check_digit + return total % 11 == 0 + +if __name__ == "__main__": + print("Проверка ISBN-10. Для выхода введите -1") + + while True: + isbn = input("Введите ISBN: ") + + if isbn == "-1": + print("Выход") + break + + if modulo11_checksum(isbn): + print("correct") + else: + print("incorrect") diff --git a/test/__pycache__/test_bin_searh.cpython-312-pytest-7.4.4.pyc b/test/__pycache__/test_bin_searh.cpython-312-pytest-7.4.4.pyc new file mode 100644 index 0000000..7d514e0 Binary files /dev/null and b/test/__pycache__/test_bin_searh.cpython-312-pytest-7.4.4.pyc differ diff --git a/test/__pycache__/test_checksum.cpython-312-pytest-7.4.4.pyc b/test/__pycache__/test_checksum.cpython-312-pytest-7.4.4.pyc new file mode 100644 index 0000000..93c41a8 Binary files /dev/null and b/test/__pycache__/test_checksum.cpython-312-pytest-7.4.4.pyc differ diff --git a/test/test_bin_searh.py b/test/test_bin_searh.py index d18d85b..2b6dacd 100644 --- a/test/test_bin_searh.py +++ b/test/test_bin_searh.py @@ -1,13 +1,33 @@ -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_single(): + assert bin_search([6], 6) == 0 + assert bin_search([2], 3) == -1 + +def test_empty(): + assert bin_search([], 8) == -1 + +def test_first(): + assert bin_search([1, 2, 3, 4], 1) == 0 + +def test_last(): + assert bin_search([1, 2, 3, 8], 8) == 3 + +def test_invaild_input(): + assert bin_search(None, 5) == -1 + assert bin_search([1, 2, "с"], 5) == -1 + +def test_unsorted_array(): + assert bin_search([3, 1, 2], 2) == -1 diff --git a/test/test_checksum.py b/test/test_checksum.py index f64a64c..12e831e 100644 --- a/test/test_checksum.py +++ b/test/test_checksum.py @@ -1,9 +1,19 @@ -from src.checksum import modulo11Checksum +from src.checksum import modulo11_checksum def test_good(): - assert modulo11Checksum("2-266-11156-8") + assert modulo11_checksum("2-266-11156-6") +def test_only_digits(): + assert modulo11_checksum("2266111566") + +def test_wrong_length(): + assert not modulo11_checksum("12323") + assert not modulo11_checksum("1234123215678901234") def test_bad(): - assert not modulo11Checksum("2-266-11156-3") + assert not modulo11_checksum("2-266-11156-3") + +def test_invaild_input(): + assert not modulo11_checksum(None) + assert not modulo11_checksum("")