HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-23 02:27:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use average complexity for time management

Browse Source 
This patch is a variant of the idea by locutus2 (https://tests.stockfishchess.org/tests/view/61e1f24cb1f9959fe5d88168) to adjust the total time depending on the average complexity of the position.

Passed STC
LLR: 2.94 (-2.94,2.94) <0.00,2.50>
Total: 39664 W: 10765 L: 10487 D: 18412
Ptnml(0-2): 162, 4213, 10837, 4425, 195
https://tests.stockfishchess.org/tests/view/61e2df8b65a644da8c9ea708

Passed LTC
LLR: 2.94 (-2.94,2.94) <0.50,3.00>
Total: 127656 W: 34505 L: 34028 D: 59123
Ptnml(0-2): 116, 12435, 38261, 12888, 128
https://tests.stockfishchess.org/tests/view/61e31db5babab931824dff5e

closes https://github.com/official-stockfish/Stockfish/pull/3892

Bench: 4464962
This commit is contained in:
Rui Coelho
2022-01-17 16:51:20 +00:00
committed by Joost VandeVondele
parent d11101e4c6
commit 2b0372319d
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/misc.h
View File

@@ -105,6 +105,9 @@ class RunningAverage {
bool is_greater(int64_t a, int64_t b) bool is_greater(int64_t a, int64_t b)
{ return b * average > a * PERIOD * RESOLUTION ; } { return b * average > a * PERIOD * RESOLUTION ; }
int64_t value()
{ return average / (PERIOD * RESOLUTION); }
private : private :
static constexpr int64_t PERIOD = 4096; static constexpr int64_t PERIOD = 4096;
static constexpr int64_t RESOLUTION = 1024; static constexpr int64_t RESOLUTION = 1024;

8
src/search.cpp
View File

@@ -329,6 +329,7 @@ void Thread::search() {
doubleExtensionAverage[WHITE].set(0, 100); // initialize the running average at 0% doubleExtensionAverage[WHITE].set(0, 100); // initialize the running average at 0%
doubleExtensionAverage[BLACK].set(0, 100); // initialize the running average at 0% doubleExtensionAverage[BLACK].set(0, 100); // initialize the running average at 0%
complexityAverage.set(232, 1);
nodesLastExplosive = nodes; nodesLastExplosive = nodes;
nodesLastNormal = nodes; nodesLastNormal = nodes;
@@ -496,7 +497,10 @@ void Thread::search() {
double reduction = (1.47 + mainThread->previousTimeReduction) / (2.32 * timeReduction); double reduction = (1.47 + mainThread->previousTimeReduction) / (2.32 * timeReduction);
double bestMoveInstability = 1.073 + std::max(1.0, 2.25 - 9.9 / rootDepth) double bestMoveInstability = 1.073 + std::max(1.0, 2.25 - 9.9 / rootDepth)
* totBestMoveChanges / Threads.size(); * totBestMoveChanges / Threads.size();
double totalTime = Time.optimum() * fallingEval * reduction * bestMoveInstability; int complexity = mainThread->complexityAverage.value();
double complexPosition = std::clamp(1.0 + (complexity - 232) / 1750.0, 0.5, 1.5);
double totalTime = Time.optimum() * fallingEval * reduction * bestMoveInstability * complexPosition;
// Cap used time in case of a single legal move for a better viewer experience in tournaments // Cap used time in case of a single legal move for a better viewer experience in tournaments
// yielding correct scores and sufficiently fast moves. // yielding correct scores and sufficiently fast moves.
@@ -806,6 +810,8 @@ namespace {
improving = improvement > 0; improving = improvement > 0;
complexity = abs(ss->staticEval - (us == WHITE ? eg_value(pos.psq_score()) : -eg_value(pos.psq_score()))); complexity = abs(ss->staticEval - (us == WHITE ? eg_value(pos.psq_score()) : -eg_value(pos.psq_score())));
thisThread->complexityAverage.update(complexity);
// Step 7. Futility pruning: child node (~25 Elo). // Step 7. Futility pruning: child node (~25 Elo).
// The depth condition is important for mate finding. // The depth condition is important for mate finding.
if ( !ss->ttPv if ( !ss->ttPv

1
src/thread.h
View File

@@ -61,6 +61,7 @@ public:
Material::Table materialTable; Material::Table materialTable;
size_t pvIdx, pvLast; size_t pvIdx, pvLast;
RunningAverage doubleExtensionAverage[COLOR_NB]; RunningAverage doubleExtensionAverage[COLOR_NB];
RunningAverage complexityAverage;
uint64_t nodesLastExplosive; uint64_t nodesLastExplosive;
uint64_t nodesLastNormal; uint64_t nodesLastNormal;
std::atomic<uint64_t> nodes, tbHits, bestMoveChanges; std::atomic<uint64_t> nodes, tbHits, bestMoveChanges;