исправлено двоичное дерево 3.0

konnovaea/experiments.py

@@ -88,7 +88,7 @@ def run_linked_experiments(records, mode_name):
 
 def run_hash_experiments(records, mode_name):
 
-    print(f"хеш-таблица({mode_name})")
+    print(f"\n хеш-таблица({mode_name})")
 
     print("вставка 10000 записей:")
     
@@ -158,7 +158,7 @@ def run_hash_experiments(records, mode_name):
 
 def run_bst_experiments(records, mode_name):
 
-    print(f"двоичное дерево({mode_name})")
+    print(f"\n двоичное дерево({mode_name})")
 
     print("вставка 10000 записей:")
     

konnovaea/phonebook.py

@@ -77,7 +77,7 @@ def ht_list_all(buckets):
     return records
 
 def bst_insert(root, name, phone):
-   
+    
     new_node = {'name': name, 'phone': phone, 'left': None, 'right': None}
     
     if root is None:
@@ -98,11 +98,12 @@ def bst_insert(root, name, phone):
         else:
             current['phone'] = phone
             break
-
+    
     return root
 
 
 def bst_find(root, name):
+    
     current = root
     while current is not None:
         if name == current['name']:
@@ -113,49 +114,82 @@ def bst_find(root, name):
             current = current['right']
     return None
 
-def _bst_find_mine(node):
+
+def _bst_find_min(node):
+    
     current = node
-    while current and current['left'] is not None:
+    while current['left'] is not None:
         current = current['left']
     return current
 
-def bst_delete(root, name):
 
+def bst_delete(root, name):
+    
     if root is None:
         return None
     
-    if name < root['name']:
+    parent = None
-        root['left'] = bst_delete(root['left'], name)
+    current = root
-    elif name > root['name']:
+    
-        root['right'] = bst_delete(root['right'], name)
+    while current is not None and current['name'] != name:
+        parent = current
+        if name < current['name']:
+            current = current['left']
+        else:
+            current = current['right']
+    
+    if current is None:  
         return root
     
-    if root['left'] is None:
+    if current['left'] is None and current['right'] is None:
-        return root['right']
+        if parent is None:
-    elif root['right'] is None:
+            return None
-        return root['left']
+        if parent['left'] == current:
+            parent['left'] = None
+        else:
+            parent['right'] = None
+        return root
+    
+    if current['left'] is None:
+        child = current['right']
+    elif current['right'] is None:
+        child = current['left']
+    else:
+        successor_parent = current
+        successor = current['right']
+        while successor['left'] is not None:
+            successor_parent = successor
+            successor = successor['left']
         
-    current = root['right']
+        current['name'] = successor['name']
-    while current['left'] is not None:
+        current['phone'] = successor['phone']
-        current = current['left']
+        
-
+        if successor_parent['left'] == successor:
-    root['name'] = current['name']
+            successor_parent['left'] = successor['right']
-    root['phone'] = current['phone']
+        else:
-
+            successor_parent['right'] = successor['right']
-    root['right'] = bst_delete(root['right'], current['name'])
+        
-
+        return root
+    
+    if parent is None:
+        return child
+    if parent['left'] == current:
+        parent['left'] = child
+    else:
+        parent['right'] = child
+    
     return root
 
+
 def bst_list_all(root):
-
     records = []
-
+    
     def inorder(node):
-        if node is  None:
+        if node is None:
             return
         inorder(node['left'])
         records.append((node['name'], node['phone']))
         inorder(node['right'])
-
+    
     inorder(root)
     return records