Merge pull request #4 from LiuXingLong/tyler.liu-feature

HashMap + 二叉搜索树 Map 优化查找删除节点的右子树中的最小节点

Author: LiuXingLong

BST/bst/bst.depend

@@ -6,11 +6,11 @@
 	<iostream>
 	"bst.h"
 
-1544100096 c:\users\hnust_liuxinglong\desktop\tree\bst\bst\include\bst.h
+1544150094 c:\users\hnust_liuxinglong\desktop\tree\bst\bst\include\bst.h
 	<stdlib.h>
 	<string>
 	<iostream>
 
-1544112403 source:c:\users\hnust_liuxinglong\desktop\tree\bst\bst\src\bst.cpp
+1544150082 source:c:\users\hnust_liuxinglong\desktop\tree\bst\bst\src\bst.cpp
 	"bst.h"
 

BST/bst/bst.layout

@@ -2,24 +2,24 @@
 <CodeBlocks_layout_file>
 	<FileVersion major="1" minor="0" />
 	<ActiveTarget name="Debug" />
-	<File name="main.cpp" open="1" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="include\bst.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="3174" topLine="36" />
+			<Cursor1 position="677" topLine="0" />
 		</Cursor>
 	</File>
-	<File name="hash.cpp" open="1" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="hash.cpp" open="0" top="0" tabpos="1" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="6251" topLine="94" />
+			<Cursor1 position="6422" topLine="160" />
 		</Cursor>
 	</File>
-	<File name="include\bst.h" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="main.cpp" open="0" top="0" tabpos="2" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="633" topLine="0" />
+			<Cursor1 position="935" topLine="27" />
 		</Cursor>
 	</File>
-	<File name="src\bst.cpp" open="1" top="1" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+	<File name="src\bst.cpp" open="0" top="0" tabpos="3" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
 		<Cursor>
-			<Cursor1 position="2613" topLine="72" />
+			<Cursor1 position="2535" topLine="184" />
 		</Cursor>
 	</File>
 </CodeBlocks_layout_file>

BST/bst/include/bst.h

@@ -26,8 +26,6 @@ class bst
         bool bst_set(string key, string value,unsigned int hash_key, BstNode *&node, BstNode *parent);
         bool bst_del(string key, unsigned int hash_key, BstNode *&node);
         unsigned int BKDRHash(string key);
-    private:
-        BstNode * get_min_node(BstNode *&node);
 };
 
 #endif // BST_H

BST/bst/src/bst.cpp

@@ -11,14 +11,6 @@ unsigned int bst::BKDRHash(string key)
     }
     return (hash & 0x7FFFFFFF);
 }
-BstNode * bst::get_min_node(BstNode *&bst_p)
-{
-    if(bst_p->lchild == nullptr){
-        return bst_p;
-    }else{
-        return this->get_min_node(bst_p->lchild);
-    }
-}
 
 string bst::bst_get(string key, unsigned int hash_key,BstNode *bst_p)
 {
@@ -36,6 +28,12 @@ string bst::bst_get(string key, unsigned int hash_key,BstNode *bst_p)
         }
         if( key == bst_data->key ){
             return bst_data->value;
+            /*
+            if(bst_p->parent != nullptr){
+                return bst_data->value + "|" + bst_p->parent->data->value;
+            }else{
+                return bst_data->value + "|root";
+            }*/
         }else{
             return "null";
         }
@@ -98,7 +96,10 @@ bool bst::bst_del(string key, unsigned int hash_key, BstNode *&bst_p)
                 /// 删除含两个子节点的  父节点
                 BstNode *bst_h;
                 bst_h = bst_p;
-                bst_p = this->get_min_node(bst_p->rchild);
+                bst_p = bst_p->rchild;
+                while(bst_p->lchild != nullptr){
+                    bst_p = bst_p->lchild;
+                }
                 /// 处理删除节点，右子树中最小节点的孩子
                 if(bst_p->rchild != nullptr){
                     if(bst_p->parent->hash_key > bst_p->hash_key){