cat/Tourmaline-Engine
1
1
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Added ::Entry for returning references upon insertion

Browse Source 
Additionally fixed a minor mistake on hashable concept
This commit is contained in:
Dora
2026-01-28 13:32:09 +02:00
parent c458062f72
commit 6aaf0c6101
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
headers/Containers/DualkeyMap.hpp
View File

@@ -17,6 +17,7 @@
#include <functional> #include <functional>
#include <optional> #include <optional>
#include <queue> #include <queue>
#include <tuple>
#include <utility> #include <utility>
#include <variant> #include <variant>
#include <vector> #include <vector>
@@ -30,6 +31,7 @@ public:
std::pair<std::variant<std::monostate, std::reference_wrapper<const AKey>, std::pair<std::variant<std::monostate, std::reference_wrapper<const AKey>,
std::reference_wrapper<const BKey>>, std::reference_wrapper<const BKey>>,
Value &>; Value &>;
using Entry = std::tuple<const AKey &, const BKey &, Value &>;
DualkeyMap() { hashList.reserve(baseReservation); } DualkeyMap() { hashList.reserve(baseReservation); }
~DualkeyMap() { ~DualkeyMap() {
@@ -41,7 +43,7 @@ public:
} }
} }
void insert(AKey firstKey, BKey secondKey, Value value) { Entry insert(AKey firstKey, BKey secondKey, Value value) {
std::size_t firstKeyHash = std::hash<AKey>{}(firstKey); std::size_t firstKeyHash = std::hash<AKey>{}(firstKey);
std::size_t secondKeyHash = std::hash<BKey>{}(secondKey); std::size_t secondKeyHash = std::hash<BKey>{}(secondKey);
DualkeyHash *hash = DualkeyHash *hash =
@@ -55,6 +57,8 @@ public:
graveyard.pop(); graveyard.pop();
hashList[tombstone] = hash; hashList[tombstone] = hash;
} }
return {hash->firstKey, hash->secondKey, hash->value};
} }
std::size_t remove(std::optional<AKey> firstKey, std::size_t remove(std::optional<AKey> firstKey,
@@ -192,8 +196,8 @@ private:
struct DualkeyHash { struct DualkeyHash {
DualkeyHash(std::size_t firstKeyHash, AKey &&firstKey, DualkeyHash(std::size_t firstKeyHash, AKey &&firstKey,
std::size_t secondKeyHash, BKey &&secondKey, Value &&value) std::size_t secondKeyHash, BKey &&secondKey, Value &&value)
: firstKeyHash(firstKeyHash), firstKey(std::move(firstKey)), : firstKeyHash(firstKeyHash), secondKeyHash(secondKeyHash),
secondKeyHash(secondKeyHash), secondKey(std::move(secondKey)), firstKey(std::move(firstKey)), secondKey(std::move(secondKey)),
value(std::move(value)) {} value(std::move(value)) {}
std::size_t firstKeyHash = 0; std::size_t firstKeyHash = 0;

3
headers/Containers/Hashing.hpp
View File

@@ -14,8 +14,7 @@
namespace Tourmaline::Containers { namespace Tourmaline::Containers {
template <typename T> template <typename T>
concept Hashable = requires(T x) { concept Hashable = std::equality_comparable<T> && requires(T x) {
std::equality_comparable<T>;
{ std::hash<T>{}(x) } -> std::convertible_to<std::size_t>; { std::hash<T>{}(x) } -> std::convertible_to<std::size_t>;
}; };
} // namespace Tourmaline::Containers } // namespace Tourmaline::Containers