initialer commit
This commit is contained in:
1 parent
e926d75119
commit
74776ef485
23 files changed
+444
-198
No files matched your search
@@ -0,0 +1,3 @@
|
|||||||
|
.venv/
|
||||||
|
__pycache__/
|
||||||
|
.env
|
||||||
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$" isTestSource="false" />
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/.venv" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="jdk" jdkName="Python 3.14 (PythonProject)" jdkType="Python SDK" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
+6
@@ -0,0 +1,6 @@
|
|||||||
|
<component name="InspectionProjectProfileManager">
|
||||||
|
<settings>
|
||||||
|
<option name="USE_PROJECT_PROFILE" value="false" />
|
||||||
|
<version value="1.0" />
|
||||||
|
</settings>
|
||||||
|
</component>
|
||||||
Generated
+10
@@ -0,0 +1,10 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module external.system.id="pyproject.toml" type="PYTHON_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager">
|
||||||
|
<content url="file://$MODULE_DIR$/aufgabenblatt_2/hausafgaben/matrixmania">
|
||||||
|
<excludeFolder url="file://$MODULE_DIR$/aufgabenblatt_2/hausafgaben/matrixmania/.venv" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="jdk" jdkName="~/PycharmProjects/PythonProject/aufgabenblatt_2/hausafgaben/matrixmania/.venv" 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.14 (PythonProject)" />
|
||||||
|
</component>
|
||||||
|
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.14 (PythonProject)" project-jdk-type="Python SDK" />
|
||||||
|
</project>
|
||||||
Generated
+9
@@ -0,0 +1,9 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectModuleManager">
|
||||||
|
<modules>
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/.idea/PythonProject.iml" filepath="$PROJECT_DIR$/.idea/PythonProject.iml" />
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/.idea/matrixmania.iml" filepath="$PROJECT_DIR$/.idea/matrixmania.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
Generated
+16
@@ -0,0 +1,16 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="PyToolsState">
|
||||||
|
<option name="tools">
|
||||||
|
<map>
|
||||||
|
<entry key="ruff">
|
||||||
|
<value>
|
||||||
|
<ToolEntry>
|
||||||
|
<option name="enabled" value="true" />
|
||||||
|
</ToolEntry>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
</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,58 +1,99 @@
|
|||||||
|
"""Funktionen zur linearen Algebra auf Matrizen als verschachtelte Listen."""
|
||||||
|
|
||||||
|
import math
|
||||||
|
|
||||||
|
|
||||||
def matmul(
|
def matmul(
|
||||||
matrix_a: list[list[float]], matrix_b: list[list[float]]
|
matrix_a: list[list[float]], matrix_b: list[list[float]]
|
||||||
) -> list[list[float]]:
|
) -> list[list[float]]:
|
||||||
"""Multipliziert zwei Matrizen.
|
|
||||||
|
|
||||||
Die Matrizen werden als verschachtelte Listen übergeben, jede innere
|
|
||||||
Liste ist eine Zeile.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
matrix_a: Linke Matrix mit m Zeilen und n Spalten.
|
|
||||||
matrix_b: Rechte Matrix mit n Zeilen und p Spalten.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Die Produktmatrix mit m Zeilen und p Spalten.
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
ValueError: Wenn eine Matrix leer ist oder die Spaltenzahl von
|
|
||||||
matrix_a nicht der Zeilenzahl von matrix_b entspricht.
|
|
||||||
"""
|
"""
|
||||||
|
Multipliziert zwei Matrizen miteinander (A * B).
|
||||||
|
|
||||||
if not matrix_a or not matrix_b:
|
:param matrix_a: Linke Matrix mit m Zeilen und n Spalten
|
||||||
raise ValueError("Die Matrizen dürfen nicht leer sein")
|
:param matrix_b: Rechte Matrix mit n Zeilen und p Spalten
|
||||||
|
:return: Ergebnismatrix mit m Zeilen und p Spalten
|
||||||
|
:raises ValueError: Wenn die Spaltenzahl von A nicht der Zeilenzahl von B entspricht
|
||||||
|
"""
|
||||||
|
if len(matrix_a[0]) != len(matrix_b):
|
||||||
|
raise ValueError("Spaltenzahl von A muss der Zeilenzahl von B entsprechen.")
|
||||||
|
|
||||||
columns_a = len(matrix_a[0])
|
|
||||||
rows_b = len(matrix_b)
|
|
||||||
if columns_a != rows_b:
|
|
||||||
raise ValueError(
|
|
||||||
f"Spaltenzahl von matrix_a ({columns_a}) passt nicht "
|
|
||||||
f"zur Zeilenzahl von matrix_b ({rows_b})"
|
|
||||||
)
|
|
||||||
|
|
||||||
columns_b = len(matrix_b[0])
|
|
||||||
result = []
|
result = []
|
||||||
for row_a in matrix_a:
|
for row in matrix_a:
|
||||||
result_row = []
|
new_row = []
|
||||||
for column_index in range(columns_b):
|
for col_index in range(len(matrix_b[0])):
|
||||||
value = 0
|
value = 0
|
||||||
for index in range(columns_a):
|
for k in range(len(row)):
|
||||||
value += row_a[index] * matrix_b[index][column_index]
|
value += row[k] * matrix_b[k][col_index]
|
||||||
result_row.append(value)
|
new_row.append(value)
|
||||||
result.append(result_row)
|
result.append(new_row)
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def transpose(matrix: list[list[float]]) -> list[list[float]]:
|
||||||
|
"""
|
||||||
|
Transponiert eine Matrix: Zeilen werden zu Spalten und Spalten zu Zeilen.
|
||||||
|
|
||||||
|
:param matrix: Matrix mit m Zeilen und n Spalten
|
||||||
|
:return: Transponierte Matrix mit n Zeilen und m Spalten
|
||||||
|
:raises ValueError: Bei leerer Matrix oder unterschiedlich langen Zeilen
|
||||||
|
"""
|
||||||
|
if not matrix or not matrix[0]:
|
||||||
|
raise ValueError("Die Matrix darf nicht leer sein.")
|
||||||
|
|
||||||
|
column_count = len(matrix[0])
|
||||||
|
for row in matrix:
|
||||||
|
if len(row) != column_count:
|
||||||
|
raise ValueError("Alle Zeilen müssen gleich viele Spalten haben.")
|
||||||
|
|
||||||
|
result = []
|
||||||
|
for col_index in range(column_count):
|
||||||
|
new_row = []
|
||||||
|
for row in matrix:
|
||||||
|
new_row.append(row[col_index])
|
||||||
|
result.append(new_row)
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def rot_2D(angle: float) -> list[list[float]]:
|
||||||
|
"""
|
||||||
|
Liefert die 2D-Rotationsmatrix für eine Drehung um den Ursprung.
|
||||||
|
|
||||||
|
:param angle: Drehwinkel im Bogenmaß (gegen den Uhrzeigersinn)
|
||||||
|
:return: 2x2-Rotationsmatrix [[cos, -sin], [sin, cos]]
|
||||||
|
"""
|
||||||
|
return [
|
||||||
|
[math.cos(angle), -math.sin(angle)],
|
||||||
|
[math.sin(angle), math.cos(angle)],
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
# Beispiel 1
|
# Test matmul (Beispiel aus dem Skript)
|
||||||
matrix_a = [[3, 4, -1, 4], [-2, 2, 5, 1]]
|
matrix_a = [[3, 4, -1, 4], [-2, 2, 5, 1]]
|
||||||
matrix_b = [[1, 3, -2], [2, 5, 1], [-1, 4, -4], [2, 3, 6]]
|
matrix_b = [[1, 3, -2], [2, 5, 1], [-1, 4, -4], [2, 3, 6]]
|
||||||
print(matmul(matrix_a, matrix_b)) # [[20, 37, 26], [-1, 27, -8]]
|
matrix_c = matmul(matrix_a, matrix_b)
|
||||||
|
print("Ergebnis C = A * B:")
|
||||||
|
for row in matrix_c:
|
||||||
|
print(row)
|
||||||
|
|
||||||
# Beispiel 2
|
# Zweites Beispiel matmul: Einheitsmatrix ändert nichts
|
||||||
print(matmul([[1, 2], [3, 4]], [[5, 6], [7, 8]])) # [[19, 22], [43, 50]]
|
identity = [[1, 0], [0, 1]]
|
||||||
|
print("\nEinheitsmatrix * [[5, 6], [7, 8]]:")
|
||||||
|
print(matmul(identity, [[5, 6], [7, 8]])) # Erwartet: [[5, 6], [7, 8]]
|
||||||
|
|
||||||
# Fehlerfall: 2x4 mal 2x4 passt nicht
|
# Fehlerfall matmul: Dimensionen passen nicht
|
||||||
try:
|
try:
|
||||||
matmul(matrix_a, matrix_a)
|
matmul([[1, 2]], [[1, 2]])
|
||||||
except ValueError as error:
|
except ValueError as error:
|
||||||
print(f"Fehler wie erwartet: {error}")
|
print("ValueError wie erwartet:", error)
|
||||||
|
|
||||||
|
# Test transpose
|
||||||
|
matrix = [[1, 2, 3], [4, 5, 6]]
|
||||||
|
print("\nTransponiert:")
|
||||||
|
print(transpose(matrix)) # Erwartet: [[1, 4], [2, 5], [3, 6]]
|
||||||
|
|
||||||
|
# Test rot_2D: Punkt (1, 0) um 90 Grad drehen -> erwartet (0, 1)
|
||||||
|
point = transpose([[1, 0]]) # [x, y] wird zur Spalte [[x], [y]]
|
||||||
|
rotated = matmul(rot_2D(math.pi / 2), point)
|
||||||
|
print("\nPunkt (1, 0) um 90 Grad gedreht:")
|
||||||
|
print(round(rotated[0][0], 10), round(rotated[1][0], 10)) # Erwartet: 0.0 1.0
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
"""Berechnung des Produkts einer Liste von Zahlen."""
|
||||||
|
|
||||||
|
|
||||||
|
def product(numbers: list[float]) -> float:
|
||||||
|
"""
|
||||||
|
Multipliziert alle Zahlen einer Liste miteinander.
|
||||||
|
|
||||||
|
:param numbers: Liste der Zahlen, die multipliziert werden sollen
|
||||||
|
:return: Produkt aller Zahlen; bei einer leeren Liste 1
|
||||||
|
"""
|
||||||
|
result = 1
|
||||||
|
for number in numbers:
|
||||||
|
result *= number
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
print(product([1, 2, 3, 4, 5])) # Erwartet: 120
|
||||||
|
print(product([2.5, 4])) # Erwartet: 10.0
|
||||||
|
print(product([])) # Erwartet: 1
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
def product(numbers: list[int]) -> int:
|
|
||||||
"""Berechnung des Produkts einer Zahlenliste."""
|
|
||||||
""" Args:
|
|
||||||
numbers (list[int]): Liste des integers
|
|
||||||
Returns:
|
|
||||||
int: Produkt des integers
|
|
||||||
leere Liste = 1 """
|
|
||||||
result = 1
|
|
||||||
for number in numbers:
|
|
||||||
result *= number
|
|
||||||
return result
|
|
||||||
if __name__ == "__main__":
|
|
||||||
print(product(numbers=[1, 2, 3, 4, 5])) #120
|
|
||||||
print(product([7])) #7
|
|
||||||
print(product([]))#1
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
"""original = "GEEKSFORGEEKS"
|
|
||||||
print(substring(original, 0, 5)) # GEEKS
|
|
||||||
print(substring(original, 5)) # FORGEEKS """
|
|
||||||
|
|
||||||
def substring(text: str, start: int, length: int | None = None) -> str:
|
|
||||||
if start < 0 or start > len(text):
|
|
||||||
raise ValueError(f"start muss zwischen 0 und {len(text)} liegen")
|
|
||||||
|
|
||||||
if length is None:
|
|
||||||
return text[start:]
|
|
||||||
|
|
||||||
if length < 0:
|
|
||||||
raise ValueError("length darf nicht negativ sein")
|
|
||||||
if start + length > len(text):
|
|
||||||
raise ValueError("Der Ausschnitt geht über das Ende des Strings hinaus")
|
|
||||||
|
|
||||||
return text[start : start + length]
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
original = "GEEKSFORGEEKS"
|
|
||||||
print(substring(original, 0, 5)) # GEEKS
|
|
||||||
print(substring(original, 5)) # FORGEEKS
|
|
||||||
|
|
||||||
try:
|
|
||||||
substring(original, -1)
|
|
||||||
except ValueError as error:
|
|
||||||
print(f"Fehler wie erwartet: {error}")
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
import math
|
|
||||||
from aufgabenblatt_1.hausaufgaben.compute import matmul
|
|
||||||
|
|
||||||
def transpose(matrix: list[list[float]]) -> list[list[float]]:
|
|
||||||
"""Transponiert eine Matrix: Zeilen werden zu Spalten.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
matrix: Matrix mit m Zeilen und n Spalten.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Die transponierte Matrix mit n Zeilen und m Spalten.
|
|
||||||
|
|
||||||
Raises:
|
|
||||||
ValueError: Wenn die Matrix leer ist oder die Zeilen
|
|
||||||
unterschiedlich viele Spalten haben.
|
|
||||||
"""
|
|
||||||
if not matrix or not matrix[0]:
|
|
||||||
raise ValueError("Die Matrix darf nicht leer sein")
|
|
||||||
|
|
||||||
column_count = len(matrix[0])
|
|
||||||
for row in matrix:
|
|
||||||
if len(row) != column_count:
|
|
||||||
raise ValueError("Alle Zeilen müssen gleich viele Spalten haben")
|
|
||||||
|
|
||||||
result = []
|
|
||||||
for column_index in range(column_count):
|
|
||||||
new_row = []
|
|
||||||
for row in matrix:
|
|
||||||
new_row.append(row[column_index])
|
|
||||||
result.append(new_row)
|
|
||||||
return result
|
|
||||||
|
|
||||||
|
|
||||||
def rot_2D(angle: float) -> list[list[float]]:
|
|
||||||
"""Berechnet die 2D-Rotationsmatrix für einen Winkel.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
angle: Drehwinkel im Bogenmaß, gegen den Uhrzeigersinn.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
Die 2x2-Rotationsmatrix [[cos, -sin], [sin, cos]].
|
|
||||||
"""
|
|
||||||
cos_angle = math.cos(angle)
|
|
||||||
sin_angle = math.sin(angle)
|
|
||||||
return [[cos_angle, -sin_angle], [sin_angle, cos_angle]]
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
# matmul, Beispiel 1
|
|
||||||
matrix_a = [[3, 4, -1, 4], [-2, 2, 5, 1]]
|
|
||||||
matrix_b = [[1, 3, -2], [2, 5, 1], [-1, 4, -4], [2, 3, 6]]
|
|
||||||
print(matmul(matrix_a, matrix_b)) # [[20, 37, 26], [-1, 27, -8]]
|
|
||||||
|
|
||||||
# matmul, Beispiel 2
|
|
||||||
print(matmul([[1, 2], [3, 4]], [[5, 6], [7, 8]])) # [[19, 22], [43, 50]]
|
|
||||||
|
|
||||||
# matmul, Fehlerfall: 2x4 mal 2x4 passt nicht
|
|
||||||
try:
|
|
||||||
matmul(matrix_a, matrix_a)
|
|
||||||
except ValueError as error:
|
|
||||||
print(f"Fehler wie erwartet: {error}")
|
|
||||||
|
|
||||||
# transpose, Beispiel aus dem Skript
|
|
||||||
matrix = [[1, 2, 3], [4, 5, 6]]
|
|
||||||
print("Transponierte Matrix:")
|
|
||||||
for row in transpose(matrix):
|
|
||||||
print(row) # [1, 4] / [2, 5] / [3, 6]
|
|
||||||
|
|
||||||
# transpose, Fehlerfall: ungleich lange Zeilen
|
|
||||||
try:
|
|
||||||
transpose([[1, 2], [3]])
|
|
||||||
except ValueError as error:
|
|
||||||
print(f"Fehler wie erwartet: {error}")
|
|
||||||
|
|
||||||
# rot_2D: Punkt (1, 0) um 90 Grad drehen ergibt (0, 1)
|
|
||||||
point = transpose([[1, 0]]) # [1, 0] wird zur Spalte [[1], [0]]
|
|
||||||
rotated = matmul(rot_2D(math.pi / 2), point)
|
|
||||||
print([[round(value, 10)] for [value] in rotated]) # [[0.0], [1.0]]
|
|
||||||
|
|
||||||
# rot_2D: Winkel 0 ergibt die Einheitsmatrix
|
|
||||||
print(rot_2D(0)) # [[1.0, -0.0], [0.0, 1.0]]
|
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
"""Strings umdrehen."""
|
||||||
|
|
||||||
|
|
||||||
|
def reverse_string(text: str) -> str:
|
||||||
|
"""
|
||||||
|
Dreht einen String um.
|
||||||
|
|
||||||
|
:param text: Der Originalstring
|
||||||
|
:return: Der umgedrehte String
|
||||||
|
"""
|
||||||
|
return text[::-1]
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
print(reverse_string("Hallo")) # Erwartet: ollaH
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
"""Ausschnitte aus Strings bilden."""
|
||||||
|
|
||||||
|
|
||||||
|
def substring(text: str, start: int, length: int | None = None) -> str:
|
||||||
|
"""
|
||||||
|
Liefert einen Ausschnitt aus einem String.
|
||||||
|
|
||||||
|
:param text: Der Originalstring
|
||||||
|
:param start: Startposition (0-basiert)
|
||||||
|
:param length: Anzahl der Zeichen; ohne Angabe bis zum Ende des Strings
|
||||||
|
:return: Der Teilstring
|
||||||
|
:raises ValueError: Bei ungültiger Startposition oder Länge
|
||||||
|
"""
|
||||||
|
if start < 0 or start > len(text):
|
||||||
|
raise ValueError("Startposition liegt außerhalb des Strings.")
|
||||||
|
if length is None:
|
||||||
|
return text[start:]
|
||||||
|
if length < 0 or start + length > len(text):
|
||||||
|
raise ValueError("Länge ist negativ oder geht über das Ende hinaus.")
|
||||||
|
return text[start : start + length]
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
original = "GEEKSFORGEEKS"
|
||||||
|
print(substring(original, 0, 5)) # Erwartet: GEEKS
|
||||||
|
print(substring(original, 5)) # Erwartet: FORGEEKS
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
# 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`.
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
"""Animation: Die Raumkapsel Apollo kreist um den Mond."""
|
||||||
|
|
||||||
|
import pygame
|
||||||
|
|
||||||
|
from compute import rot_2D
|
||||||
|
from moon import Moon
|
||||||
|
|
||||||
|
APOLLO_RADIUS = 5
|
||||||
|
APOLLO_DISTANCE = 25
|
||||||
|
RED = (255, 0, 0)
|
||||||
|
|
||||||
|
|
||||||
|
class Apollo(Moon):
|
||||||
|
"""Apollo kreist doppelt so schnell und entgegengesetzt um den Mond."""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
title: str = "Apollo",
|
||||||
|
fps: int = 60,
|
||||||
|
size: tuple[int, int] = (640, 400),
|
||||||
|
) -> None:
|
||||||
|
"""Legt Startposition und Rotationsmatrix von Apollo fest."""
|
||||||
|
super().__init__(title, fps, size)
|
||||||
|
self.position_apollo: tuple[float, float] = (APOLLO_DISTANCE, 0)
|
||||||
|
self.rot_apollo: list[list[float]] = rot_2D(-2 * self.theta)
|
||||||
|
|
||||||
|
def update_game(self) -> bool:
|
||||||
|
"""Dreht Mond und Apollo ein Stück weiter."""
|
||||||
|
super().update_game()
|
||||||
|
self.position_apollo = self.rotate(self.position_apollo, self.rot_apollo)
|
||||||
|
return True
|
||||||
|
|
||||||
|
def draw_bodies(self) -> None:
|
||||||
|
"""Zeichnet Erde, Mond und Apollo."""
|
||||||
|
super().draw_bodies()
|
||||||
|
absolute_apollo = (
|
||||||
|
self.position_moon[0] + self.position_apollo[0],
|
||||||
|
self.position_moon[1] + self.position_apollo[1],
|
||||||
|
)
|
||||||
|
pygame.draw.circle(
|
||||||
|
self.screen, RED, self.to_screen(absolute_apollo), APOLLO_RADIUS
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
apollo = Apollo()
|
||||||
|
apollo.run()
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
"""Funktionen zur linearen Algebra auf Matrizen als verschachtelte Listen."""
|
||||||
|
|
||||||
|
import math
|
||||||
|
|
||||||
|
|
||||||
|
def matmul(
|
||||||
|
matrix_a: list[list[float]], matrix_b: list[list[float]]
|
||||||
|
) -> list[list[float]]:
|
||||||
|
"""
|
||||||
|
Multipliziert zwei Matrizen miteinander (A * B).
|
||||||
|
|
||||||
|
:param matrix_a: Linke Matrix mit m Zeilen und n Spalten
|
||||||
|
:param matrix_b: Rechte Matrix mit n Zeilen und p Spalten
|
||||||
|
:return: Ergebnismatrix mit m Zeilen und p Spalten
|
||||||
|
:raises ValueError: Wenn die Spaltenzahl von A nicht der Zeilenzahl von B entspricht
|
||||||
|
"""
|
||||||
|
if len(matrix_a[0]) != len(matrix_b):
|
||||||
|
raise ValueError("Spaltenzahl von A muss der Zeilenzahl von B entsprechen.")
|
||||||
|
|
||||||
|
result = []
|
||||||
|
for row in matrix_a:
|
||||||
|
new_row = []
|
||||||
|
for col_index in range(len(matrix_b[0])):
|
||||||
|
value = 0
|
||||||
|
for k in range(len(row)):
|
||||||
|
value += row[k] * matrix_b[k][col_index]
|
||||||
|
new_row.append(value)
|
||||||
|
result.append(new_row)
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def transpose(matrix: list[list[float]]) -> list[list[float]]:
|
||||||
|
"""
|
||||||
|
Transponiert eine Matrix: Zeilen werden zu Spalten und Spalten zu Zeilen.
|
||||||
|
|
||||||
|
:param matrix: Matrix mit m Zeilen und n Spalten
|
||||||
|
:return: Transponierte Matrix mit n Zeilen und m Spalten
|
||||||
|
:raises ValueError: Bei leerer Matrix oder unterschiedlich langen Zeilen
|
||||||
|
"""
|
||||||
|
if not matrix or not matrix[0]:
|
||||||
|
raise ValueError("Die Matrix darf nicht leer sein.")
|
||||||
|
|
||||||
|
column_count = len(matrix[0])
|
||||||
|
for row in matrix:
|
||||||
|
if len(row) != column_count:
|
||||||
|
raise ValueError("Alle Zeilen müssen gleich viele Spalten haben.")
|
||||||
|
|
||||||
|
result = []
|
||||||
|
for col_index in range(column_count):
|
||||||
|
new_row = []
|
||||||
|
for row in matrix:
|
||||||
|
new_row.append(row[col_index])
|
||||||
|
result.append(new_row)
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def rot_2D(angle: float) -> list[list[float]]:
|
||||||
|
"""
|
||||||
|
Liefert die 2D-Rotationsmatrix für eine Drehung um den Ursprung.
|
||||||
|
|
||||||
|
:param angle: Drehwinkel im Bogenmaß (gegen den Uhrzeigersinn)
|
||||||
|
:return: 2x2-Rotationsmatrix [[cos, -sin], [sin, cos]]
|
||||||
|
"""
|
||||||
|
return [
|
||||||
|
[math.cos(angle), -math.sin(angle)],
|
||||||
|
[math.sin(angle), math.cos(angle)],
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
# Test matmul (Beispiel aus dem Skript)
|
||||||
|
matrix_a = [[3, 4, -1, 4], [-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:
|
||||||
|
print(row)
|
||||||
|
|
||||||
|
# Zweites Beispiel matmul: Einheitsmatrix ändert nichts
|
||||||
|
identity = [[1, 0], [0, 1]]
|
||||||
|
print("\nEinheitsmatrix * [[5, 6], [7, 8]]:")
|
||||||
|
print(matmul(identity, [[5, 6], [7, 8]])) # Erwartet: [[5, 6], [7, 8]]
|
||||||
|
|
||||||
|
# Fehlerfall matmul: Dimensionen passen nicht
|
||||||
|
try:
|
||||||
|
matmul([[1, 2]], [[1, 2]])
|
||||||
|
except ValueError as error:
|
||||||
|
print("ValueError wie erwartet:", error)
|
||||||
|
|
||||||
|
# Test transpose
|
||||||
|
matrix = [[1, 2, 3], [4, 5, 6]]
|
||||||
|
print("\nTransponiert:")
|
||||||
|
print(transpose(matrix)) # Erwartet: [[1, 4], [2, 5], [3, 6]]
|
||||||
|
|
||||||
|
# Test rot_2D: Punkt (1, 0) um 90 Grad drehen -> erwartet (0, 1)
|
||||||
|
point = transpose([[1, 0]]) # [x, y] wird zur Spalte [[x], [y]]
|
||||||
|
rotated = matmul(rot_2D(math.pi / 2), point)
|
||||||
|
print("\nPunkt (1, 0) um 90 Grad gedreht:")
|
||||||
|
print(round(rotated[0][0], 10), round(rotated[1][0], 10)) # Erwartet: 0.0 1.0
|
||||||
@@ -96,4 +96,3 @@ class Game:
|
|||||||
self.init_game()
|
self.init_game()
|
||||||
self.game_loop()
|
self.game_loop()
|
||||||
self.exit_game()
|
self.exit_game()
|
||||||
|
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
.venv/
|
||||||
|
__pycache__/
|
||||||
|
.env
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
"""Animation: Der Mond kreist um die Erde."""
|
||||||
|
|
||||||
|
import pygame
|
||||||
|
|
||||||
|
from compute import matmul, rot_2D, transpose
|
||||||
|
from game import Game
|
||||||
|
|
||||||
|
EARTH_RADIUS = 30
|
||||||
|
MOON_RADIUS = 10
|
||||||
|
MOON_DISTANCE = 150
|
||||||
|
BLACK = (0, 0, 0)
|
||||||
|
WHITE = (255, 255, 255)
|
||||||
|
BLUE = (0, 0, 255)
|
||||||
|
|
||||||
|
|
||||||
|
class Moon(Game):
|
||||||
|
"""Der Mond kreist um die Erde."""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
title: str = "Moon",
|
||||||
|
fps: int = 60,
|
||||||
|
size: tuple[int, int] = (640, 400),
|
||||||
|
) -> None:
|
||||||
|
"""Legt Startposition, Drehwinkel und Rotationsmatrix fest."""
|
||||||
|
super().__init__(title, fps, size)
|
||||||
|
self.center: tuple[float, float] = (size[0] / 2, size[1] / 2)
|
||||||
|
self.position_moon: tuple[float, float] = (MOON_DISTANCE, 0)
|
||||||
|
self.theta: float = 0.01
|
||||||
|
self.rot_moon: list[list[float]] = rot_2D(self.theta)
|
||||||
|
|
||||||
|
def update_game(self) -> bool:
|
||||||
|
"""Dreht den Mond ein Stück weiter."""
|
||||||
|
self.position_moon = self.rotate(self.position_moon, self.rot_moon)
|
||||||
|
return True
|
||||||
|
|
||||||
|
def draw_game(self) -> None:
|
||||||
|
"""Löscht den Bildschirm, zeichnet alle Körper und zeigt das Bild an."""
|
||||||
|
self.screen.fill(BLACK)
|
||||||
|
self.draw_bodies()
|
||||||
|
pygame.display.flip()
|
||||||
|
|
||||||
|
def draw_bodies(self) -> None:
|
||||||
|
"""Zeichnet Erde und Mond."""
|
||||||
|
pygame.draw.circle(self.screen, BLUE, self.to_screen((0, 0)), EARTH_RADIUS)
|
||||||
|
pygame.draw.circle(
|
||||||
|
self.screen, WHITE, self.to_screen(self.position_moon), MOON_RADIUS
|
||||||
|
)
|
||||||
|
|
||||||
|
def rotate(
|
||||||
|
self, position: tuple[float, float], rotation: list[list[float]]
|
||||||
|
) -> tuple[float, float]:
|
||||||
|
"""
|
||||||
|
Dreht einen Punkt mit einer Rotationsmatrix um den Ursprung.
|
||||||
|
|
||||||
|
:param position: Punkt (x, y) relativ zum Drehzentrum
|
||||||
|
:param rotation: 2x2-Rotationsmatrix
|
||||||
|
:return: Gedrehter Punkt (x', y')
|
||||||
|
"""
|
||||||
|
point = transpose([list(position)])
|
||||||
|
result = matmul(rotation, point)
|
||||||
|
return (result[0][0], result[1][0])
|
||||||
|
|
||||||
|
def to_screen(self, position: tuple[float, float]) -> tuple[float, float]:
|
||||||
|
"""
|
||||||
|
Rechnet eine Position relativ zur Erde in Fensterkoordinaten um.
|
||||||
|
|
||||||
|
:param position: Punkt (x, y) relativ zur Erde
|
||||||
|
:return: Punkt in Fensterkoordinaten
|
||||||
|
"""
|
||||||
|
return (self.center[0] + position[0], self.center[1] + position[1])
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
moon = Moon()
|
||||||
|
moon.run()
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
[project]
|
||||||
|
name = "matrixmania"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = ["tabulate", "ruff"]
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
import pygame
|
|
||||||
from aufgabenblatt_1.hausaufgaben.compute import matmul
|
|
||||||
from aufgabenblatt_1.hausaufgaben.transponieren import transpose, rot_2D
|
|
||||||
from game import Game
|
|
||||||
|
|
||||||
EARTH_RADIUS = 30
|
|
||||||
MOON_RADIUS = 10
|
|
||||||
BLACK = (0, 0, 0)
|
|
||||||
WHITE = (255, 255, 255)
|
|
||||||
BLUE = (0, 0, 255)
|
|
||||||
|
|
||||||
"""Der Mond kreist um die Erde."""
|
|
||||||
class Moon(Game):
|
|
||||||
def __init__(self, title: str = "Moon", fps: int = 60, size: tuple[int, int] = (640, 400),) -> None:
|
|
||||||
"""Legt Startposition, Drehwinkel und Rotationsmatrix fest."""
|
|
||||||
super().__init__(title, fps, size)
|
|
||||||
self.position_moon = (120, 0) # relativ zur Erde
|
|
||||||
theta = 0.01 # Drehwinkel pro Bild im Bogenmaß
|
|
||||||
self.rot_moon = rot_2D(theta)
|
|
||||||
|
|
||||||
def update_game(self) -> bool:
|
|
||||||
"""Dreht den Mond ein Stück weiter."""
|
|
||||||
point = transpose([list(self.position_moon)]) # [x, y] -> [[x], [y]]
|
|
||||||
result = matmul(self.rot_moon, point) # [[x'], [y']]
|
|
||||||
self.position_moon = (result[0][0], result[1][0])
|
|
||||||
return True
|
|
||||||
|
|
||||||
def draw_game(self) -> None:
|
|
||||||
"""Zeichnet Erde und Mond."""
|
|
||||||
# Bildschirm löschen, Erde und Mond zeichnen, Bild anzeigen
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
# Moon-Objekt erzeugen und starten
|
|
||||||
Reference in new issue
Block a user