Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BAN: Restructure sort functions and namespaces

This commit is contained in:
Bananymous 2023-12-08 18:58:47 +02:00
parent b523ccb893
commit 2b927b9729
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
BAN/include/BAN/Sort.h
View File

@ -4,11 +4,11 @@
#include <BAN/Traits.h> #include <BAN/Traits.h>
#include <BAN/Math.h> #include <BAN/Math.h>
namespace BAN namespace BAN::sort
{ {
template<typename It, typename Comp = less<typename It::value_type>> template<typename It, typename Comp = less<typename It::value_type>>
void sort_exchange(It begin, It end, Comp comp = {}) void exchange_sort(It begin, It end, Comp comp = {})
{ {
for (It lhs = begin; lhs != end; ++lhs) for (It lhs = begin; lhs != end; ++lhs)
for (It rhs = next(lhs, 1); rhs != end; ++rhs) for (It rhs = next(lhs, 1); rhs != end; ++rhs)
@ -16,7 +16,7 @@ namespace BAN
swap(*lhs, *rhs); swap(*lhs, *rhs);
} }
namespace detail::sort namespace detail
{ {
template<typename It, typename Comp> template<typename It, typename Comp>
@ -42,17 +42,17 @@ namespace BAN
} }
template<typename It, typename Comp = less<typename It::value_type>> template<typename It, typename Comp = less<typename It::value_type>>
void sort_quick(It begin, It end, Comp comp = {}) void quick_sort(It begin, It end, Comp comp = {})
{ {
if (begin == end || next(begin, 1) == end) if (begin == end || next(begin, 1) == end)
return; return;
It mid = detail::sort::partition(begin, end, comp); It mid = detail::partition(begin, end, comp);
sort_quick(begin, mid, comp); quick_sort(begin, mid, comp);
sort_quick(++mid, end, comp); quick_sort(++mid, end, comp);
} }
template<typename It, typename Comp = less<typename It::value_type>> template<typename It, typename Comp = less<typename It::value_type>>
void sort_insertion(It begin, It end, Comp comp = {}) void insertion_sort(It begin, It end, Comp comp = {})
{ {
if (begin == end || next(begin, 1) == end) if (begin == end || next(begin, 1) == end)
return; return;
@ -67,7 +67,7 @@ namespace BAN
} }
template<typename It, typename Comp = less<typename It::value_type>> template<typename It, typename Comp = less<typename It::value_type>>
void sort_heap(It begin, It end, Comp comp = {}) void heap_sort(It begin, It end, Comp comp = {})
{ {
if (begin == end || next(begin, 1) == end) if (begin == end || next(begin, 1) == end)
return; return;
@ -101,34 +101,34 @@ namespace BAN
} }
} }
namespace detail::sort namespace detail
{ {
template<typename It, typename Comp> template<typename It, typename Comp>
void intro_impl(It begin, It end, size_t max_depth, Comp comp) void intro_sort_impl(It begin, It end, size_t max_depth, Comp comp)
{ {
if (distance(begin, end) < 16) if (distance(begin, end) < 16)
return sort_insertion(begin, end, comp); return insertion_sort(begin, end, comp);
if (max_depth == 0) if (max_depth == 0)
return sort_heap(begin, end, comp); return heap_sort(begin, end, comp);
It mid = detail::sort::partition(begin, end, comp); It mid = detail::partition(begin, end, comp);
intro_impl(begin, mid, max_depth - 1, comp); intro_sort_impl(begin, mid, max_depth - 1, comp);
intro_impl(++mid, end, max_depth - 1, comp); intro_sort_impl(++mid, end, max_depth - 1, comp);
} }
} }
template<typename It, typename Comp = less<typename It::value_type>> template<typename It, typename Comp = less<typename It::value_type>>
void sort_intro(It begin, It end, Comp comp = {}) void intro_sort(It begin, It end, Comp comp = {})
{ {
size_t max_depth = Math::ilog2(distance(begin, end)); size_t max_depth = Math::ilog2(distance(begin, end));
detail::sort::intro_impl(begin, end, max_depth, comp); detail::intro_sort_impl(begin, end, max_depth, comp);
} }
template<typename It, typename Comp = less<typename It::value_type>> template<typename It, typename Comp = less<typename It::value_type>>
void sort(It begin, It end, Comp comp = {}) void sort(It begin, It end, Comp comp = {})
{ {
return sort_intro(begin, end, comp); return sort::intro_sort(begin, end, comp);
} }
} }

2
userspace/aoc2023/day7/main.cpp
View File

@ -116,7 +116,7 @@ i64 puzzle(FILE* fp, bool joker)
)); ));
} }
BAN::sort(hands.begin(), hands.end(), BAN::sort::sort(hands.begin(), hands.end(),
[joker] (const Hand& lhs, const Hand& rhs) { [joker] (const Hand& lhs, const Hand& rhs) {
return hand_score(lhs, joker) < hand_score(rhs, joker); return hand_score(lhs, joker) < hand_score(rhs, joker);
} }

12
userspace/test-sort/main.cpp
View File

@ -31,11 +31,11 @@ bool is_sorted(BAN::Vector<T>& vec)
int main() int main()
{ {
srand(time(0)); srand(time(0));
TEST("exchange sort", BAN::sort_exchange, 100); TEST("exchange sort", BAN::sort::exchange_sort, 100);
TEST("exchange sort", BAN::sort_exchange, 1000); TEST("exchange sort", BAN::sort::exchange_sort, 1000);
TEST("exchange sort", BAN::sort_exchange, 10000); TEST("exchange sort", BAN::sort::exchange_sort, 10000);
TEST("quick sort", BAN::sort_quick, 100); TEST("quick sort", BAN::sort::quick_sort, 100);
TEST("quick sort", BAN::sort_quick, 1000); TEST("quick sort", BAN::sort::quick_sort, 1000);
TEST("quick sort", BAN::sort_quick, 10000); TEST("quick sort", BAN::sort::quick_sort, 10000);
} }