7 commit hausaufgabe

.idea/matrixmania.iml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="jdk" jdkName="Python 3.14" jdkType="Python SDK" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="jdk" jdkName="Python 3.13 (PythonProject)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

.idea/misc.xml

@@ -3,5 +3,5 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.14" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.14" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 (PythonProject)" project-jdk-type="Python SDK" />
 </project>

AGENTS.md

@@ -1,4 +1,8 @@
 # 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_

install_dependencies.py

@@ -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())

opencode.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://opencode.ai/config.json",
+  "provider": {
+    "thn": {
+      "npm": "@ai-sdk/openai-compatible",
+      "options": {
+        "baseURL": "http://141.75.33.244:8000/v1",
+        "apiKey": "sk-QXj1p40XOwNSze_5-eYrBzVh3qIgAfqoWPkAjNVqOS8"
+      },
+      "models": {
+        "gpt-oss:20b": { "name": "GPT-OSS 20B" }
+      }
+    }
+  },
+  "model": "thn/gpt-oss:20b"
+}

pyproject.toml

@@ -2,4 +2,13 @@
 name = "matrixmania"
 version = "0.1.0"
 
-dependencies = ["tabulate", "ruff"]
+dependencies = ["tabulate", "ruff"]
+
+[project.optional-dependencies]
+dev = ["pytest", "ruff", "pytest-cov"]
+
+[tool.pytest.ini_options]
+pythonpath = "src"
+testpaths = "test"
+
+

src/matrixmania/__init__.py

@@ -0,0 +1 @@
+from .compute import matmul, transpose, rot_2D

src/matrixmania/compute.py

@@ -1,5 +1,5 @@
 import math
-from tabulate import tabulate
+
 
 def matmul(matrix_a: list[list[float | int]], matrix_b: list[list[float | int]]) -> list[list[float | int]]:
     """Multipliziert zwei Matrizen, die als verschachtelte Listen dargestellt sind.
@@ -71,7 +71,6 @@ def transpose(matrix: list[list[float | int]]) -> list[list[float | int]]:
     return [list(row) for row in zip(*matrix)]
 
 
-
 def rot_2D(theta: float) -> list[list[float]]:
     """Gibt die 2D-Rotationsmatrix für einen gegebenen Winkel theta (in Bogenmaß) zurück.
 
@@ -92,17 +91,95 @@ def rot_2D(theta: float) -> list[list[float]]:
     ]
 
 
+def rot_3D(angle: float, axis: str) -> list[list[float]]:
+    """Gibt die 3D-Rotationsmatrix für einen gegebenen Winkel ``angle`` (in Bogenmaß) und Achse ``axis`` zurück.
+
+    Parameters
+    ----------
+    angle: float
+        Rotationswinkel in Bogenmaß.
+    axis: str
+        Achsenbezeichner, muss ``'x'``, ``'y'`` oder ``'z'`` sein.
+
+    Returns
+    -------
+    list[list[float]]
+        Die 3×3-Rotationsmatrix entsprechend der Achse.
+
+    Raises
+    ------
+    ValueError
+        Falls ``axis`` nicht einer der erlaubten Werte ist.
+
+    Notes
+    -----
+    Die Matrizenbasisformeln:
+
+    Notes
+    -----
+    Die Standardformeln für 3‑D‑Rotationsmatrizen werden nicht aufgeführt, um Escape‑Probleme zu vermeiden.
+
+    """
+    c = math.cos(angle)
+    s = math.sin(angle)
+
+    if axis == 'x':
+        return [
+            [1.0, 0.0, 0.0],
+            [0.0, c, -s],
+            [0.0, s, c]
+        ]
+    if axis == 'y':
+        return [
+            [c, 0.0, s],
+            [0.0, 1.0, 0.0],
+            [-s, 0.0, c]
+        ]
+    if axis == 'z':
+        return [
+            [c, -s, 0.0],
+            [s, c, 0.0],
+            [0.0, 0.0, 1.0]
+        ]
+    raise ValueError("Axis must be one of 'x', 'y', or 'z'.")
+
+def project_ortho(point: tuple[float, float, float], scale: float = 1.0) -> tuple[float, float]:
+    """Orthogonal projection of a 3‑D point onto the xy‑plane.
+
+    Parameters
+    ----------
+    point : tuple[float, float, float]
+        Cartesian coordinates (x, y, z).
+    scale : float, optional
+        Scaling factor applied to x and y after projection. Defaults to 1.
+
+    Returns
+    -------
+    tuple[float, float]
+        Projected 2‑D coordinates (x_scaled, y_scaled).
+
+    Examples
+    --------
+    >>> project_ortho((1, 2, 3))
+    (1, 2)
+    """
+    if len(point) != 3:
+        raise ValueError("Point must be a 3‑tuple.")
+    return (point[0] * scale, point[1] * scale)
+
+
+
 if __name__ == "__main__":
 
- #matmul prüfung
+    #matmul prüfung
     matrix_a = [ [ 3, 4, -1, 4 ],
-                    [ -2, 2, 5, 1 ]
-                ]
+                [ -2, 2, 5, 1 ]
+            ]
     matrix_b = [ [ 1, 3, -2 ],
                 [ 2, 5, 1 ],
                 [ -1, 4, -4 ],
                 [ 2, 3, 6 ]
-                ]
+            ]
     matrix_c = matmul(matrix_a, matrix_b)
     print("Ergebnis C = A * B:")
     for row in matrix_c:
@@ -117,10 +194,10 @@ if __name__ == "__main__":
     except ValueError as e:
         print(f"Fehler abgefangen (matmul): {e}")
 
-#Agent Fehler ausgebessert: list[list/[float | int] -> list[list[float | int]
-#Gut gelöst -> TypeHints beachtet und verständlichen DocString; Ruff check passed
+    #Agent Fehler ausgebessert: list[list/[float | int] -> list[list[float | int]
+    #Gut gelöst -> TypeHints beachtet und verständlichen DocString; Ruff check passed
 
-#transpose prüfung
+    #transpose prüfung
     matrix = [
         [1, 2, 3],
         [4, 5, 6]
@@ -154,4 +231,19 @@ if __name__ == "__main__":
     theta = math.pi / 2 #1,57...
     print(f"Winkel: {math.degrees(theta)} Grad (pi / 2)")
     print(rot_2D(theta))
-    print(tabulate(rot_2D(1.0)))
+    print(rot_2D(1.0))
+
+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]:
+    """Projiziert einen 3D-Punkt perspektivisch auf eine 2D-Ebene."""
+    x, y, z = point
+    depth = z + camera_distance
+    if depth == 0:
+        raise ValueError("z + camera_distance darf nicht 0 sein.")
+    x_2d = x * focal_length / depth * scale
+    y_2d = y * focal_length / depth * scale
+    return (x_2d, y_2d)
+
+

test/test_matrixmania/test_projection.py

@@ -0,0 +1,44 @@
+import pytest
+
+from matrixmania.compute import project_ortho, project_perspective
+
+
+def test_project_ortho_default():
+    """Projektionsfunktion ohne Skalierung"""
+    point = (1.0, 2.0, 3.0)
+    assert project_ortho(point) == (1.0, 2.0)
+
+
+def test_project_perspective_default():
+    """Test project_perspective with default scale and focal_length=1"""
+    # Arrange
+    point = (1.0, 2.0, 3.0)
+    # Act
+    result = project_perspective(point)
+    # depth = z + camera_distance = 3 + 4 = 7
+    # Expected x = 1 * 1 / 7 * 1 = 1/7
+    # Expected y = 2 * 1 / 7 * 1 = 2/7
+    expected = (1/7, 2/7)
+    # Assert
+    assert result == pytest.approx(expected)
+
+
+def test_project_perspective_scaled():
+    """Test project_perspective with scale=100 and focal_length=2"""
+    # Arrange
+    point = (1.0, 2.0, 3.0)
+    scale = 100
+    focal_length = 2
+    # Act
+    result = project_perspective(point, focal_length=focal_length, scale=scale)
+    # depth = 3 + 4 = 7
+    # Expected x = 1 * 2 / 7 * 100 = 200/7
+    # Expected y = 2 * 2 / 7 * 100 = 400/7
+    expected = (200/7, 400/7)
+    # Assert
+    assert result == pytest.approx(expected)
+
+    """Projektionsfunktion mit Skalierung"""
+    point = (1.0, 2.0, 3.0)
+    assert project_ortho(point, scale=100) == (100.0, 200.0)
+

test/test_matrixmania/test_rot.py

@@ -0,0 +1,54 @@
+import math
+
+import pytest
+
+from matrixmania.compute import rot_2D, rot_3D
+
+
+def assert_matrix_close(actual, expected):
+    """Vergleicht zwei Matrizen elementweise mit Toleranz."""
+    assert len(actual) == len(expected)
+    for row_a, row_e in zip(actual, expected):
+        assert row_a == pytest.approx(row_e, abs=1e-9)
+
+
+# ---------- rot_2D ----------
+
+def test_rot_2D_90_degree():
+    # Arrange
+    angle = math.pi / 2
+    expected = [[0, -1],
+                [1, 0]]
+
+    # Act
+    result = rot_2D(angle)
+
+    # Assert
+    assert_matrix_close(result, expected)
+
+
+# ---------- rot_3D ----------
+
+def test_rot_3D_90_degree_z():
+    # Arrange
+    angle = math.pi / 2
+    axis = "z"
+    expected = [[0, -1, 0],
+                [1, 0, 0],
+                [0, 0, 1]]
+
+    # Act
+    result = rot_3D(angle, axis)
+
+    # Assert
+    assert_matrix_close(result, expected)
+
+
+def test_rot_3D_invalid_axis():
+    # Arrange
+    angle = 1.0
+    axis = "w"
+
+    # Act + Assert
+    with pytest.raises(ValueError):
+        rot_3D(angle, axis)