fixed: sort functionalities

2017-09-07 14:05:58 +02:00
parent 2011defb1e
commit ed98ae3e70
3 changed files with 209 additions and 20 deletions
--- a/test/sparse_set.cpp
+++ b/test/sparse_set.cpp
@@ -165,34 +165,218 @@ TEST(SparseSetWithType, Swap) {
    set.reset();
 }

-TEST(SparseSetWithType, SortBasic) {
+TEST(SparseSetWithType, SortOrdered) {
    using SparseSet = entt::SparseSet<unsigned int, int>;

    SparseSet set;

-    ASSERT_EQ(set.construct(12, 6), 6);
+    ASSERT_EQ(set.construct(12, 12), 12);
    ASSERT_EQ(set.construct(42, 9), 9);
+    ASSERT_EQ(set.construct(7, 6), 6);
    ASSERT_EQ(set.construct(3, 3), 3);
+    ASSERT_EQ(set.construct(9, 1), 1);

    set.sort([](auto lhs, auto rhs) {
        return lhs < rhs;
    });

-    ASSERT_EQ(*(set.raw() + 0u), 9);
-    ASSERT_EQ(*(set.raw() + 1u), 6);
-    ASSERT_EQ(*(set.raw() + 2u), 3);
+    ASSERT_EQ(*(set.raw() + 0u), 12);
+    ASSERT_EQ(*(set.raw() + 1u), 9);
+    ASSERT_EQ(*(set.raw() + 2u), 6);
+    ASSERT_EQ(*(set.raw() + 3u), 3);
+    ASSERT_EQ(*(set.raw() + 4u), 1);

    auto begin = set.begin();
    auto end = set.end();

+    ASSERT_EQ(set.get(*(begin++)), 1);
    ASSERT_EQ(set.get(*(begin++)), 3);
    ASSERT_EQ(set.get(*(begin++)), 6);
    ASSERT_EQ(set.get(*(begin++)), 9);
+    ASSERT_EQ(set.get(*(begin++)), 12);
    ASSERT_EQ(begin, end);

    set.reset();
 }

-TEST(SparseSetWithType, SortAccordingTo) {
-    // TODO
+TEST(SparseSetWithType, SortReverse) {
+    using SparseSet = entt::SparseSet<unsigned int, int>;
+
+    SparseSet set;
+
+    ASSERT_EQ(set.construct(12, 1), 1);
+    ASSERT_EQ(set.construct(42, 3), 3);
+    ASSERT_EQ(set.construct(7, 6), 6);
+    ASSERT_EQ(set.construct(3, 9), 9);
+    ASSERT_EQ(set.construct(9, 12), 12);
+
+    set.sort([](auto lhs, auto rhs) {
+        return lhs < rhs;
+    });
+
+    ASSERT_EQ(*(set.raw() + 0u), 12);
+    ASSERT_EQ(*(set.raw() + 1u), 9);
+    ASSERT_EQ(*(set.raw() + 2u), 6);
+    ASSERT_EQ(*(set.raw() + 3u), 3);
+    ASSERT_EQ(*(set.raw() + 4u), 1);
+
+    auto begin = set.begin();
+    auto end = set.end();
+
+    ASSERT_EQ(set.get(*(begin++)), 1);
+    ASSERT_EQ(set.get(*(begin++)), 3);
+    ASSERT_EQ(set.get(*(begin++)), 6);
+    ASSERT_EQ(set.get(*(begin++)), 9);
+    ASSERT_EQ(set.get(*(begin++)), 12);
+    ASSERT_EQ(begin, end);
+
+    set.reset();
+}
+
+TEST(SparseSetWithType, SortUnordered) {
+    using SparseSet = entt::SparseSet<unsigned int, int>;
+
+    SparseSet set;
+
+    ASSERT_EQ(set.construct(12, 6), 6);
+    ASSERT_EQ(set.construct(42, 3), 3);
+    ASSERT_EQ(set.construct(7, 1), 1);
+    ASSERT_EQ(set.construct(3, 9), 9);
+    ASSERT_EQ(set.construct(9, 12), 12);
+
+    set.sort([](auto lhs, auto rhs) {
+        return lhs < rhs;
+    });
+
+    ASSERT_EQ(*(set.raw() + 0u), 12);
+    ASSERT_EQ(*(set.raw() + 1u), 9);
+    ASSERT_EQ(*(set.raw() + 2u), 6);
+    ASSERT_EQ(*(set.raw() + 3u), 3);
+    ASSERT_EQ(*(set.raw() + 4u), 1);
+
+    auto begin = set.begin();
+    auto end = set.end();
+
+    ASSERT_EQ(set.get(*(begin++)), 1);
+    ASSERT_EQ(set.get(*(begin++)), 3);
+    ASSERT_EQ(set.get(*(begin++)), 6);
+    ASSERT_EQ(set.get(*(begin++)), 9);
+    ASSERT_EQ(set.get(*(begin++)), 12);
+    ASSERT_EQ(begin, end);
+
+    set.reset();
+}
+
+TEST(SparseSetWithType, RespectOrdered) {
+    using SparseSet = entt::SparseSet<unsigned int, int>;
+
+    SparseSet lhs;
+    SparseSet rhs;
+
+    ASSERT_EQ(lhs.construct(1, 0), 0);
+    ASSERT_EQ(lhs.construct(2, 0), 0);
+    ASSERT_EQ(lhs.construct(3, 0), 0);
+    ASSERT_EQ(lhs.construct(4, 0), 0);
+    ASSERT_EQ(lhs.construct(5, 0), 0);
+
+    ASSERT_EQ(rhs.construct(6, 0), 0);
+    ASSERT_EQ(rhs.construct(1, 0), 0);
+    ASSERT_EQ(rhs.construct(2, 0), 0);
+    ASSERT_EQ(rhs.construct(3, 0), 0);
+    ASSERT_EQ(rhs.construct(4, 0), 0);
+    ASSERT_EQ(rhs.construct(5, 0), 0);
+
+    rhs.respect(lhs);
+
+    ASSERT_EQ(*(lhs.data() + 0u), 1u);
+    ASSERT_EQ(*(lhs.data() + 1u), 2u);
+    ASSERT_EQ(*(lhs.data() + 2u), 3u);
+    ASSERT_EQ(*(lhs.data() + 3u), 4u);
+    ASSERT_EQ(*(lhs.data() + 4u), 5u);
+
+    ASSERT_EQ(*(rhs.data() + 0u), 6u);
+    ASSERT_EQ(*(rhs.data() + 1u), 1u);
+    ASSERT_EQ(*(rhs.data() + 2u), 2u);
+    ASSERT_EQ(*(rhs.data() + 3u), 3u);
+    ASSERT_EQ(*(rhs.data() + 4u), 4u);
+    ASSERT_EQ(*(rhs.data() + 5u), 5u);
+
+    lhs.reset();
+    rhs.reset();
+}
+
+TEST(SparseSetWithType, RespectReverse) {
+    using SparseSet = entt::SparseSet<unsigned int, int>;
+
+    SparseSet lhs;
+    SparseSet rhs;
+
+    ASSERT_EQ(lhs.construct(1, 0), 0);
+    ASSERT_EQ(lhs.construct(2, 0), 0);
+    ASSERT_EQ(lhs.construct(3, 0), 0);
+    ASSERT_EQ(lhs.construct(4, 0), 0);
+    ASSERT_EQ(lhs.construct(5, 0), 0);
+
+    ASSERT_EQ(rhs.construct(5, 0), 0);
+    ASSERT_EQ(rhs.construct(4, 0), 0);
+    ASSERT_EQ(rhs.construct(3, 0), 0);
+    ASSERT_EQ(rhs.construct(2, 0), 0);
+    ASSERT_EQ(rhs.construct(1, 0), 0);
+    ASSERT_EQ(rhs.construct(6, 0), 0);
+
+    rhs.respect(lhs);
+
+    ASSERT_EQ(*(lhs.data() + 0u), 1u);
+    ASSERT_EQ(*(lhs.data() + 1u), 2u);
+    ASSERT_EQ(*(lhs.data() + 2u), 3u);
+    ASSERT_EQ(*(lhs.data() + 3u), 4u);
+    ASSERT_EQ(*(lhs.data() + 4u), 5u);
+
+    ASSERT_EQ(*(rhs.data() + 0u), 6u);
+    ASSERT_EQ(*(rhs.data() + 1u), 1u);
+    ASSERT_EQ(*(rhs.data() + 2u), 2u);
+    ASSERT_EQ(*(rhs.data() + 3u), 3u);
+    ASSERT_EQ(*(rhs.data() + 4u), 4u);
+    ASSERT_EQ(*(rhs.data() + 5u), 5u);
+
+    lhs.reset();
+    rhs.reset();
+}
+
+TEST(SparseSetWithType, RespectUnordered) {
+    using SparseSet = entt::SparseSet<unsigned int, int>;
+
+    SparseSet lhs;
+    SparseSet rhs;
+
+    ASSERT_EQ(lhs.construct(1, 0), 0);
+    ASSERT_EQ(lhs.construct(2, 0), 0);
+    ASSERT_EQ(lhs.construct(3, 0), 0);
+    ASSERT_EQ(lhs.construct(4, 0), 0);
+    ASSERT_EQ(lhs.construct(5, 0), 0);
+
+    ASSERT_EQ(rhs.construct(3, 0), 0);
+    ASSERT_EQ(rhs.construct(2, 0), 0);
+    ASSERT_EQ(rhs.construct(6, 0), 0);
+    ASSERT_EQ(rhs.construct(1, 0), 0);
+    ASSERT_EQ(rhs.construct(4, 0), 0);
+    ASSERT_EQ(rhs.construct(5, 0), 0);
+
+    rhs.respect(lhs);
+
+    ASSERT_EQ(*(lhs.data() + 0u), 1u);
+    ASSERT_EQ(*(lhs.data() + 1u), 2u);
+    ASSERT_EQ(*(lhs.data() + 2u), 3u);
+    ASSERT_EQ(*(lhs.data() + 3u), 4u);
+    ASSERT_EQ(*(lhs.data() + 4u), 5u);
+
+    ASSERT_EQ(*(rhs.data() + 0u), 6u);
+    ASSERT_EQ(*(rhs.data() + 1u), 1u);
+    ASSERT_EQ(*(rhs.data() + 2u), 2u);
+    ASSERT_EQ(*(rhs.data() + 3u), 3u);
+    ASSERT_EQ(*(rhs.data() + 4u), 4u);
+    ASSERT_EQ(*(rhs.data() + 5u), 5u);
+
+    lhs.reset();
+    rhs.reset();
 }