From a3ec861faa795071b73886968dbae770be94de22 Mon Sep 17 00:00:00 2001 From: Awen lelu Date: Mon, 20 Oct 2025 20:02:14 +0200 Subject: [PATCH] add flake.nix && and basic quadtree from file import --- .gitignore | 216 ++++++++++++++++++++++++++++++++++++++++- __init__.py | 2 +- flake.lock | 23 +++++ flake.nix | 29 ++++++ requirements.txt | 5 + src/__init__.py | 2 +- src/quadtree.py | 77 +++++++++++++-- tests/test_quadtree.py | 8 +- 8 files changed, 346 insertions(+), 16 deletions(-) create mode 100644 flake.lock create mode 100644 flake.nix create mode 100644 requirements.txt diff --git a/.gitignore b/.gitignore index 95be783..e15106e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,216 @@ +# 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/ -.idea/ \ No newline at end of file +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 + +# Redis +*.rdb +*.aof +*.pid + +# RabbitMQ +mnesia/ +rabbitmq/ +rabbitmq-data/ + +# ActiveMQ +activemq-data/ + +# 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 + +# Marimo +marimo/_static/ +marimo/_lsp/ +__marimo__/ + +# Streamlit +.streamlit/secrets.toml diff --git a/__init__.py b/__init__.py index b5ee836..d303c11 100644 --- a/__init__.py +++ b/__init__.py @@ -1 +1 @@ -import src \ No newline at end of file +import src diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..952f1c3 --- /dev/null +++ b/flake.lock @@ -0,0 +1,23 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 0, + "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=", + "path": "/nix/store/mzchpp2c3mgdzl6ah0qxwcxg32cnlcfv-source", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..5754027 --- /dev/null +++ b/flake.nix @@ -0,0 +1,29 @@ +{ + outputs = + { nixpkgs, ... }: + { + devShells.x86_64-linux = + let + python = pkgs.python312; + pythonEnv = python.withPackages ( + ps: with pkgs.python312Packages; [ + pip + ipython + + tkinter + + ruff + jedi-language-server + ] + ); + pkgs = import nixpkgs { system = "x86_64-linux"; }; + in + { + default = pkgs.mkShell { + packages = [ + pythonEnv + ]; + }; + }; + }; +} diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..9d9ff9d --- /dev/null +++ b/requirements.txt @@ -0,0 +1,5 @@ +iniconfig==2.3.0 +packaging==25.0 +pluggy==1.6.0 +Pygments==2.19.2 +pytest==8.4.2 diff --git a/src/__init__.py b/src/__init__.py index 5840da7..9154dc9 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -1 +1 @@ -from .quadtree import QuadTree, TkQuadTree \ No newline at end of file +from .quadtree import QuadTree, TkQuadTree diff --git a/src/quadtree.py b/src/quadtree.py index ffae7d5..5a0b87c 100644 --- a/src/quadtree.py +++ b/src/quadtree.py @@ -1,25 +1,82 @@ from __future__ import annotations +from tkinter import ttk, Tk, Canvas + + class QuadTree: - NB_NODES : int = 4 - def __init__(self, hg: bool | QuadTree, hd: bool | QuadTree, bd: bool | QuadTree,bg: bool | QuadTree): - pass + NB_NODES: int = 4 + + def __init__( + self, + hg: bool | QuadTree, + hd: bool | QuadTree, + bd: bool | QuadTree, + bg: bool | QuadTree, + ): + self.hg = hg + self.hd = hd + self.bd = bd + self.bg = bg @property def depth(self) -> int: - """ Recursion depth of the quadtree""" - return 1 + """Recursion depth of the quadtree""" + depths = [] + for i in ["hg", "hd", "bd", "bg"]: + try: + depths.append(self.__dict__[i].depth + 1) + except AttributeError: + depths.append(1) + return max(depths) @staticmethod def fromFile(filename: str) -> QuadTree: - """ Open a given file, containing a textual representation of a list""" - pass + """Open a given file, containing a textual representation of a list""" + + def parse(file) -> QuadTree: + nodes = [] + while char := file.read(1): + match char: + case "0" | "1": + nodes.append(char) + case "[": + nodes.append(parse(file)) + case "]": + return QuadTree(*nodes) + case _: + pass + if len(nodes) == 1: + return nodes[0] + + tree = None + with open(filename, "r") as f: + tree = parse(f) + return tree @staticmethod def fromList(data: list) -> QuadTree: - """ Generates a Quadtree from a list representation""" + """Generates a Quadtree from a list representation""" pass + class TkQuadTree(QuadTree): def paint(self): - """ TK representation of a Quadtree""" - pass \ No newline at end of file + """TK representation of a Quadtree""" + root = Tk() + canvas = Canvas(root, width=1000, height=1000) + canvas.pack() + self.draw_tree((0,0),(1000,1000)) + canvas.create_rectangle(0, 0, 500, 500, fill = "white") + root.mainloop() + + def draw_tree(boundaries: tuple[tuple[int]]): + pass + + @staticmethod + def fromFile(filename): + tree = QuadTree.fromFile(filename) + return TkQuadTree( + hg = tree.hg, + hd = tree.hd, + bd = tree.bd, + bg = tree.bg + ) diff --git a/tests/test_quadtree.py b/tests/test_quadtree.py index 717ddae..c0adc22 100644 --- a/tests/test_quadtree.py +++ b/tests/test_quadtree.py @@ -1,15 +1,17 @@ - import sys, os -sys.path.append(os.path.realpath(os.path.dirname(__file__)+"/..")) + +sys.path.append(os.path.realpath(os.path.dirname(__file__) + "/..")) from src import QuadTree, TkQuadTree + def test_sample(): filename = "files/quadtree.txt" q = QuadTree.fromFile(filename) assert q.depth == 4 + def test_single(): filename = "files/quadtree_easy.txt" q = QuadTree.fromFile(filename) - assert q.depth == 1 \ No newline at end of file + assert q.depth == 1