Merge branch 'MathIsFun0:cpp-rewrite' into cpp-rewrite

Author: ar664

CMakeLists.txt

@@ -27,7 +27,7 @@ set(EXECUTABLE_SOURCES
 if(MSVC)
     set(OPTIMIZATION_FLAGS "/Ox")  # Full optimization for MSVC
 else()
-    set(OPTIMIZATION_FLAGS "-O3 -g -std=c++17 -Wall -Wextra -Wpedantic -Wno-c++17-extensions")  # Full optimization for GCC/Clang, plus debugging info
+    set(OPTIMIZATION_FLAGS "-O3 -g -std=c++20 -Wall -Wextra -Wpedantic -Wno-c++17-extensions -gdwarf-3 -ldl")  # Full optimization for GCC/Clang, plus debugging info
 endif()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPTIMIZATION_FLAGS}")

README.md

@@ -50,12 +50,8 @@ cmake --build build --config Release
 ```
 
 ## Future Plans
+- SIMD
 - CLI
 - custom filters with JSON
 - add all unimplemented sources
-- compatibility with modded items?
-
-## TODO Optimizations
-- Thanks to @Tacodiva for alerting me to some of these
-- searching: don't reinitialize instances, don't reconvert int to string, allocate heap memory beforehand, allocate seeds better [use recursive approach to precompute hashes]
-- pseudohash: cache multiples of pi, optimize first step without dividing by num?
+- compatibility with modded items?

build.sh

@@ -35,21 +35,22 @@ struct InstParams {
 
 struct Instance {
   bool locked[(int)Item::ITEMS_END] = {false};
-  Seed& seed;
+  Seed &seed;
   double hashedSeed;
   Cache cache;
   InstParams params;
   LuaRandom rng;
-  Instance(Seed& s) : seed(s) {
+  Instance(Seed &s) : seed(s) {
     hashedSeed = s.pseudohash(0);
     params = InstParams();
     rng = LuaRandom(0);
   };
-  void reset(Seed& s) { // This is slow, use next() unless necessary
+  void reset(Seed &s) { // This is slow, use next() unless necessary
     seed = s;
     hashedSeed = s.pseudohash(0);
     params = InstParams();
-    cache.nodes.clear();
+    cache.nodes
+      .clear(); // Somehow `clear` is faster than swapping with empty map
     cache.generatedFirstPack = false;
   };
   void next() {

src/instance.hpp

@@ -157,6 +157,15 @@ long filter_negative_tag(Instance inst) {
   return score;
 }
 
+long filter_lucky(Instance inst) {
+  for (int i = 0; i < 7; i++) {
+    if (inst.random(RandomType::Lucky_Money) >= 1.0/15) {
+      return 0;
+    }
+  }
+  return 1;
+}
+
 long filter_suas_speedrun(Instance inst) {
   // First four cards in shop must include Mr. Bones, Merry Andy, and Luchador
   bool bones = false, andy = false, luchador = false;
@@ -190,9 +199,11 @@ long filter_suas_speedrun(Instance inst) {
 
 long filter_blank(Instance inst) { return 0; }
 
-// These won't be permanent filters, just ones I sub in and out while JSON filters aren't ready yet
+// These won't be permanent filters, just ones I sub in and out while JSON
+// filters aren't ready yet
 long filter_test(Instance inst) {
-  // Four Fingers, Shortcut, and Smeared Joker in first two antes (https://discord.com/channels/1325151824638120007/1326284714125955183)
+  // Four Fingers, Shortcut, and Smeared Joker in first two antes
+  // (https://discord.com/channels/1325151824638120007/1326284714125955183)
   bool fingers = false;
   bool shortcut = false;
   bool smeared = false;
@@ -245,7 +256,7 @@ void benchmark() {
   std::cout << "------LONGER TESTING------\n";
   std::cout << "Total time: " << end - start << "ms\n";
   std::cout << "Seeds per second: " << std::fixed << std::setprecision(0)
-             << 1000000000 / ((end - start) / 1000.0) << "\n";
+            << 1000000000 / ((end - start) / 1000.0) << "\n";
 }
 
 void benchmark_quick() {
@@ -260,10 +271,28 @@ void benchmark_quick() {
   long end = std::chrono::duration_cast<std::chrono::milliseconds>(
                  std::chrono::system_clock::now().time_since_epoch())
                  .count();
-   std::cout << "----PERKEO OBSERVATORY----\n";
-   std::cout << "Total time: " << end - start << "ms\n";
-   std::cout << "Seeds per second: " << std::fixed << std::setprecision(0)
-             << 100000000 / ((end - start) / 1000.0) << "\n";
+  std::cout << "----PERKEO OBSERVATORY----\n";
+  std::cout << "Total time: " << end - start << "ms\n";
+  std::cout << "Seeds per second: " << std::fixed << std::setprecision(0)
+            << 100000000 / ((end - start) / 1000.0) << "\n";
+}
+
+void benchmark_quick_lucky() {
+  long total = 0;
+  long start = std::chrono::duration_cast<std::chrono::milliseconds>(
+                   std::chrono::system_clock::now().time_since_epoch())
+                   .count();
+  Search search(filter_lucky, "IMMOLATE", 12, 100000000);
+  search.highScore = 10; // No output
+  search.printDelay = 100000000000;
+  search.search();
+  long end = std::chrono::duration_cast<std::chrono::milliseconds>(
+                 std::chrono::system_clock::now().time_since_epoch())
+                 .count();
+  std::cout << "-------LUCKY CARDS-------\n";
+  std::cout << "Total time: " << end - start << "ms\n";
+  std::cout << "Seeds per second: " << std::fixed << std::setprecision(0)
+            << 100000000 / ((end - start) / 1000.0) << "\n";
 }
 
 void benchmark_single() {
@@ -278,10 +307,10 @@ void benchmark_single() {
   long end = std::chrono::duration_cast<std::chrono::milliseconds>(
                  std::chrono::system_clock::now().time_since_epoch())
                  .count();
-   std::cout << "----SINGLE THREADED PO----\n";
-   std::cout << "Total time: " << end - start << "ms\n";
-   std::cout << "Seeds per second: " << std::fixed << std::setprecision(0)
-             << 10000000 / ((end - start) / 1000.0) << "\n";
+  std::cout << "----SINGLE THREADED PO----\n";
+  std::cout << "Total time: " << end - start << "ms\n";
+  std::cout << "Seeds per second: " << std::fixed << std::setprecision(0)
+            << 10000000 / ((end - start) / 1000.0) << "\n";
 }
 
 void benchmark_blank() {
@@ -301,14 +330,10 @@ void benchmark_blank() {
             << 100000000 / ((end - start) / 1000.0) << "\n";
 }
 
-void run_filter(std::function<int(Instance)> f) {
-  Search search(f, 12);
-  search.search();
-}
-
 int main() {
   benchmark_single();
   benchmark_quick();
+  benchmark_quick_lucky();
   benchmark_blank();
   benchmark();
   return 1;