3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into fs_QuadricEdgeCollapse

Browse source
This commit is contained in:
Filip Sykala 2021-07-09 14:14:54 +02:00
commit aca93a7ced
1 changed files with 129 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

247
tests/libslic3r/test_mutable_priority_queue.cpp
View file

@ -54,12 +54,18 @@ TEST_CASE("Skip addressing", "[MutableSkipHeapPriorityQueue]") {
} }
} }
struct ValueIndexPair
{
int value;
size_t idx = 0;
};
template<size_t block_size = 16> template<size_t block_size = 16>
static auto make_test_priority_queue() static auto make_test_priority_queue()
{ {
return make_miniheap_mutable_priority_queue<std::pair<int, size_t>, block_size, false>( return make_miniheap_mutable_priority_queue<ValueIndexPair, block_size, false>(
[](std::pair<int, size_t> &v, size_t idx){ v.second = idx; }, [](ValueIndexPair &v, size_t idx){ v.idx = idx; },
[](std::pair<int, size_t> &l, std::pair<int, size_t> &r){ return l.first < r.first; }); [](ValueIndexPair &l, ValueIndexPair &r){ return l.value < r.value; });
} }
TEST_CASE("Mutable priority queue - basic tests", "[MutableSkipHeapPriorityQueue]") { TEST_CASE("Mutable priority queue - basic tests", "[MutableSkipHeapPriorityQueue]") {
@ -70,18 +76,18 @@ TEST_CASE("Mutable priority queue - basic tests", "[MutableSkipHeapPriorityQueue
} }
SECTION("an empty queue is not empty when one element is inserted") { SECTION("an empty queue is not empty when one element is inserted") {
auto q = make_test_priority_queue(); auto q = make_test_priority_queue();
q.push(std::make_pair(1, 0U)); q.push({ 1 });
REQUIRE(!q.empty()); REQUIRE(!q.empty());
REQUIRE(q.size() == 1); REQUIRE(q.size() == 1);
} }
SECTION("a queue with one element has it on top") { SECTION("a queue with one element has it on top") {
auto q = make_test_priority_queue(); auto q = make_test_priority_queue();
q.push(std::make_pair(8, 0U)); q.push({ 8 });
REQUIRE(q.top().first == 8); REQUIRE(q.top().value == 8);
} }
SECTION("a queue with one element becomes empty when popped") { SECTION("a queue with one element becomes empty when popped") {
auto q = make_test_priority_queue(); auto q = make_test_priority_queue();
q.push(std::make_pair(9, 0U)); q.push({ 9 });
q.pop(); q.pop();
REQUIRE(q.empty()); REQUIRE(q.empty());
REQUIRE(q.size() == 0); REQUIRE(q.size() == 0);
@ -89,22 +95,22 @@ TEST_CASE("Mutable priority queue - basic tests", "[MutableSkipHeapPriorityQueue
SECTION("insert sorted stays sorted") { SECTION("insert sorted stays sorted") {
auto q = make_test_priority_queue(); auto q = make_test_priority_queue();
for (auto i : { 1, 2, 3, 4, 5, 6, 7, 8 }) for (auto i : { 1, 2, 3, 4, 5, 6, 7, 8 })
q.push(std::make_pair(i, 0U)); q.push({ i });
REQUIRE(q.top().first == 1); REQUIRE(q.top().value == 1);
q.pop(); q.pop();
REQUIRE(q.top().first == 2); REQUIRE(q.top().value == 2);
q.pop(); q.pop();
REQUIRE(q.top().first == 3); REQUIRE(q.top().value == 3);
q.pop(); q.pop();
REQUIRE(q.top().first == 4); REQUIRE(q.top().value == 4);
q.pop(); q.pop();
REQUIRE(q.top().first == 5); REQUIRE(q.top().value == 5);
q.pop(); q.pop();
REQUIRE(q.top().first == 6); REQUIRE(q.top().value == 6);
q.pop(); q.pop();
REQUIRE(q.top().first == 7); REQUIRE(q.top().value == 7);
q.pop(); q.pop();
REQUIRE(q.top().first == 8); REQUIRE(q.top().value == 8);
q.pop(); q.pop();
REQUIRE(q.empty()); REQUIRE(q.empty());
} }
@ -116,14 +122,14 @@ TEST_CASE("Mutable priority queue - basic tests", "[MutableSkipHeapPriorityQueue
int n[36000]; int n[36000];
for (auto& i : n) { for (auto& i : n) {
i = dist(gen); i = dist(gen);
q.push(std::make_pair(i, 0U)); q.push({ i });
} }
REQUIRE(!q.empty()); REQUIRE(!q.empty());
REQUIRE(q.size() == 36000); REQUIRE(q.size() == 36000);
std::sort(std::begin(n), std::end(n)); std::sort(std::begin(n), std::end(n));
for (auto i : n) { for (auto i : n) {
REQUIRE(q.top().first == i); REQUIRE(q.top().value == i);
q.pop(); q.pop();
} }
REQUIRE(q.empty()); REQUIRE(q.empty());
@ -131,176 +137,181 @@ TEST_CASE("Mutable priority queue - basic tests", "[MutableSkipHeapPriorityQueue
} }
TEST_CASE("Mutable priority queue - reshedule first", "[MutableSkipHeapPriorityQueue]") { TEST_CASE("Mutable priority queue - reshedule first", "[MutableSkipHeapPriorityQueue]") {
struct MyValue {
int value;
int *ptr;
size_t idx;
};
SECTION("reschedule top with highest prio leaves order unchanged") { SECTION("reschedule top with highest prio leaves order unchanged") {
auto q = make_miniheap_mutable_priority_queue<std::pair<std::pair<int, int*>, size_t>, 4, false>( auto q = make_miniheap_mutable_priority_queue<MyValue, 4, false>(
[](std::pair<std::pair<int, int*>, size_t>& v, size_t idx) { v.second = idx; }, [](MyValue& v, size_t idx) { v.idx = idx; },
[](std::pair<std::pair<int, int*>, size_t>& l, std::pair<std::pair<int, int*>, size_t>& r) { return l.first.first < r.first.first; }); [](MyValue& l, MyValue& r) { return l.value < r.value; });
// 0 1 2 3 4 5 6 7 8 // 0 1 2 3 4 5 6 7 8
int nums[] = { 32, 1, 88, 16, 9, 11, 3, 22, 23 }; int nums[] = { 32, 1, 88, 16, 9, 11, 3, 22, 23 };
for (auto &i : nums) for (auto &i : nums)
q.push(std::make_pair(std::make_pair(i, &i), 0U)); q.push({ i, &i, 0U });
REQUIRE(q.top().first.first == 1); REQUIRE(q.top().value == 1);
REQUIRE(q.top().first.second == &nums[1]); REQUIRE(q.top().ptr == &nums[1]);
REQUIRE(*q.top().first.second == 1); REQUIRE(*q.top().ptr == 1);
// Update the top element. // Update the top element.
q.top().first.first = 2; q.top().value = 2;
q.update(1); q.update(1);
REQUIRE(q.top().first.first == 2); REQUIRE(q.top().value == 2);
REQUIRE(q.top().first.second == &nums[1]); REQUIRE(q.top().ptr == &nums[1]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 3); REQUIRE(q.top().value == 3);
REQUIRE(q.top().first.second == &nums[6]); REQUIRE(q.top().ptr == &nums[6]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 9); REQUIRE(q.top().value == 9);
REQUIRE(q.top().first.second == &nums[4]); REQUIRE(q.top().ptr == &nums[4]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 11); REQUIRE(q.top().value == 11);
REQUIRE(q.top().first.second == &nums[5]); REQUIRE(q.top().ptr == &nums[5]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 16); REQUIRE(q.top().value == 16);
REQUIRE(q.top().first.second == &nums[3]); REQUIRE(q.top().ptr == &nums[3]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 22); REQUIRE(q.top().value == 22);
REQUIRE(q.top().first.second == &nums[7]); REQUIRE(q.top().ptr == &nums[7]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 23); REQUIRE(q.top().value == 23);
REQUIRE(q.top().first.second == &nums[8]); REQUIRE(q.top().ptr == &nums[8]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 32); REQUIRE(q.top().value == 32);
REQUIRE(q.top().first.second == &nums[0]); REQUIRE(q.top().ptr == &nums[0]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 88); REQUIRE(q.top().value == 88);
REQUIRE(q.top().first.second == &nums[2]); REQUIRE(q.top().ptr == &nums[2]);
q.pop(); q.pop();
REQUIRE(q.empty()); REQUIRE(q.empty());
} }
SECTION("reschedule to mid range moves element to correct place") { SECTION("reschedule to mid range moves element to correct place") {
auto q = make_miniheap_mutable_priority_queue<std::pair<std::pair<int, int*>, size_t>, 4, false>( auto q = make_miniheap_mutable_priority_queue<MyValue, 4, false>(
[](std::pair<std::pair<int, int*>, size_t>& v, size_t idx) { v.second = idx; }, [](MyValue& v, size_t idx) { v.idx = idx; },
[](std::pair<std::pair<int, int*>, size_t>& l, std::pair<std::pair<int, int*>, size_t>& r) { return l.first.first < r.first.first; }); [](MyValue& l, MyValue& r) { return l.value < r.value; });
// 0 1 2 3 4 5 6 7 8 // 0 1 2 3 4 5 6 7 8
int nums[] = { 32, 1, 88, 16, 9, 11, 3, 22, 23 }; int nums[] = { 32, 1, 88, 16, 9, 11, 3, 22, 23 };
for (auto& i : nums) for (auto& i : nums)
q.push(std::make_pair(std::make_pair(i, &i), 0U)); q.push({ i, &i, 0U });
REQUIRE(q.top().first.first == 1); REQUIRE(q.top().value == 1);
REQUIRE(q.top().first.second == &nums[1]); REQUIRE(q.top().ptr == &nums[1]);
REQUIRE(*q.top().first.second == 1); REQUIRE(*q.top().ptr == 1);
// Update the top element. // Update the top element.
q.top().first.first = 12; q.top().value = 12;
q.update(1); q.update(1);
REQUIRE(q.top().first.first == 3); REQUIRE(q.top().value == 3);
REQUIRE(q.top().first.second == &nums[6]); REQUIRE(q.top().ptr == &nums[6]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 9); REQUIRE(q.top().value == 9);
REQUIRE(q.top().first.second == &nums[4]); REQUIRE(q.top().ptr == &nums[4]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 11); REQUIRE(q.top().value == 11);
REQUIRE(q.top().first.second == &nums[5]); REQUIRE(q.top().ptr == &nums[5]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 12); REQUIRE(q.top().value == 12);
REQUIRE(q.top().first.second == &nums[1]); REQUIRE(q.top().ptr == &nums[1]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 16); REQUIRE(q.top().value == 16);
REQUIRE(q.top().first.second == &nums[3]); REQUIRE(q.top().ptr == &nums[3]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 22); REQUIRE(q.top().value == 22);
REQUIRE(q.top().first.second == &nums[7]); REQUIRE(q.top().ptr == &nums[7]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 23); REQUIRE(q.top().value == 23);
REQUIRE(q.top().first.second == &nums[8]); REQUIRE(q.top().ptr == &nums[8]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 32); REQUIRE(q.top().value == 32);
REQUIRE(q.top().first.second == &nums[0]); REQUIRE(q.top().ptr == &nums[0]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 88); REQUIRE(q.top().value == 88);
REQUIRE(q.top().first.second == &nums[2]); REQUIRE(q.top().ptr == &nums[2]);
q.pop(); q.pop();
REQUIRE(q.empty()); REQUIRE(q.empty());
} }
SECTION("reschedule to last moves element to correct place", "heap") SECTION("reschedule to last moves element to correct place", "heap")
{ {
auto q = make_miniheap_mutable_priority_queue<std::pair<std::pair<int, int*>, size_t>, 4, false>( auto q = make_miniheap_mutable_priority_queue<MyValue, 4, false>(
[](std::pair<std::pair<int, int*>, size_t>& v, size_t idx) { v.second = idx; }, [](MyValue& v, size_t idx) { v.idx = idx; },
[](std::pair<std::pair<int, int*>, size_t>& l, std::pair<std::pair<int, int*>, size_t>& r) { return l.first.first < r.first.first; }); [](MyValue& l, MyValue& r) { return l.value < r.value; });
// 0 1 2 3 4 5 6 7 8 // 0 1 2 3 4 5 6 7 8
int nums[] = { 32, 1, 88, 16, 9, 11, 3, 22, 23 }; int nums[] = { 32, 1, 88, 16, 9, 11, 3, 22, 23 };
for (auto& i : nums) for (auto& i : nums)
q.push(std::make_pair(std::make_pair(i, &i), 0U)); q.push({ i, &i, 0U });
REQUIRE(q.top().first.first == 1); REQUIRE(q.top().value == 1);
REQUIRE(q.top().first.second == &nums[1]); REQUIRE(q.top().ptr == &nums[1]);
REQUIRE(*q.top().first.second == 1); REQUIRE(*q.top().ptr == 1);
// Update the top element. // Update the top element.
q.top().first.first = 89; q.top().value = 89;
q.update(1); q.update(1);
REQUIRE(q.top().first.first == 3); REQUIRE(q.top().value == 3);
REQUIRE(q.top().first.second == &nums[6]); REQUIRE(q.top().ptr == &nums[6]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 9); REQUIRE(q.top().value == 9);
REQUIRE(q.top().first.second == &nums[4]); REQUIRE(q.top().ptr == &nums[4]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 11); REQUIRE(q.top().value == 11);
REQUIRE(q.top().first.second == &nums[5]); REQUIRE(q.top().ptr == &nums[5]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 16); REQUIRE(q.top().value == 16);
REQUIRE(q.top().first.second == &nums[3]); REQUIRE(q.top().ptr == &nums[3]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 22); REQUIRE(q.top().value == 22);
REQUIRE(q.top().first.second == &nums[7]); REQUIRE(q.top().ptr == &nums[7]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 23); REQUIRE(q.top().value == 23);
REQUIRE(q.top().first.second == &nums[8]); REQUIRE(q.top().ptr == &nums[8]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 32); REQUIRE(q.top().value == 32);
REQUIRE(q.top().first.second == &nums[0]); REQUIRE(q.top().ptr == &nums[0]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 88); REQUIRE(q.top().value == 88);
REQUIRE(q.top().first.second == &nums[2]); REQUIRE(q.top().ptr == &nums[2]);
q.pop(); q.pop();
REQUIRE(q.top().first.first == 89); REQUIRE(q.top().value == 89);
REQUIRE(q.top().first.second == &nums[1]); REQUIRE(q.top().ptr == &nums[1]);
q.pop(); q.pop();
REQUIRE(q.empty()); REQUIRE(q.empty());
} }
SECTION("reschedule top of 2 elements to last") { SECTION("reschedule top of 2 elements to last") {
auto q = make_test_priority_queue<8>(); auto q = make_test_priority_queue<8>();
q.push(std::make_pair(1, 0U)); q.push({ 1 });
q.push(std::make_pair(2, 0U)); q.push({ 2 });
REQUIRE(q.top().first == 1); REQUIRE(q.top().value == 1);
// Update the top element. // Update the top element.
q.top().first = 3; q.top().value = 3;
q.update(1); q.update(1);
REQUIRE(q.top().first == 2); REQUIRE(q.top().value == 2);
} }
SECTION("reschedule top of 3 elements left to 2nd") { SECTION("reschedule top of 3 elements left to 2nd") {
auto q = make_test_priority_queue<8>(); auto q = make_test_priority_queue<8>();
q.push(std::make_pair(1, 0U)); q.push({ 1 });
q.push(std::make_pair(2, 0U)); q.push({ 2 });
q.push(std::make_pair(4, 0U)); q.push({ 4 });
REQUIRE(q.top().first == 1); REQUIRE(q.top().value == 1);
// Update the top element. // Update the top element.
q.top().first = 3; q.top().value = 3;
q.update(1); q.update(1);
REQUIRE(q.top().first == 2); REQUIRE(q.top().value == 2);
} }
SECTION("reschedule top of 3 elements right to 2nd") { SECTION("reschedule top of 3 elements right to 2nd") {
auto q = make_test_priority_queue<8>(); auto q = make_test_priority_queue<8>();
q.push(std::make_pair(1, 0U)); q.push({ 1 });
q.push(std::make_pair(4, 0U)); q.push({ 4 });
q.push(std::make_pair(2, 0U)); q.push({ 2 });
REQUIRE(q.top().first == 1); REQUIRE(q.top().value == 1);
// Update the top element. // Update the top element.
q.top().first = 3; q.top().value = 3;
q.update(1); q.update(1);
REQUIRE(q.top().first == 2); REQUIRE(q.top().value == 2);
} }
SECTION("reschedule top random gives same resultas pop/push") { SECTION("reschedule top random gives same resultas pop/push") {
std::random_device rd; std::random_device rd;
@ -312,16 +323,16 @@ TEST_CASE("Mutable priority queue - reshedule first", "[MutableSkipHeapPriorityQ
for (size_t outer = 0; outer < 100; ++ outer) { for (size_t outer = 0; outer < 100; ++ outer) {
int num = gen(); int num = gen();
pq.push(std::make_pair(num, 0U)); pq.push({ num });
stdq.push(num); stdq.push({ num });
for (size_t inner = 0; inner < 100; ++ inner) { for (size_t inner = 0; inner < 100; ++ inner) {
int newval = gen(); int newval = gen();
// Update the top element. // Update the top element.
pq.top().first = newval; pq.top().value = newval;
pq.update(1); pq.update(1);
stdq.pop(); stdq.pop();
stdq.push(newval); stdq.push({ newval });
auto n = pq.top().first; auto n = pq.top().value;
auto sn = stdq.top(); auto sn = stdq.top();
REQUIRE(sn == n); REQUIRE(sn == n);
} }