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

Hashmap added checking for insertion and fixed remove

Browse Source
This commit is contained in:
Dora
2026-03-02 03:55:23 +02:00
parent 2326ddfee7
commit 07c9ed49c7
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
headers/Containers/Hashmap.hpp
View File

@@ -1,4 +1,3 @@
/* /*
* SPDX-FileCopyrightText: Dora "cat" <cat@thenight.club> * SPDX-FileCopyrightText: Dora "cat" <cat@thenight.club>
* SPDX-License-Identifier: MPL-2.0 * SPDX-License-Identifier: MPL-2.0
@@ -16,22 +15,31 @@
#include <vector> #include <vector>
namespace Tourmaline::Containers { namespace Tourmaline::Containers {
template <Concepts::Hashable Key, typename Value, template <Concepts::Hashable Key, typename Value, float maxLoadFactor = 0.75f,
std::size_t baseBucketCount = 1024> std::size_t baseBucketCount = 1024>
class Hashmap { class Hashmap {
public: public:
Hashmap() { storage.resize(baseBucketCount); } Hashmap() { storage.resize(baseBucketCount); }
~Hashmap() { Clear(); } ~Hashmap() { Clear(); }
void Insert(Key key, Value value) { Value &Insert(Key key, Value value) {
std::size_t keyHash = std::hash<Key>{}(key), std::size_t keyHash = std::hash<Key>{}(key),
keyHashPosition = keyHash % storage.size(); keyHashPosition = keyHash % storage.size();
// Empty bucket // Empty bucket
if (storage[keyHashPosition] == nullptr) { if (storage[keyHashPosition] == nullptr) {
storage[keyHashPosition] = new std::vector<hashStorage>; storage[keyHashPosition] = new std::vector<hashStorage>;
storage[keyHashPosition]->emplace_back(key, std::move(value), keyHash);
return storage[keyHashPosition]->back().value;
} }
storage[keyHashPosition]->emplace_back(keyHash, key, std::move(value));
// Throws
Systems::Logging::Log("Trying to inserting same key twice! Throwing...",
"Hashmap", Systems::Logging::LogLevel::Error,
Has(key));
storage[keyHashPosition]->emplace_back(key, std::move(value), keyHash);
return storage[keyHashPosition]->back().value;
} }
void Remove(const Key &key) { void Remove(const Key &key) {
@@ -43,7 +51,7 @@ public:
"Hashmap", Systems::Logging::LogLevel::Error, "Hashmap", Systems::Logging::LogLevel::Error,
storage[keyHashPosition] == nullptr); storage[keyHashPosition] == nullptr);
std::erase_if(*storage[keyHashPosition], std::erase_if(*storage[keyHashPosition],
[key, keyHash](const hashStorage &hash) { [keyHash, &key](const hashStorage &hash) {
return hash.hash == keyHash && hash.key == key; return hash.hash == keyHash && hash.key == key;
}); });
} }
@@ -75,7 +83,7 @@ public:
"Hashmap", Systems::Logging::LogLevel::Error, "Hashmap", Systems::Logging::LogLevel::Error,
storage[keyHashPosition] == nullptr); storage[keyHashPosition] == nullptr);
for (const hashStorage &hash : *storage[keyHashPosition]) { for (hashStorage &hash : *storage[keyHashPosition]) {
if (hash.hash == keyHash && hash.key == key) { if (hash.hash == keyHash && hash.key == key) {
return hash.value; return hash.value;
} }
@@ -98,9 +106,9 @@ public:
private: private:
struct hashStorage { struct hashStorage {
const std::size_t hash; Key key;
const Key key; Value value;
mutable Value value; std::size_t hash;
}; };
using bucket = std::vector<hashStorage>; using bucket = std::vector<hashStorage>;