binary search tree / add size

Author: dev-jko

tree/binary_search_tree/README.md

@@ -18,6 +18,7 @@
 	{
 		t_node	*root;
 		int	(*cmp)(void *, void *);
+		int	size;
 	}		t_tree;
 	```
 
@@ -35,6 +36,12 @@
 	t_node *create_elem(void *data);
 	```
 
+### tree_size
+- tree에 존재하는 요소의 갯수를 반환하는 함수를 작성하세요.
+	```
+	int	tree_size(t_tree *tree);
+	```
+
 ### tree_find
 - tree에 data_ref와 같은 data를 갖는 요소를 찾아 반환하는 함수를 작성하세요.
 - 같은 요소가 없다면 널 포인터를 반환 합니다.
@@ -55,6 +62,7 @@
 - tree에서 data_ref와 같은 data를 가진 요소를 삭제하는 함수를 작성하세요.
 - 요소의 데이터는 free_data를 사용해서 메모리 할당을 해제해야 합니다.
 - 성공하면 1, 실패하면 0을 반환 합니다.
+- data_ref와 같은 data를 가진 요소가 없다면 실패 합니다.
 	```
 	int tree_delete(t_tree *tree, void *data_ref, void (*free_data)(void *));
 	```

tree/binary_search_tree/implementation_example/binary_search_tree.c

@@ -6,7 +6,7 @@
 /*   By: jko <jko@student.42seoul.kr>               +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/04 21:13:23 by jko               #+#    #+#             */
-/*   Updated: 2020/04/04 21:21:42 by jko              ###   ########.fr       */
+/*   Updated: 2020/04/04 21:51:32 by jko              ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,6 +20,7 @@ t_tree	*tree_init(int (*cmp)(void *, void *))
 		return (0);
 	tree->root = 0;
 	tree->cmp = cmp;
+	tree->size = 0;
 	return (tree);
 }
 
@@ -36,22 +37,84 @@ t_node	*create_elem(void *data)
 	return (node);
 }
 
-int	tree_insert(t_tree *tree, void *data)
+int	tree_size(t_tree *tree)
 {
-	t_node	*new;
-
-	if (!tree || !(new = create_elem(data)))
+	if (!tree)
 		return (0);
-
+	return (tree->size);
 }
 
 t_node	*tree_find(t_tree *tree, void *data_ref)
 {
+	t_node	*curr;
+	int	cmp_result;
+
+	if (!tree)
+		return (0);
+	curr = tree->root;
+	while (curr)
+	{
+		if (!(cmp_result = tree->cmp(data_ref, curr->data)))
+			return (curr);
+		if (cmp_result < 0)
+			curr = curr->left;
+		else
+			curr = curr->right;
+	}
+	return (0);
+}
+
+int	tree_insert(t_tree *tree, void *data)
+{
+	t_node	*new;
+	t_node	*curr;
+	t_node	*prev;
+	int	cmp_result;
 
+	if (!tree)
+		return (0);
+	curr = tree->root;
+	prev = 0;
+	while (curr)
+	{
+		if (!(cmp_result = tree->cmp(data, curr->data)))
+			return (0);
+		prev = curr;
+		if (cmp_result < 0)
+			curr = curr->left;
+		else
+			curr = curr->right;
+	}
+	if (!(new = create_elem(data)))
+		return (0);
+	if (!prev)
+		tree->root = new;
+	else if (cmp_result < 0)
+		prev->left = new;
+	else
+		prev->right = new;
+	return (1);
 }
 
 int	tree_delete(t_tree *tree, void *data_ref, void (*free_data)(void *))
 {
+	t_node	*curr;
+	int	cmp_result;
+
+	if (!tree || !free_data)
+		return (0);
+	curr = tree->root;
+	if (tree->cmp(data_ref, tree->root))
+	while (curr)
+	{
+		if (!(cmp_result = tree->cmp(data_ref, curr->data)))
+		{
+			free_data(curr->data);
+			free(curr);
+
+			return (1);
+		}
+	}
 
 }
 

tree/binary_search_tree/implementation_example/tree.h

@@ -6,7 +6,7 @@
 /*   By: jko <jko@student.42seoul.kr>               +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/04/04 21:11:12 by jko               #+#    #+#             */
-/*   Updated: 2020/04/04 21:13:05 by jko              ###   ########.fr       */
+/*   Updated: 2020/04/04 21:50:29 by jko              ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -26,10 +26,12 @@ typedef struct	s_binary_search_tree
 {
 	t_node	*root;
 	int	(*cmp)(void *, void *);
+	int	size;
 }		t_tree;
 
 t_tree	*tree_init(int (*cmp)(void *, void *));
 t_node	*create_elem(void *data);
+int	tree_size(t_tree *tree);
 int	tree_insert(t_tree *tree, void *data);
 t_node	*tree_find(t_tree *tree, void *data_ref);
 int	tree_delete(t_tree *tree, void *data_ref, void (*free_data)(void *));

tree/binary_search_tree/tree.h

@@ -9,4 +9,5 @@ typedef struct	s_binary_search_tree
 {
 	t_node	*root;
 	int	(*cmp)(void *, void *);
+	int	size;
 }		t_tree;