Cmake complains about line lenght, sigh

Added Insert and replaced operator[] with Query for clarity, still need to add a delete(and subsequently a tombstoning mechanism)

CMakeLists.txt

@@ -17,7 +17,6 @@ endif()
 
 include(GNUInstallDirs)
 
-include_directories(headers)
 add_library(${PROJECT_NAME} SHARED
             "source/Systems/ECS/Component.cpp"
             "source/Systems/ECS/World.cpp"
@@ -29,11 +28,21 @@ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
 
 # Nothing to link right now
 target_link_libraries(${PROJECT_NAME})
+target_include_directories(${PROJECT_NAME}
+  PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/headers>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/>
+    $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
+)
 
 install(
   TARGETS ${PROJECT_NAME}
   EXPORT ${PROJECT_NAME}Targets
   LIBRARY DESTINATION lib
   ARCHIVE DESTINATION lib
-  RUNTIME DESTINATION bin)
+  INCLUDES DESTINATION include
+)
+
 install(DIRECTORY headers/ DESTINATION include/${PROJECT_NAME})
+install(DIRECTORY ${PROJECT_NAME}External/ DESTINATION
+        include/${PROJECT_NAME}External)

headers/Containers/DualkeyMap.hpp

@@ -11,70 +11,89 @@
 #include "../Systems/Logging.hpp"
 #include "Hashing.hpp"
 
+#include <cmath>
 #include <cstddef>
 #include <cstdint>
 #include <functional>
 #include <optional>
-#include <span>
 #include <utility>
 #include <variant>
 #include <vector>
 
 namespace Tourmaline::Containers {
 template <Hashable AKey, Hashable BKey, typename Value,
-          uint64_t baseReservation = 1024,
-          float reservationGrowthExponent = 1.5>
+          uint64_t baseReservation = 2048>
 class DualkeyMap {
-  DualkeyMap() { HashList.reserve(baseReservation); }
+public:
+  using ResultPair =
+      std::pair<std::variant<std::monostate, std::reference_wrapper<AKey>,
+                             std::reference_wrapper<BKey>>,
+                Value &>;
 
+  DualkeyMap() { HashList.reserve(baseReservation); }
   ~DualkeyMap() {
     // I'm sure there is a better way to do this
-    for (DualkeyHash hash : HashList) {
-      delete hash.Apointer;
-      delete hash.Bpointer;
-      delete hash.ValuePointer;
+    for (DualkeyHash *hash : HashList) {
+      delete hash;
     }
   }
 
-  std::span<std::pair<std::variant<std::monostate, AKey &, BKey &>, Value &>>
-  operator[](std::optional<AKey> FirstKey, std::optional<BKey> SecondKey) {
-    bool isFirstKeyGiven = FirstKey.has_value();
-    bool isSecondKeyGiven = SecondKey.has_value();
+  // Insertion
+  void Insert(AKey firstKey, BKey secondKey, Value value) {
+    std::size_t firstKeyHash = std::hash<AKey>{}(firstKey);
+    std::size_t secondKeyHash = std::hash<BKey>{}(secondKey);
+    HashList.push_back(new DualkeyHash(firstKeyHash, std::move(firstKey),
+                                       secondKeyHash, std::move(secondKey),
+                                       std::move(value)));
+  }
+
+  // Indexing
+  std::vector<ResultPair> Query(std::optional<AKey> firstKey,
+                                std::optional<BKey> secondKey) {
+    bool isFirstKeyGiven = firstKey.has_value();
+    bool isSecondKeyGiven = secondKey.has_value();
 
     if (!isFirstKeyGiven && !isSecondKeyGiven) [[unlikely]] {
       Systems::Logging::Log("Failed to index! Dualkey maps require at least 1 "
-                            "key to be given, returning an empty span.",
+                            "key to be given, returning an empty vector.",
                             "Dualkey Map", Systems::Logging::LogLevel::Warning);
       return {};
     }
     std::size_t firstKeyHash =
-        isFirstKeyGiven ? std::hash<AKey>{}(*FirstKey.value()) : 0;
+        isFirstKeyGiven ? std::hash<AKey>{}(firstKey.value()) : 0;
     std::size_t secondKeyHash =
-        isSecondKeyGiven ? std::hash<BKey>{}(*SecondKey.value()) : 0;
+        isSecondKeyGiven ? std::hash<BKey>{}(secondKey.value()) : 0;
 
-    std::vector<
-        std::pair<std::variant<std::monostate, AKey &, BKey &>, Value &>>
-        finishedQuery{};
+    std::vector<ResultPair> finishedQuery{};
 
     uint8_t stateOfIndexing = isFirstKeyGiven + (isSecondKeyGiven << 1);
-    for (DualkeyHash hash : HashList) {
+    // Putting hash checks first to benefit from short circuits
+    for (DualkeyHash *hash : HashList) {
       switch (stateOfIndexing) {
       case 1: // Only first key is given
-        if (firstKeyHash == hash.AKeyHash) {
-          finishedQuery.emplace_back(hash.BPointer, hash.ValuePointer);
+        if (firstKeyHash == hash->firstKeyHash &&
+            firstKey.value() == hash->firstKey) {
+          finishedQuery.emplace_back(
+              std::reference_wrapper<BKey>{hash->secondKey}, hash->value);
         }
         continue;
       case 2: // Only second key is given
-        if (secondKeyHash == hash.BKeyHash) {
-          finishedQuery.emplace_back(hash.APointer, hash.ValuePointer);
+        if (secondKeyHash == hash->secondKeyHash &&
+            secondKey.value() == hash->secondKey) {
+          finishedQuery.emplace_back(
+              std::reference_wrapper<AKey>{hash->firstKey}, hash->value);
         }
         continue;
       case 3: // Both are given
-        if (firstKeyHash == hash.AKeyHash && secondKeyHash == hash.BKeyHash) {
-          finishedQuery.emplace_back(std::monostate{}, hash.ValuePointer);
-        }
+        if (firstKeyHash == hash->firstKeyHash &&
+            secondKeyHash == hash->secondKeyHash &&
+            firstKey.value() == hash->firstKey &&
+            secondKey.value() == hash->secondKey) {
+          finishedQuery.emplace_back(std::monostate{}, hash->value);
           break;
         }
+        continue;
+      }
       break;
     }
 
@@ -90,18 +109,21 @@ class DualkeyMap {
 
 private:
   struct DualkeyHash {
-    DualkeyHash(std::size_t AHash, AKey *APointer, std::size_t BHash,
-                BKey *BPointer)
-        : AKeyHash(AHash), APointer(APointer), BKeyHash(BHash),
-          BPointer(BPointer) {}
-    std::size_t AKeyHash = 0;
-    std::size_t BKeyHash = 0;
-    AKey *APointer;
-    BKey *BPointer;
-    Value *ValuePointer;
+    DualkeyHash(std::size_t firstKeyHash, AKey &&firstKey,
+                std::size_t secondKeyHash, BKey &&secondKey, Value &&value)
+        : firstKeyHash(firstKeyHash), firstKey(std::move(firstKey)),
+          secondKeyHash(secondKeyHash), secondKey(std::move(secondKey)),
+          value(std::move(value)) {}
+
+    std::size_t firstKeyHash = 0;
+    std::size_t secondKeyHash = 0;
+    AKey firstKey;
+    BKey secondKey;
+    Value value;
   };
 
-  std::vector<DualkeyHash> HashList;
+  // It makes more sense to store the individual hash
+  std::vector<DualkeyHash *> HashList;
 };
 } // namespace Tourmaline::Containers
 #endif

headers/Containers/Hashing.hpp

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

headers/Systems/Random.hpp

@@ -9,8 +9,9 @@
 
 #ifndef GUARD_TOURMALINE_RANDOM_H
 #define GUARD_TOURMALINE_RANDOM_H
-#include "../../libraries/random/xoshiro.h"
 #include "../Types.hpp"
+#include <TourmalineExternal/random/xoshiro.h>
+
 #include <type_traits>
 
 namespace Tourmaline::Systems {

source/Systems/ECS/Component.cpp

@@ -7,7 +7,7 @@
  * obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../../headers/Systems/ECS.hpp"
+#include <Systems/ECS.hpp>
 
 using namespace Tourmaline::Systems::ECS;
 

source/Systems/ECS/World.cpp

@@ -7,8 +7,8 @@
  * obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../../headers/Systems/ECS.hpp"
-#include "../../../headers/Systems/Random.hpp"
+#include <Systems/ECS.hpp>
+#include <Systems/Random.hpp>
 
 using namespace Tourmaline::Systems::ECS;
 

source/Systems/Logging.cpp

@@ -7,7 +7,7 @@
  * obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../headers/Systems/Logging.hpp"
+#include <Systems/Logging.hpp>
 
 #include <cerrno>
 #include <chrono>

source/Systems/Random.cpp

@@ -6,7 +6,7 @@
  * v. 2.0. If a copy of the MPL was not distributed with this file, You can
  * obtain one at http://mozilla.org/MPL/2.0/.
  */
-#include "../../headers/Systems/Random.hpp"
+#include <Systems/Random.hpp>
 
 #include <bit>
 #include <cstdint>

source/Types/UUID.cpp

@@ -7,7 +7,7 @@
  * obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "../../headers/Types.hpp"
+#include <Types.hpp>
 
 #include <charconv>
 #include <cstdint>