output randomly put opening before searching

dhbloo · Oct 7, 2024 · fac00cf · fac00cf
1 parent 8006cd1
commit fac00cf
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 19 deletions.
diff --git a/Rapfi/command/opengen.cpp b/Rapfi/command/opengen.cpp
@@ -42,15 +42,17 @@ void Command::opengen(int argc, char *argv[])
     std::ofstream             outfile;
 
     cxxopts::Options options("rapfi opengen");
-    options.add_options()                                                                       //
-        ("n,number", "Number of openings to generate", cxxopts::value<size_t>())                //
-        ("o,output", "Save openings to a text file", cxxopts::value<std::string>())             //
-        ("s,boardsize", "Size of board in [5,22]", cxxopts::value<int>()->default_value("15"))  //
+    options.add_options()                                                         //
+        ("n,number", "Number of openings to generate", cxxopts::value<size_t>())  //
+        ("o,output",
+         "Save openings to a text file (default to stdout if not specified)",
+         cxxopts::value<std::string>())                                                         //
+        ("s,boardsize", "Board size in [5,22]", cxxopts::value<int>()->default_value("15"))  //
         ("r,rule",
          "One of [freestyle, standard, renju] rule",
          cxxopts::value<std::string>()->default_value("freestyle"))  //
         ("t,thread",
-         "Number of search threads to use",
+         "Number of search threads to use for searching balanced moves",
          cxxopts::value<size_t>()->default_value(std::to_string(Config::DefaultThreadNum)))  //
         ("hashsize",
          "Hash size of the transposition table (in MB)",

diff --git a/Rapfi/search/opening.cpp b/Rapfi/search/opening.cpp
@@ -18,6 +18,7 @@
 
 #include "opening.h"
 
+#include "../core/iohelper.h"
 #include "../game/board.h"
 #include "search.h"
 #include "searchthread.h"
@@ -308,21 +309,27 @@ bool OpeningGenerator::next()
 {
     board.newGame(rule);
 
-    // Pick a random move count and area
-    int numMoves =
-        numMoveChoices[std::uniform_int_distribution<size_t>(0, numMoveChoices.size() - 1)(prng)];
-    int areaSize = std::uniform_int_distribution<>(config.localSizeMin, config.localSizeMax)(prng);
-    int x0       = std::uniform_int_distribution<>(0, board.size() - 1 - areaSize)(prng);
-    int y0       = std::uniform_int_distribution<>(0, board.size() - 1 - areaSize)(prng);
+    // Pick a random move count
+    bool findBalancedMove = config.balance1Nodes || config.balance2Nodes;
+    int  idx              = std::uniform_int_distribution<int>(0, numMoveChoices.size() - 1)(prng);
+    int  numMoves         = numMoveChoices[idx];
 
     // Spare two moves for balanced position (if available)
-    int numRandomMoves = std::max(numMoves - bool(config.balance1Nodes || config.balance2Nodes), 0);
+    int numRandomMoves = std::max(numMoves - findBalancedMove, 0);
     if (numRandomMoves > 0) {
         // Put random moves on board
+        int areaSize =
+            std::uniform_int_distribution<>(config.localSizeMin, config.localSizeMax)(prng);
+        int x0 = std::uniform_int_distribution<>(0, board.size() - 1 - areaSize)(prng);
+        int y0 = std::uniform_int_distribution<>(0, board.size() - 1 - areaSize)(prng);
+
         CandArea area(x0, y0, x0 + areaSize, y0 + areaSize);
         putRandomMoves(numRandomMoves, area);
     }
 
+    if (!findBalancedMove)
+        return false;
+
     // For empty board, randomly make a part of the whole board as move condidate
     if (board.ply() == 0)
         board.expandCandArea(
@@ -331,12 +338,19 @@ bool OpeningGenerator::next()
             0);
 
     // First try to put balance1 move, if that fails, try balance2
-    if (config.balance1Nodes && putBalance1Move())
-        return true;
+    if (config.balance1Nodes) {
+        if (Config::MessageMode != MsgMode::NONE)
+            MESSAGEL("Searching balanced1 for opening " << board.positionString());
+        if (putBalance1Move())
+            return true;
+    }
 
     if (config.balance2Nodes && board.ply() > 2) {
         board.undo(rule);  // undo the move put by balance1
         board.undo(rule);  // undo one random move
+
+        if (Config::MessageMode != MsgMode::NONE)
+            MESSAGEL("Searching balanced2 for opening " << board.positionString());
         if (putBalance2Move())
             return true;
     }
@@ -351,19 +365,29 @@ bool OpeningGenerator::next()
 ///     of random moves, the actual moves put will be the size of that area.
 void OpeningGenerator::putRandomMoves(int numMoves, CandArea area)
 {
+    // Collect all candidate moves in the area and shuffle them
     std::vector<Pos> randomMoves;
     FOR_EVERY_CANDAREA_POS(&board, pos, area)
     {
         randomMoves.push_back(pos);
     }
-
     std::shuffle(randomMoves.begin(), randomMoves.end(), prng);
 
-    if (randomMoves.size() > numMoves)
-        randomMoves.resize(numMoves);
-
-    for (Pos pos : randomMoves)
+    int count = 0;
+    for (Pos pos : randomMoves) {
         board.move(rule, pos);
+
+        // Make sure we do not accidentally put a winning move
+        if (board.p4Count(board.sideToMove(), A_FIVE) || board.p4Count(board.sideToMove(), B_FLEX4)
+            || board.p4Count(board.sideToMove(), C_BLOCK4_FLEX3)) {
+            board.undo(rule);
+        }
+        else {
+            count++;
+            if (count >= numMoves)
+                break;
+        }
+    }
 }
 
 /// Put one move to make a balanced opening.