Compare commits
5
Commits
01313b9e02
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e6d4274525 | ||
|
|
b649addb49 | ||
|
|
043440e38c | ||
|
|
cd3da3dde1 | ||
|
|
f22067c6f3 |
No files matched your search
+6
@@ -0,0 +1,6 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<settings>
|
||||
<option name="USE_PROJECT_PROFILE" value="false" />
|
||||
<version value="1.0" />
|
||||
</settings>
|
||||
</component>
|
||||
Generated
+11
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="PYTHON_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/.venv" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Python 3.13 (matrixmania)" jdkType="Python SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
Generated
+7
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Black">
|
||||
<option name="sdkName" value="Python 3.13 (matrixmania)" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 (matrixmania)" project-jdk-type="Python SDK" />
|
||||
</project>
|
||||
Generated
+8
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/matrixmania.iml" filepath="$PROJECT_DIR$/.idea/matrixmania.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
Generated
+6
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -1,4 +1,7 @@
|
||||
# Regeln für dieses Projekt
|
||||
- Code nach PEP 8, Zeilenlänge maximal 88 Zeichen.
|
||||
- Jede Funktion und Methode hat einen Docstring und Type Hints.
|
||||
- Vor jedem Commit: `ruff check` und `ruff format`.
|
||||
- Vor jedem Commit: `ruff check` und `ruff format`.
|
||||
- ## Projektstruktur
|
||||
- Quellcode liegt unter "src/matrixmania/", Tests unter "test/test_matrixmania/"
|
||||
- Testpakete, Testdateien und Testfunktionen beginnen mit "test_"
|
||||
@@ -0,0 +1,146 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Installiert die Abhängigkeiten aus pyproject.toml in die aktuelle Python-Umgebung.
|
||||
|
||||
Ersatz für "Install requirements" aus PyCharm, wenn das Projekt eine pyproject.toml
|
||||
statt einer requirements.txt hat. Kein Build, keine besondere Projektstruktur nötig,
|
||||
nur Standardbibliothek (Python >= 3.11).
|
||||
|
||||
Benutzung:
|
||||
In PyCharm: Rechtsklick auf diese Datei -> Run 'install_dependencies'
|
||||
Im Terminal (venv aktiv): python install_dependencies.py
|
||||
|
||||
Ohne Parameter wird ALLES installiert:
|
||||
[project].dependencies + alle [project.optional-dependencies] + alle [dependency-groups]
|
||||
|
||||
Abweichendes Verhalten:
|
||||
python install_dependencies.py --extra dev nur Basis + Extra "dev"
|
||||
python install_dependencies.py --group test nur Basis + Gruppe "test"
|
||||
python install_dependencies.py --no-main --group dev
|
||||
python install_dependencies.py --list nur anzeigen, nichts installieren
|
||||
python install_dependencies.py --write requirements.txt schreiben statt installieren
|
||||
python install_dependencies.py --write -o reqs.txt
|
||||
"""
|
||||
from __future__ import annotations
|
||||
|
||||
import sys
|
||||
|
||||
if sys.version_info < (3, 11):
|
||||
sys.exit("Dieses Skript braucht Python 3.11 oder neuer (tomllib). "
|
||||
f"Aktuell: {sys.version.split()[0]}")
|
||||
|
||||
import argparse
|
||||
import subprocess
|
||||
import tempfile
|
||||
import tomllib
|
||||
from pathlib import Path
|
||||
|
||||
PROJECT_DIR = Path(__file__).resolve().parent
|
||||
|
||||
|
||||
def resolve_group(groups: dict, name: str, seen: set[str] | None = None) -> list[str]:
|
||||
"""Löst eine Dependency-Group inkl. {include-group = "..."} rekursiv auf."""
|
||||
seen = set() if seen is None else seen
|
||||
if name in seen:
|
||||
raise ValueError(f"Zyklische include-group: {name}")
|
||||
if name not in groups:
|
||||
raise KeyError(f"Dependency-Group '{name}' nicht gefunden")
|
||||
seen.add(name)
|
||||
result: list[str] = []
|
||||
for entry in groups[name]:
|
||||
if isinstance(entry, str):
|
||||
result.append(entry)
|
||||
elif isinstance(entry, dict) and "include-group" in entry:
|
||||
result.extend(resolve_group(groups, entry["include-group"], seen))
|
||||
return result
|
||||
|
||||
|
||||
def collect(data: dict, extras: list[str], groups: list[str], no_main: bool) -> list[str]:
|
||||
project = data.get("project", {})
|
||||
optional = project.get("optional-dependencies", {})
|
||||
dep_groups = data.get("dependency-groups", {})
|
||||
deps: list[str] = []
|
||||
|
||||
if not no_main:
|
||||
deps.extend(project.get("dependencies", []))
|
||||
for extra in extras:
|
||||
if extra not in optional:
|
||||
raise KeyError(f"Optional-Dependency '{extra}' nicht gefunden")
|
||||
deps.extend(optional[extra])
|
||||
for group in groups:
|
||||
deps.extend(resolve_group(dep_groups, group))
|
||||
|
||||
# Duplikate entfernen, Reihenfolge behalten
|
||||
return list(dict.fromkeys(d.strip() for d in deps if d.strip()))
|
||||
|
||||
|
||||
def main() -> int:
|
||||
p = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
|
||||
p.add_argument("-p", "--pyproject", type=Path, default=PROJECT_DIR / "pyproject.toml",
|
||||
help="Pfad zur pyproject.toml (Standard: neben diesem Skript)")
|
||||
p.add_argument("--extra", action="append", default=None,
|
||||
help="nur diese optional-dependencies (mehrfach möglich)")
|
||||
p.add_argument("--group", action="append", default=None,
|
||||
help="nur diese dependency-groups (mehrfach möglich)")
|
||||
p.add_argument("--no-main", action="store_true", help="[project].dependencies weglassen")
|
||||
p.add_argument("--list", action="store_true", help="Abhängigkeiten nur anzeigen")
|
||||
p.add_argument("--write", action="store_true", help="requirements-Datei schreiben statt installieren")
|
||||
p.add_argument("-o", "--output", type=Path, default=PROJECT_DIR / "requirements.txt",
|
||||
help="Zieldatei für --write")
|
||||
args = p.parse_args()
|
||||
|
||||
if not args.pyproject.exists():
|
||||
print(f"{args.pyproject} nicht gefunden", file=sys.stderr)
|
||||
return 1
|
||||
data = tomllib.loads(args.pyproject.read_text(encoding="utf-8"))
|
||||
all_extras = list(data.get("project", {}).get("optional-dependencies", {}))
|
||||
all_groups = list(data.get("dependency-groups", {}))
|
||||
|
||||
# Ohne --extra/--group: alles. Mit einem davon: nur das Gewählte.
|
||||
selective = args.extra is not None or args.group is not None
|
||||
extras = (args.extra or []) if selective else all_extras
|
||||
groups = (args.group or []) if selective else all_groups
|
||||
|
||||
try:
|
||||
deps = collect(data, extras, groups, args.no_main)
|
||||
except (KeyError, ValueError) as e:
|
||||
print(f"Fehler: {e.args[0]}", file=sys.stderr)
|
||||
print(f" Vorhandene --extra: {', '.join(all_extras) or '(keine)'}", file=sys.stderr)
|
||||
print(f" Vorhandene --group: {', '.join(all_groups) or '(keine)'}", file=sys.stderr)
|
||||
return 1
|
||||
|
||||
parts = ([] if args.no_main else ["Basis"]) + [f"extra:{e}" for e in extras] + [f"group:{g}" for g in groups]
|
||||
print(f"Auswahl: {', '.join(parts) or '(nichts)'}")
|
||||
|
||||
if args.list:
|
||||
print("\n".join(deps) or "(keine Abhängigkeiten)")
|
||||
return 0
|
||||
|
||||
content = f"# Automatisch erzeugt aus {args.pyproject.name} – nicht von Hand bearbeiten\n" + "\n".join(deps) + "\n"
|
||||
|
||||
if args.write:
|
||||
args.output.write_text(content, encoding="utf-8")
|
||||
print(f"{len(deps)} Abhängigkeiten -> {args.output}")
|
||||
return 0
|
||||
|
||||
if not deps:
|
||||
print("Keine Abhängigkeiten gefunden – nichts zu tun.")
|
||||
return 0
|
||||
|
||||
if sys.prefix == sys.base_prefix:
|
||||
print("WARNUNG: Es ist kein virtuelles Environment aktiv – es wird in die globale "
|
||||
f"Python-Installation installiert:\n {sys.prefix}", file=sys.stderr)
|
||||
if sys.stdin.isatty() and input("Trotzdem fortfahren? [j/N] ").strip().lower() not in ("j", "ja", "y", "yes"):
|
||||
return 1
|
||||
|
||||
with tempfile.NamedTemporaryFile("w", suffix=".txt", delete=False, encoding="utf-8") as tmp:
|
||||
tmp.write(content)
|
||||
tmp_path = Path(tmp.name)
|
||||
try:
|
||||
print(f"Installiere {len(deps)} Abhängigkeiten in {sys.prefix}\n")
|
||||
return subprocess.call([sys.executable, "-m", "pip", "install", "-r", str(tmp_path)])
|
||||
finally:
|
||||
tmp_path.unlink(missing_ok=True)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
raise SystemExit(main())
|
||||
+5
-1
@@ -1,3 +1,7 @@
|
||||
[project]
|
||||
name = "matrixmania"
|
||||
version = "0.1.0"
|
||||
version = "0.1.0"
|
||||
[project.optional-dependencies]
|
||||
dev = ["pytest", "ruff", "pytest-cov"]
|
||||
[tool.pytest.ini_options]
|
||||
pythonpath = "src"
|
||||
@@ -0,0 +1 @@
|
||||
from .compute import matmul, transpose, rot_2D, rot_3D, project_ortho, project_perspective
|
||||
@@ -91,6 +91,78 @@ def rot_2D(theta: float) -> list[list[float]]:
|
||||
]
|
||||
|
||||
|
||||
def rot_3D(angle: float, axis: str) -> list[list[float]]:
|
||||
"""Return a 3‑D rotation matrix.
|
||||
|
||||
The function converts *angle* from degrees to radians and builds the
|
||||
standard rotation matrix around the requested *axis*.
|
||||
|
||||
Args:
|
||||
angle: Rotationswinkel in Grad.
|
||||
axis: ``"x"``, ``"y"`` oder ``"z"`` – der Drehachse.
|
||||
|
||||
Returns:
|
||||
3x3 Rotationsmatrix als verschachtelte Listen.
|
||||
|
||||
Raises:
|
||||
ValueError: Wenn *axis* keinen gültigen Wert hat.
|
||||
"""
|
||||
# Validate axis
|
||||
axis_lower = axis.lower()
|
||||
if axis_lower not in {"x", "y", "z"}:
|
||||
raise ValueError(
|
||||
f"Unbekannte Achse '{axis}'. Erwartet: 'x', 'y' oder 'z'."
|
||||
)
|
||||
|
||||
# Convert degrees to radians for math functions
|
||||
rad = math.radians(angle)
|
||||
c = math.cos(rad)
|
||||
s = math.sin(rad)
|
||||
|
||||
if axis_lower == "x":
|
||||
return [
|
||||
[1, 0, 0],
|
||||
[0, c, -s],
|
||||
[0, s, c],
|
||||
]
|
||||
if axis_lower == "y":
|
||||
return [
|
||||
[c, 0, s],
|
||||
[0, 1, 0],
|
||||
[
|
||||
-s,
|
||||
0,
|
||||
c,
|
||||
],
|
||||
]
|
||||
# z
|
||||
return [
|
||||
[c, -s, 0],
|
||||
[s, c, 0],
|
||||
[0, 0, 1],
|
||||
]
|
||||
|
||||
def project_ortho(point: tuple[float, float, float], scale: float = 1) -> tuple[float, float]:
|
||||
"""Project a 3D point onto a 2D plane using orthogonal projection."""
|
||||
x, y, _z = point
|
||||
return (x * scale, y * scale)
|
||||
|
||||
|
||||
def project_perspective(point: tuple[float, float, float],
|
||||
focal_length: float = 1.0,
|
||||
scale: float = 1.0,
|
||||
camera_distance: float = 4.0) -> tuple[float, float]:
|
||||
"""Project a 3D point onto a 2D plane using perspective projection."""
|
||||
x, y ,z = point
|
||||
factor = focal_length / (z+camera_distance)
|
||||
x_2d = x * factor * scale
|
||||
y_2d = y * factor * scale
|
||||
return (x_2d, y_2d)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
#matmul prüfung
|
||||
Whitespace-only changes.
@@ -0,0 +1,48 @@
|
||||
import math
|
||||
import pytest
|
||||
|
||||
from matrixmania import project_perspective
|
||||
|
||||
|
||||
def approx_equal(a: float, b: float, rel_tol: float = 1e-9) -> bool:
|
||||
"""Utility to compare two floats with a relative tolerance."""
|
||||
return math.isclose(a, b, rel_tol=rel_tol)
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"point,focal_length,scale,expected",
|
||||
[
|
||||
# Case 1 – no scaling, unit focal length
|
||||
(
|
||||
(1.0, 2.0, 3.0),
|
||||
1.0, # focal_length
|
||||
1.0, # scale
|
||||
(
|
||||
1.0 / (4.0 + 3.0), # x projected
|
||||
2.0 / (4.0 + 3.0), # y projected
|
||||
),
|
||||
),
|
||||
# Case 2 – scale 100, focal length 2
|
||||
(
|
||||
(1.0, 2.0, 3.0),
|
||||
2.0, # focal_length
|
||||
100.0, # scale
|
||||
(
|
||||
2.0 * 100.0 / (4.0 + 3.0), # x projected
|
||||
2.0 * 100.0 * 2.0 / (4.0 + 3.0), # y projected
|
||||
),
|
||||
),
|
||||
],
|
||||
)
|
||||
def test_project_perspective(point, focal_length, scale, expected):
|
||||
"""Test that project_perspective returns the correct 2‑D projection."""
|
||||
# Call the function under test
|
||||
result = project_perspective(point, focal_length=focal_length, scale=scale)
|
||||
|
||||
# Basic sanity checks
|
||||
assert isinstance(result, tuple), "Result should be a tuple"
|
||||
assert len(result) == 2, "Result should contain two coordinates"
|
||||
|
||||
# Confirm values are close to expected (within tiny tolerance)
|
||||
assert approx_equal(result[0], expected[0]), f"X coordinate mismatch: {result[0]} != {expected[0]}"
|
||||
assert approx_equal(result[1], expected[1]), f"Y coordinate mismatch: {result[1]} != {expected[1]}"
|
||||
@@ -0,0 +1,21 @@
|
||||
from matrixmania import project_ortho
|
||||
|
||||
|
||||
def test_projection_point():
|
||||
#Arrange
|
||||
point = (1.0, 2.0, 3.0)
|
||||
expected_value = (1.0, 2.0)
|
||||
|
||||
#Act
|
||||
result = project_ortho(point)
|
||||
|
||||
#Assert
|
||||
assert result == expected_value
|
||||
|
||||
def test_projection_scale():
|
||||
point = (1.0, 2.0, 3.0)
|
||||
scale = 100
|
||||
expected_value = (100.0, 200.0)
|
||||
|
||||
result = project_ortho(point, scale)
|
||||
assert result == expected_value
|
||||
@@ -0,0 +1,38 @@
|
||||
import pytest
|
||||
from matrixmania import rot_2D, rot_3D
|
||||
import math
|
||||
|
||||
def test_rot_2D():
|
||||
#Arrange
|
||||
theta = math.pi / 2
|
||||
expected_value = [
|
||||
[0.0, -1.0],
|
||||
[1.0, 0.0]
|
||||
]
|
||||
|
||||
|
||||
#Act
|
||||
result = rot_2D(theta)
|
||||
|
||||
#Assert
|
||||
assert len(result) == len(expected_value)
|
||||
for row_result, row_expected in zip(result, expected_value):
|
||||
assert row_result == pytest.approx(row_expected, abs=1e-5)
|
||||
|
||||
def test_rot_3D():
|
||||
#Arrange
|
||||
angle = 90
|
||||
axis = "z"
|
||||
expected_value = [
|
||||
[0.0, -1.0, 0.0],
|
||||
[1.0, 0.0, 0.0],
|
||||
[0.0, 0.0, 1.0]
|
||||
]
|
||||
|
||||
#Act
|
||||
result = rot_3D(angle,axis)
|
||||
|
||||
#Assert
|
||||
assert len(result) == len(expected_value)
|
||||
for row_result, row_expected in zip(result, expected_value):
|
||||
assert row_result == pytest.approx(row_expected, abs=1e-5)
|
||||
Reference in new issue
Block a user