Removed LogLevel being enum class

This commit is contained in:
2026-03-16 09:30:29 +02:00
parent 9a684ae93d
commit b8c21ebbde
4 changed files with 19 additions and 21 deletions

View File

@@ -16,7 +16,6 @@
#include "Corrade/Containers/Array.h" #include "Corrade/Containers/Array.h"
#include <algorithm> #include <algorithm>
#include <array>
#include <cmath> #include <cmath>
#include <cstddef> #include <cstddef>
#include <cstdint> #include <cstdint>
@@ -207,16 +206,17 @@ public:
} }
template <typename Key, template <typename Key,
typename OppositeKey = Concepts::OppositeOf<Key, AKey, BKey>, typename OppositeKey = Concepts::OppositeOf<Key, AKey, BKey>>
std::size_t keyCount>
requires Concepts::Either<Key, AKey, BKey> requires Concepts::Either<Key, AKey, BKey>
[[nodiscard("Discarding a very expensive query!")]] [[nodiscard("Discarding a very expensive query!")]]
std::vector<MultiQueryResult<OppositeKey>> std::vector<MultiQueryResult<OppositeKey>>
QueryWithAll(const Key (&keys)[keyCount]) { QueryWithAll(const Corrade::Containers::Array<Key> &keys) {
std::vector<MultiQueryResult<OppositeKey>> queryResult = std::vector<MultiQueryResult<OppositeKey>> queryResult =
queryWithMany<Key>(keys); queryWithMany<Key>(keys);
std::erase_if(queryResult, std::erase_if(queryResult,
[](const MultiQueryResult<OppositeKey> &queryRecord) { [keyCount = keys.size()](
const MultiQueryResult<OppositeKey> &queryRecord) {
return queryRecord.howManyFound != keyCount; return queryRecord.howManyFound != keyCount;
}); });
return queryResult; return queryResult;
@@ -270,14 +270,14 @@ private:
// Interal querying // Interal querying
template <typename Key, template <typename Key,
typename OppositeKey = Concepts::OppositeOf<Key, AKey, BKey>, typename OppositeKey = Concepts::OppositeOf<Key, AKey, BKey>>
std::size_t keyCount>
inline std::vector<MultiQueryResult<OppositeKey>> inline std::vector<MultiQueryResult<OppositeKey>>
queryWithMany(const Key (&keys)[keyCount]) { queryWithMany(const Corrade::Containers::Array<Key> &keys) {
constexpr bool searchingInFirstKey = std::is_same_v<Key, AKey>; constexpr bool searchingInFirstKey = std::is_same_v<Key, AKey>;
std::size_t keyCount = keys.size();
// I really can't wait for C++26 contracts // I really can't wait for C++26 contracts
if constexpr (keyCount == 0) { if (keyCount == 0) {
Systems::Logging::Log("Failed to Query! QueryWithAll require at least 2 " Systems::Logging::Log("Failed to Query! QueryWithAll require at least 2 "
"key to be given, zero was given! Terminating", "key to be given, zero was given! Terminating",
"Dualkey Map", "Dualkey Map",
@@ -285,7 +285,7 @@ private:
} }
// Hoping this never ever gets triggered :sigh: // Hoping this never ever gets triggered :sigh:
if constexpr (keyCount == 1) { if (keyCount == 1) {
Systems::Logging::Log("QueryWithAll should not be used for single key " Systems::Logging::Log("QueryWithAll should not be used for single key "
"entry! Please use Query for this instead.", "entry! Please use Query for this instead.",
"Dualkey Map", Systems::Logging::LogLevel::Error); "Dualkey Map", Systems::Logging::LogLevel::Error);
@@ -293,7 +293,7 @@ private:
// While we don't necessary need the hashes, // While we don't necessary need the hashes,
// it just helps us tremendously benefit from short circuit checks // it just helps us tremendously benefit from short circuit checks
std::array<std::size_t, keyCount> keyHashes; Corrade::Containers::Array<std::size_t> keyHashes{keyCount};
for (uint64_t index = 0; index < keyCount; index++) { for (uint64_t index = 0; index < keyCount; index++) {
keyHashes[index] = std::hash<Key>{}(keys[index]); keyHashes[index] = std::hash<Key>{}(keys[index]);
} }

View File

@@ -34,8 +34,7 @@ public:
if (!storage[keyHashPosition].empty()) { if (!storage[keyHashPosition].empty()) {
// Throws // Throws
Systems::Logging::Log("Trying to insert the same key twice! Throwing...", Systems::Logging::Log("Trying to insert the same key twice! Throwing...",
"Hashmap", Systems::Logging::LogLevel::Error, "Hashmap", Systems::Logging::Error, Has(key));
Has(key));
} else { } else {
storage[keyHashPosition].reserve(Options.reservedBucketSpace); storage[keyHashPosition].reserve(Options.reservedBucketSpace);
} }
@@ -51,7 +50,7 @@ public:
// Throws // Throws
Systems::Logging::Log("Trying to remove a non-existant key! Throwing...", Systems::Logging::Log("Trying to remove a non-existant key! Throwing...",
"Hashmap", Systems::Logging::LogLevel::Error, "Hashmap", Systems::Logging::Error,
storage[keyHashPosition].empty()); storage[keyHashPosition].empty());
std::erase_if(storage[keyHashPosition], std::erase_if(storage[keyHashPosition],
[keyHash, &key](const hashStorage &hash) { [keyHash, &key](const hashStorage &hash) {
@@ -90,8 +89,7 @@ public:
Systems::Logging::Log( Systems::Logging::Log(
"Trying to access a non-existant bucket for a key! Throwing...", "Trying to access a non-existant bucket for a key! Throwing...",
"Hashmap", Systems::Logging::LogLevel::Error, "Hashmap", Systems::Logging::Error, storage[keyHashPosition].empty());
storage[keyHashPosition].empty());
for (hashStorage &hash : storage[keyHashPosition]) { for (hashStorage &hash : storage[keyHashPosition]) {
if (hash.hash == keyHash && hash.key == key) { if (hash.hash == keyHash && hash.key == key) {
@@ -100,7 +98,7 @@ public:
} }
Systems::Logging::Log("Trying to access a non-existant key! Throwing...", Systems::Logging::Log("Trying to access a non-existant key! Throwing...",
"Hashmap", Systems::Logging::LogLevel::Error); "Hashmap", Systems::Logging::Error);
throw; throw;
} }

View File

@@ -36,8 +36,8 @@ public:
private: private:
static std::fstream File; static std::fstream File;
static const char *LogLevelToColour[LogLevel::Trace + 1]; static const char *LogLevelToColour[Trace + 1];
static const char *LogLevelToString[LogLevel::Trace + 1]; static const char *LogLevelToString[Trace + 1];
}; };
} // namespace Tourmaline::Systems } // namespace Tourmaline::Systems
#endif #endif

View File

@@ -31,9 +31,9 @@ using namespace Corrade::Utility;
// This is what happens when it takes you 50 years to implement // This is what happens when it takes you 50 years to implement
// reflections to a language // reflections to a language
const char *Logging::LogLevelToColour[Logging::LogLevel::Trace + 1]{ const char *Logging::LogLevelToColour[Logging::Trace + 1]{
"[0;31m", "[0;91m", "[0;33m", "[0;37m", "[0;92m", "[0;36m"}; "[0;31m", "[0;91m", "[0;33m", "[0;37m", "[0;92m", "[0;36m"};
const char *Logging::LogLevelToString[Logging::LogLevel::Trace + 1]{ const char *Logging::LogLevelToString[Logging::Trace + 1]{
"Critical", "Error", "Warning", "Info", "Debug", "Trace"}; "Critical", "Error", "Warning", "Info", "Debug", "Trace"};
std::fstream Logging::File; std::fstream Logging::File;