Now ShipBattle works

.gitignore

@@ -1,162 +0,0 @@
-# ---> 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/
-

.vscode/settings.json

@@ -0,0 +1,14 @@
+{
+    "python.testing.unittestArgs": [
+        "-v",
+        "-s",
+        "./HNC",
+        "-p",
+        "*_test.py"
+    ],
+    "python.testing.pytestEnabled": true,
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestArgs": [
+        "."
+    ]
+}

HNC/Exercises/Ship_Battle/ShipField.py

@@ -31,9 +31,9 @@ class ShipField:
 
     
     def target(self, row, col):
+        self.clear_marker()
+        
         if self.field_mode == 0:
-            self.clear_marker()
-
             if self.check_possible(row, col):
                 if self.ship_direction == 0:
                     for r in range(row, row + self.ship_size):
@@ -109,14 +109,10 @@ class ShipField:
         return True
 
     def set_ship_size(self, value):
-        if type(value) is str and value.isnumeric():
-            value = int(value)
             if 1 <= value <= 4:
                 self.ship_size = value
 
     def set_ship_direction(self, value):
-        if type(value) is str and value.isnumeric():
-            value = int(value)
             if 0 <= value <= 1:
                 self.ship_direction = value
 

HNC/Exercises/Ship_Battle/ShipField_test.py

@@ -115,7 +115,16 @@ class TestShipField(TestCase):
         self.assertEqual(new_field_string, old_field_string)
 
     def test_set_ship(self):
-        self.fail()
+        ship_field = ShipField()
+        ship_field.set_ship_size(4)
+        ship_field.set_ship_direction(0)
+
+        ship_field.set_ship(6, 3)
+
+        self.assertEqual(ship_field.field[63].strip(), '1')
+        self.assertEqual(ship_field.field[73].strip(), '1')
+        self.assertEqual(ship_field.field[83].strip(), '1')
+        self.assertEqual(ship_field.field[93].strip(), '1')
 
     def test_check_possible(self):
         self.fail()
@@ -127,5 +136,5 @@ class TestShipField(TestCase):
         self.fail()
 
     def test_toggle_ship_direction(self):
-        self.fail()
+        ship_field = ShipField()
 

HNC/Exercises/Ship_Battle/main.py

@@ -39,7 +39,7 @@ def colorize(field, buttons):
 def keypress_handler(e):
     global active_field
     if e.keysym.isnumeric():
-        active_field.set_ship_size(e.keysym)
+        active_field.set_ship_size(int(e.keysym))
     else:
         if e.keysym == 'm':
             active_field.toggle_field_mode()

HNC/Exercises/Ship_Battle/test.py

@@ -0,0 +1,10 @@
+from ShipField import ShipField
+
+my_field = ShipField()
+
+my_field.set_ship_size(1)
+
+if my_field.ship_size == 1:
+    print("OK")
+else:
+    print("ERROR")