From 78d4b25bd471084c2cde3fb68a0c5540366f6cbe Mon Sep 17 00:00:00 2001 From: Oliver Hofmann Date: Tue, 22 Apr 2025 19:36:59 +0200 Subject: [PATCH] Renamed directories to use them as modules Literal: Allowed compare with None --- utils/literal.py | 4 ++++ vorlesung/{01_grundlagen => L01_grundlagen}/euklid.py | 0 .../bubble_game.py | 0 .../bubble_sorting.py | 0 .../insert_game.py | 0 .../insert_sorting.py | 0 .../select_game.py | 0 .../select_sorting.py | 0 .../heap_game.py | 0 .../heap_sorting.py | 0 .../quick_game.py | 0 .../quick_sorting.py | 0 .../count_sorting.py | 0 vorlesung/L05_binaere_baeume/__init__.py | 1 + .../{05_binaere_baeume => L05_binaere_baeume}/bin_search.py | 0 .../{05_binaere_baeume => L05_binaere_baeume}/bin_tree.py | 2 +- .../bin_tree_node.py | 0 vorlesung/__init__.py | 0 18 files changed, 6 insertions(+), 1 deletion(-) rename vorlesung/{01_grundlagen => L01_grundlagen}/euklid.py (100%) rename vorlesung/{02_elementares_sortieren => L02_elementares_sortieren}/bubble_game.py (100%) rename vorlesung/{02_elementares_sortieren => L02_elementares_sortieren}/bubble_sorting.py (100%) rename vorlesung/{02_elementares_sortieren => L02_elementares_sortieren}/insert_game.py (100%) rename vorlesung/{02_elementares_sortieren => L02_elementares_sortieren}/insert_sorting.py (100%) rename vorlesung/{02_elementares_sortieren => L02_elementares_sortieren}/select_game.py (100%) rename vorlesung/{02_elementares_sortieren => L02_elementares_sortieren}/select_sorting.py (100%) rename vorlesung/{03_fortgeschrittenes_sortieren => L03_fortgeschrittenes_sortieren}/heap_game.py (100%) rename vorlesung/{03_fortgeschrittenes_sortieren => L03_fortgeschrittenes_sortieren}/heap_sorting.py (100%) rename vorlesung/{03_fortgeschrittenes_sortieren => L03_fortgeschrittenes_sortieren}/quick_game.py (100%) rename vorlesung/{03_fortgeschrittenes_sortieren => L03_fortgeschrittenes_sortieren}/quick_sorting.py (100%) rename vorlesung/{04_besondere_sortierverfahren => L04_besondere_sortierverfahren}/count_sorting.py (100%) create mode 100644 vorlesung/L05_binaere_baeume/__init__.py rename vorlesung/{05_binaere_baeume => L05_binaere_baeume}/bin_search.py (100%) rename vorlesung/{05_binaere_baeume => L05_binaere_baeume}/bin_tree.py (98%) rename vorlesung/{05_binaere_baeume => L05_binaere_baeume}/bin_tree_node.py (100%) create mode 100644 vorlesung/__init__.py diff --git a/utils/literal.py b/utils/literal.py index ac41a93..c574306 100644 --- a/utils/literal.py +++ b/utils/literal.py @@ -21,6 +21,8 @@ class Literal: def __eq__(self, other): """Vergleicht den Wert mit einem anderen Wert.""" + if other is None: + return False assert isinstance(other, Literal), "Can only compare with Literal or MemoryCell" self.compare_count += 1 self.read_count += 1 @@ -29,6 +31,8 @@ class Literal: def __ne__(self, other): """Vergleicht den Wert der Speicherzelle mit einem anderen Wert.""" + if other is None: + return True assert isinstance(other, Literal), "Can only compare with Literal or MemoryCell" self.compare_count += 1 self.read_count += 1 diff --git a/vorlesung/01_grundlagen/euklid.py b/vorlesung/L01_grundlagen/euklid.py similarity index 100% rename from vorlesung/01_grundlagen/euklid.py rename to vorlesung/L01_grundlagen/euklid.py diff --git a/vorlesung/02_elementares_sortieren/bubble_game.py b/vorlesung/L02_elementares_sortieren/bubble_game.py similarity index 100% rename from vorlesung/02_elementares_sortieren/bubble_game.py rename to vorlesung/L02_elementares_sortieren/bubble_game.py diff --git a/vorlesung/02_elementares_sortieren/bubble_sorting.py b/vorlesung/L02_elementares_sortieren/bubble_sorting.py similarity index 100% rename from vorlesung/02_elementares_sortieren/bubble_sorting.py rename to vorlesung/L02_elementares_sortieren/bubble_sorting.py diff --git a/vorlesung/02_elementares_sortieren/insert_game.py b/vorlesung/L02_elementares_sortieren/insert_game.py similarity index 100% rename from vorlesung/02_elementares_sortieren/insert_game.py rename to vorlesung/L02_elementares_sortieren/insert_game.py diff --git a/vorlesung/02_elementares_sortieren/insert_sorting.py b/vorlesung/L02_elementares_sortieren/insert_sorting.py similarity index 100% rename from vorlesung/02_elementares_sortieren/insert_sorting.py rename to vorlesung/L02_elementares_sortieren/insert_sorting.py diff --git a/vorlesung/02_elementares_sortieren/select_game.py b/vorlesung/L02_elementares_sortieren/select_game.py similarity index 100% rename from vorlesung/02_elementares_sortieren/select_game.py rename to vorlesung/L02_elementares_sortieren/select_game.py diff --git a/vorlesung/02_elementares_sortieren/select_sorting.py b/vorlesung/L02_elementares_sortieren/select_sorting.py similarity index 100% rename from vorlesung/02_elementares_sortieren/select_sorting.py rename to vorlesung/L02_elementares_sortieren/select_sorting.py diff --git a/vorlesung/03_fortgeschrittenes_sortieren/heap_game.py b/vorlesung/L03_fortgeschrittenes_sortieren/heap_game.py similarity index 100% rename from vorlesung/03_fortgeschrittenes_sortieren/heap_game.py rename to vorlesung/L03_fortgeschrittenes_sortieren/heap_game.py diff --git a/vorlesung/03_fortgeschrittenes_sortieren/heap_sorting.py b/vorlesung/L03_fortgeschrittenes_sortieren/heap_sorting.py similarity index 100% rename from vorlesung/03_fortgeschrittenes_sortieren/heap_sorting.py rename to vorlesung/L03_fortgeschrittenes_sortieren/heap_sorting.py diff --git a/vorlesung/03_fortgeschrittenes_sortieren/quick_game.py b/vorlesung/L03_fortgeschrittenes_sortieren/quick_game.py similarity index 100% rename from vorlesung/03_fortgeschrittenes_sortieren/quick_game.py rename to vorlesung/L03_fortgeschrittenes_sortieren/quick_game.py diff --git a/vorlesung/03_fortgeschrittenes_sortieren/quick_sorting.py b/vorlesung/L03_fortgeschrittenes_sortieren/quick_sorting.py similarity index 100% rename from vorlesung/03_fortgeschrittenes_sortieren/quick_sorting.py rename to vorlesung/L03_fortgeschrittenes_sortieren/quick_sorting.py diff --git a/vorlesung/04_besondere_sortierverfahren/count_sorting.py b/vorlesung/L04_besondere_sortierverfahren/count_sorting.py similarity index 100% rename from vorlesung/04_besondere_sortierverfahren/count_sorting.py rename to vorlesung/L04_besondere_sortierverfahren/count_sorting.py diff --git a/vorlesung/L05_binaere_baeume/__init__.py b/vorlesung/L05_binaere_baeume/__init__.py new file mode 100644 index 0000000..2dc50f9 --- /dev/null +++ b/vorlesung/L05_binaere_baeume/__init__.py @@ -0,0 +1 @@ +from vorlesung.L05_binaere_baeume.bin_tree import BinaryTree diff --git a/vorlesung/05_binaere_baeume/bin_search.py b/vorlesung/L05_binaere_baeume/bin_search.py similarity index 100% rename from vorlesung/05_binaere_baeume/bin_search.py rename to vorlesung/L05_binaere_baeume/bin_search.py diff --git a/vorlesung/05_binaere_baeume/bin_tree.py b/vorlesung/L05_binaere_baeume/bin_tree.py similarity index 98% rename from vorlesung/05_binaere_baeume/bin_tree.py rename to vorlesung/L05_binaere_baeume/bin_tree.py index 7e6a4d3..a25c8f8 100644 --- a/vorlesung/05_binaere_baeume/bin_tree.py +++ b/vorlesung/L05_binaere_baeume/bin_tree.py @@ -1,4 +1,4 @@ -from bin_tree_node import BinaryTreeNode +from vorlesung.L05_binaere_baeume.bin_tree_node import BinaryTreeNode from utils.project_dir import get_path from datetime import datetime diff --git a/vorlesung/05_binaere_baeume/bin_tree_node.py b/vorlesung/L05_binaere_baeume/bin_tree_node.py similarity index 100% rename from vorlesung/05_binaere_baeume/bin_tree_node.py rename to vorlesung/L05_binaere_baeume/bin_tree_node.py diff --git a/vorlesung/__init__.py b/vorlesung/__init__.py new file mode 100644 index 0000000..e69de29