fix bug in priority_queue==

DanielKrawisz · Nov 1, 2022 · 6bbd903 · 6bbd903
1 parent f2743db
commit 6bbd903
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/include/data/tools/priority_queue.hpp b/include/data/tools/priority_queue.hpp
@@ -66,7 +66,10 @@ namespace data::tool {
 
     template <functional::tree tree, typename element = element_of<tree>> 
     bool inline operator==(const priority_queue<tree, element> a, const priority_queue<tree, element> b) {
-        return a.first() == b.first() && a.rest() == b.rest();
+        if (data::empty(a) && data::empty(b)) return true;
+        if (data::empty(a) || data::empty(b)) return false;
+        if (a.first() != b.first()) return false;
+        return a.rest() == b.rest();
     }
 
     template <functional::tree tree, typename element> 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -37,6 +37,7 @@ package_add_test(testTake testTake.cpp)
 package_add_test(testSort testSort.cpp)
 package_add_test(testLinkedTree testLinkedTree.cpp)
 package_add_test(testMap testMap.cpp)
+package_add_test(testPriorityQueue testPriorityQueue.cpp)
 package_add_test(testForEach testForEach.cpp)
 package_add_test(testPolynomial testPolynomial.cpp)
 package_add_test(testPermutation testPermutation.cpp)

diff --git a/test/testPriorityQueue.cpp b/test/testPriorityQueue.cpp
@@ -0,0 +1,19 @@
+// Copyright (c) 2019 Daniel Krawisz
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "data/tools.hpp"
+#include "gtest/gtest.h"
+
+TEST(PriorityQueueTest, TestPriorityQueue) {
+    using namespace data;
+
+    using pq = priority_queue<int>;
+
+    EXPECT_EQ(pq{}, pq{});
+    EXPECT_EQ(first(pq{} << 1), 1);
+    EXPECT_NE(pq{} << 1, pq{});
+    EXPECT_EQ(pq{} << 1 << 2, pq{} << 2 << 1);
+    EXPECT_EQ(1, first(pq{} << 2 << 1));
+}
+