diff --git a/Include/Fledasty/Trees/BinarySearchTree.h b/Include/Fledasty/Trees/BinarySearchTree.h index 39c7bf5..1b37501 100644 --- a/Include/Fledasty/Trees/BinarySearchTree.h +++ b/Include/Fledasty/Trees/BinarySearchTree.h @@ -15,7 +15,7 @@ * File: BinarySearchTree.h * Description: * This file contains the binary search tree structure and the functions for - * modifying it. It includes functions to Insert, remove, search, check if + * modifying it. It includes functions to Insert, remove, get, check if * contains value, check if is empty, find max and min value, traverse the tree * and clear it. * @@ -42,7 +42,7 @@ typedef struct FledastyBinarySearchTreeNode_##name { } FledastyBinarySearchTreeNode_##name; \ \ typedef struct { \ - size_t size, depth; \ + size_t size; \ FledastyBinarySearchTreeNode_##name *top; \ } FledastyBinarySearchTree_##name; \ \ diff --git a/Include/Fledasty/Trees/RedBlackTree.h b/Include/Fledasty/Trees/RedBlackTree.h new file mode 100644 index 0000000..9344a20 --- /dev/null +++ b/Include/Fledasty/Trees/RedBlackTree.h @@ -0,0 +1,51 @@ +/* + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ----------------------------------------------------------------------------- + * File: RedBlackTree.h + * Description: + * This file contains the red black tree structure and the functions for + * modifying it. It includes functions to Insert, remove, get, check if + * contains value, check if is empty, find max and min value, traverse the tree + * and clear it. + * + * Author: Mineplay + * ----------------------------------------------------------------------------- + */ +#ifndef FLEDASTY_RED_BLACK_TREE +#define FLEDASTY_RED_BLACK_TREE + +#include +#include +#include +#include +#include + +#include "../Utils/Error.h" + +#define FLEDASTY_RED_BLACK_TREE_DEFINE(key_type, value_type, name) \ +typedef struct FledastyRedBlackTreeNode_##name { \ + bool is_red; \ + \ + key_type key; \ + value_type value; \ + \ + struct FledastyRedBlackTreeNode_##name *parent, *left, *right; \ +} FledastyRedBlackTreeNode_##name; \ + \ +typedef struct { \ + size_t size; \ + FledastyRedBlackTreeNode_##name *top; \ +} FledastyRedBlackTree_##name; + +#endif diff --git a/Tests/Main.c b/Tests/Main.c index aa67066..7eb8af0 100644 --- a/Tests/Main.c +++ b/Tests/Main.c @@ -31,6 +31,7 @@ #include #include #include +#include #include static inline bool compare_integers(const int first_value, const int second_value) { return first_value == second_value; } @@ -58,6 +59,8 @@ FLEDASTY_DOUBLY_LINKED_LIST_IMPLEMENT(int, int, compare_integers) FLEDASTY_BINARY_SEARCH_TREE_DEFINE(int, int, int_int) FLEDASTY_BINARY_SEARCH_TREE_IMPLEMENT(int, int, int_int, compare_integers, integer_less_than_integer) +FLEDASTY_RED_BLACK_TREE_DEFINE(int, int, int_int) + int main() { FledastyQueue_int test_queue = { 0, 0, 0, 0, NULL }; for (int i = 0; i < 10; i += 1) { @@ -322,7 +325,7 @@ int main() { fledasty_string_free(&normal_test_string); - FledastyBinarySearchTree_int_int test_search_tree = { 0, 0, NULL }; + FledastyBinarySearchTree_int_int test_search_tree = { 0, NULL }; fledasty_binary_search_tree_int_int_insert(&test_search_tree, 5, 10); fledasty_binary_search_tree_int_int_insert(&test_search_tree, 3, 6);