Merge pull request #29 from lxylxy123456/interval_tree

Fix uninitialized variable in IntervalTree
lxylxy123456 · Dec 17, 2020 · dd03f04 · dd03f04
2 parents 7c0089d + dc0f524
commit dd03f04
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 12 deletions.
diff --git a/include/IntervalTree.hpp b/include/IntervalTree.hpp
@@ -56,7 +56,7 @@ template <typename T>
 class MData {
 	// Size Data
 	public:
-		MData() {}
+		MData(T m): max(m) {}
 		MData(Interval<T> d): data(d), max(d.high) {}
 		bool operator<(const MData<T>& rhs) const { return data < rhs.data; }
 		bool operator>(const MData<T>& rhs) const { return data > rhs.data; }
@@ -76,6 +76,7 @@ template <typename T>
 class AugmentRedBlackTree: public RedBlackTree<T> {
 	public:
 		AugmentRedBlackTree(void) {}
+		AugmentRedBlackTree(Node<CData<T>> n): RedBlackTree<T>(n) {}
 		virtual void UpdateAttribute(Node<CData<T>>* x) = 0;
 		virtual void LeftRotate(Node<CData<T>>* x) {
 			Node<CData<T>>* y = x->right;
@@ -183,6 +184,8 @@ class AugmentRedBlackTree: public RedBlackTree<T> {
 template<typename T>
 class IntervalTree: public AugmentRedBlackTree<MData<T>> {
 	public:
+		IntervalTree(): AugmentRedBlackTree<MData<T>>() {}
+		IntervalTree(CData<MData<T>> n): AugmentRedBlackTree<MData<T>>(n) {}
 		virtual void UpdateAttribute(Node<CData<MData<T>>>* x) {
 			if (x != this->nil) {
 				T& a = x->data.data.max;

diff --git a/include/RedBlackTree.hpp b/include/RedBlackTree.hpp
@@ -75,6 +75,8 @@ template <typename T>
 class RedBlackTree: public BinarySearchTree<CData<T>> {
 	public:
 		RedBlackTree(void): BinarySearchTree<CData<T>>(new Node<CData<T>>()) {}
+		RedBlackTree(Node<CData<T>> n):
+			BinarySearchTree<CData<T>>(new Node<CData<T>>(n)) {}
 		virtual void LeftRotate(Node<CData<T>>* x) {
 			Node<CData<T>>* y = x->right;
 			x->right = y->left;

diff --git a/src/IntervalTreeMain.cpp b/src/IntervalTreeMain.cpp
@@ -28,7 +28,7 @@ using namespace algorithms;
 
 int main(int argc, char *argv[]) {
 	size_t n = get_argv(argc, argv, 1, 0);
-	IntervalTree<int> IT;
+	IntervalTree<int> IT(MData<int>{0});
 	if (n) {
 		std::vector<int> a;
 		random_integers(a, 0, n - 1, 2 * n);

diff --git a/src/IntervalTreeTest.cpp b/src/IntervalTreeTest.cpp
@@ -60,12 +60,12 @@ void sanity_check(IntervalTree<int>& BT, std::vector<Interval<int>>& its) {
 	}
 }
 
-int test(int n) {
-	IntervalTree<int> BT;
+int test(int n, int m) {
+	IntervalTree<int> BT(MData<int>{m});
 	std::vector<int> data;
 	std::vector<Interval<int>> its;
 	if (n) {
-		random_integers(data, 0, 3 * n / 2, 2 * n);
+		random_integers(data, m, 3 * n / 2, 2 * n);
 		for (std::vector<int>::iterator i = data.begin(); i != data.end();
 			i+=2) {
 			Interval<int> it(std::min(*i, *(i + 1)), std::max(*i, *(i + 1)));
@@ -76,7 +76,7 @@ int test(int n) {
 	BT.print_tree();
 	sanity_check(BT, its);
 	std::vector<int> rm;
-	random_integers(rm, 0, 3 * n / 2, n * 4 + 4);
+	random_integers(rm, m, 3 * n / 2, n * 4 + 4);
 	for (std::vector<int>::iterator i = rm.begin(); i != rm.end(); i+=2) {
 		Interval<int> it(std::min(*i, *(i + 1)), std::max(*i, *(i + 1)));
 		std::cout << "rm " << it << std::endl;
@@ -98,12 +98,14 @@ int test(int n) {
 
 int main(int argc, char *argv[]) {
 	std::cout << "seed = " << random_seed_get() << std::endl;
-	test(0);
-	test(1);
-	test(4);
-	test(16);
-	test(47);
-	test(100);
+	for (int m = 0; m > -1000; m -= 400) {
+		test(0, m);
+		test(1, m);
+		test(4, m);
+		test(16, m);
+		test(47, m);
+		test(100, m);
+	}
 	std::cout << "\033[0m" << std::endl;
 	return 0;
 }