WiP

Author: slashdotted

CMakeLists.txt

@@ -36,6 +36,7 @@ add_executable(speed_test speed_test.cpp
     memento/mashtable.h
     jump/jumpengine.h
     power/powerengine.h
+    memento/mementoneshortcutengine.h
     )
 
 add_executable(balance balance.cpp
@@ -48,6 +49,7 @@ add_executable(balance balance.cpp
     memento/mashtable.h
     jump/jumpengine.h
     power/powerengine.h
+    memento/mementoneshortcutengine.h
     )
 
 add_executable(mashtable_test mashtable_test.cpp memento/mashtable.h)

balance.cpp

@@ -27,6 +27,7 @@
 #include "jump/jumpengine.h"
 #include "power/powerengine.h"
 #include "memento/mementoneengine.h"
+#include "memento/mementoneshortcutengine.h"
 #include <fmt/core.h>
 #include <fstream>
 #include <unordered_map>
@@ -217,6 +218,10 @@ int main(int argc, char *argv[]) {
       return bench<MementoneEngine<boost::unordered_flat_map>>(
           "Mementone<boost::unordered_flat_map>", filename, anchor_set, working_set,
           num_removals, num_keys);
+  } else if (algorithm == "mementoneshortcut") {
+      return bench<MementoneShortcutEngine>(
+          "MementoneShortcutEngine", filename, anchor_set, working_set,
+          num_removals, num_keys);
   } else {
     fmt::println("Unknown algorithm {}", algorithm);
     return 2;

memento/memento.h

@@ -92,7 +92,7 @@ class Memento final
      * the given bucket.
      *
      * @param bucket the bucket to search for
-     * @return the replacing bucket if any, {@code std::nullopt} otherwise
+     * @return the replacing bucket if any, {@code -1} otherwise
      */
     int32_t replacer(int32_t bucket ) const noexcept {
         auto e = m_table.find(bucket);

speed_test.cpp

@@ -20,6 +20,7 @@
 #include "jump/jumpengine.h"
 #include "power/powerengine.h"
 #include "memento/mementoneengine.h"
+#include "memento/mementoneshortcutengine.h"
 #ifdef USE_PCG32
 #include "pcg_random.hpp"
 #include <random>
@@ -297,7 +298,11 @@ int main(int argc, char *argv[]) {
       return bench<MementoneEngine<boost::unordered_flat_map>>(
           "Mementone<boost::unordered_flat_map>", filename, anchor_set, working_set,
           num_removals, num_keys);
-  } else {
+  }  else if (algorithm == "mementoneshortcut") {
+      return bench<MementoneShortcutEngine>(
+          "MementoneShortcutEngine", filename, anchor_set, working_set,
+          num_removals, num_keys);
+  }else {
     fmt::println("Unknown algorithm {}", algorithm);
     return 2;
   }