update about tree

Author: EINDEX

Diff for: .gitignore

@@ -201,3 +201,6 @@ ENV/
 .ropeproject
 
 .idea
+
+.vscode
+.pytest_cache

Diff for: Pipfile

@@ -1,11 +1,14 @@
 [[source]]
-url = "https://pypi.python.org/simple"
-verify_ssl = true
+url = "https://mirrors.ustc.edu.cn/pypi/web/simple"
 name = "pypi"
+format = "columns"
 
 [packages]
 
 [dev-packages]
+pylint = "*"
+"autopep8" = "*"
+pytest = "*"
 
 [requires]
 python_version = "3.6"

Diff for: Pipfile.lock

@@ -1,16 +1,14 @@
-# Python Algorithm
-用Python实现各种算法
+# Python Algorithm and Data Structure
+
+Python 算法与数据结构
+
 ## 数据结构
-- 数组（Array）
-- 堆栈（Stack）
-- 队列（Queue）
-- 链表（Linked List）
-- 树（Tree）
-- 图（Graph）
-- 堆（Heap）
-- 散列表（Hash）
 
-## 排序算法
+### 树
+
+## 算法
+
+### 排序算法
 
 - 冒泡排序
 - 插入排序
@@ -21,7 +19,7 @@
 - 快速排序
 - 计数排序
 
-## 查找算法
+### 查找算法
 
 - 顺序查找
 - 二分查找

Diff for: README.md

@@ -79,12 +79,13 @@ def find(linked_list, index):
             return linked_list
 
 
-linked_list = init()
-trave(linked_list)
-# delete(linked_list)
-insert(linked_list, 0, 1)
-insert(linked_list, 0, 2)
-insert(linked_list, 0, 3)
-remove(linked_list,2)
-trave(linked_list)
-print(find(linked_list,3))
+if __name__ == '__main__':
+    linked_list = init()
+    trave(linked_list)
+    # delete(linked_list)
+    insert(linked_list, 0, 1)
+    insert(linked_list, 0, 2)
+    insert(linked_list, 0, 3)
+    remove(linked_list, 2)
+    trave(linked_list)
+    print(find(linked_list, 3))

Diff for: data_structure/linear/linked_list.py

@@ -41,19 +41,22 @@ def pop(queue):
     else:
         print('队列里已经没有元素了')
 
+
 def print_queue(queue):
     print(queue)
     if queue.behind is not None:
         print_queue(queue.behind)
 
-queue = create_queue()
-push(queue,1)
-push(queue,2)
-push(queue,3)
-push(queue,4)
-print_queue(queue)
-print(pop(queue))
-print(pop(queue))
-print(pop(queue))
-print(pop(queue))
-print(pop(queue))
+
+if __name__ == '__main__':
+    queue = create_queue()
+    push(queue, 1)
+    push(queue, 2)
+    push(queue, 3)
+    push(queue, 4)
+    print_queue(queue)
+    print(pop(queue))
+    print(pop(queue))
+    print(pop(queue))
+    print(pop(queue))
+    print(pop(queue))

Diff for: data_structure/linear/queue.py

@@ -29,7 +29,6 @@ def push(stack, ele):
         push_ele.before.behind = push_ele
 
 
-
 def pop(stack):
     if isinstance(stack, MyStack):
         stack_top = top(stack)

Diff for: data_structure/linear/stack.py

@@ -0,0 +1,3 @@
+from data_structure.tree.tree import Tree
+from data_structure.tree.binary_tree import BinaryTree
+from data_structure.tree.bst import BST

Diff for: data_structure/tree/__init__.py

@@ -1,32 +1,40 @@
-from data_structure.tree.Tree import Tree
+from data_structure.tree.tree import Tree, TreeNode
+
+
+class BinaryTreeNode(TreeNode):
+    """
+    一个二叉树节点
+    """
+
+    def __init__(self, value, left, right):
+        self.left = left
+        self.right = right
+        super().__init__(value, [left, right])
 
 
 class BinaryTree(Tree):
     """
     二叉树：基本二叉树的数据结构
     """
-    def __init__(self, key):
-        self.key = key
-        self._r_child = None
-        self._l_child = None
-        super().__init__(key=key, children=[self._l_child, self._r_child])
-
-    @property
-    def l_child(self):
-        return self._l_child
-
-    @l_child.setter
-    def l_child(self, l_child):
-        if not isinstance(l_child, BinaryTree): return
-        self._l_child = l_child
-        self.children = [self.l_child, self.r_child]
-
-    @property
-    def r_child(self):
-        return self._r_child
-
-    @r_child.setter
-    def r_child(self, r_child):
-        if not isinstance(r_child, BinaryTree): return
-        self._r_child = r_child
-        self.children = [self.l_child, self.r_child]
+
+    def inorder_traversal_while(self):
+        """
+        二叉树的中序遍历
+        :return: list of node values
+        """
+        res = []
+
+        if not self.root:
+            return res
+
+        stack = [self.root]
+        node = self.root.left
+
+        while len(stack):
+            while node:
+                stack.append(node)
+                node = node.left
+
+            res.append(stack[-1].value)
+
+        return res

Diff for: data_structure/tree/binary_tree.py

@@ -1,6 +1,6 @@
 import copy
 
-from DataStructure.tree.BinaryTree import BinaryTree
+from data_structure.tree.binary_tree import BinaryTree
 
 
 # 二叉查找树