kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-29 08:13:08 +00:00
Code Issues Releases Wiki Activity

Simplify aspiration window calculation

Browse source 
It seems that we just need to look at previous score to
compute aspiration window size.

After 5350 games:
Mod vs Orig 800 - 803  - 3647 ELO +0 (+- 5.2)

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-12-07 17:51:02 +01:00
parent 4e59c5c274
commit 96213689e4
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/search.cpp
View file

@ -425,9 +425,8 @@ namespace {
Move id_loop(Position& pos, Move* ponderMove) {
Stack ss[PLY_MAX_PLUS_2];
Value bestValues[PLY_MAX_PLUS_2];
int bestMoveChanges[PLY_MAX_PLUS_2];
int depth, aspirationDelta;
int depth, delta;
Value bestValue, alpha, beta;
Move bestMove, skillBest, skillPonder;
bool bestMoveNeverChanged = true;
@ -437,7 +436,7 @@ namespace {
H.clear();
RootMoves.clear();
*ponderMove = bestMove = skillBest = skillPonder = MOVE_NONE;
depth = aspirationDelta = 0;
depth = delta = 0;
bestValue = alpha = -VALUE_INFINITE, beta = VALUE_INFINITE;
ss->currentMove = MOVE_NULL; // Hack to skip update gains
@ -467,17 +466,17 @@ namespace {
// MultiPV loop. We perform a full root search for each PV line
for (MultiPVIdx = 0; MultiPVIdx < std::min(MultiPV, RootMoves.size()); MultiPVIdx++)
{
// Calculate dynamic aspiration window based on previous iterations
if (depth >= 5 && abs(RootMoves[MultiPVIdx].prevScore) < VALUE_KNOWN_WIN)
// Calculate dynamic aspiration window based on previous iteration
if (depth >= 5 && abs(RootMoves[MultiPVIdx].score) < VALUE_KNOWN_WIN)
{
int prevDelta1 = bestValues[depth - 1] - bestValues[depth - 2];
int prevDelta2 = bestValues[depth - 2] - bestValues[depth - 3];
delta = abs(RootMoves[MultiPVIdx].score - RootMoves[MultiPVIdx].prevScore);
delta = std::min(std::max(delta, 16), 24);
delta = (delta + 7) / 8 * 8; // Round to match grainSize
aspirationDelta = std::min(std::max(abs(prevDelta1) + abs(prevDelta2) / 2, 16), 24);
aspirationDelta = (aspirationDelta + 7) / 8 * 8; // Round to match grainSize
alpha = RootMoves[MultiPVIdx].score - delta;
beta = RootMoves[MultiPVIdx].score + delta;
alpha = std::max(RootMoves[MultiPVIdx].prevScore - aspirationDelta, -VALUE_INFINITE);
beta = std::min(RootMoves[MultiPVIdx].prevScore + aspirationDelta, VALUE_INFINITE);
assert(alpha > -VALUE_INFINITE && beta < VALUE_INFINITE);
}
else
{
@ -545,16 +544,16 @@ namespace {
// research, otherwise exit the fail high/low loop.
if (bestValue >= beta)
{
beta = std::min(beta + aspirationDelta, VALUE_INFINITE);
aspirationDelta += aspirationDelta / 2;
beta = std::min(beta + delta, VALUE_INFINITE);
delta += delta / 2;
}
else if (bestValue <= alpha)
{
Signals.failedLowAtRoot = true;
Signals.stopOnPonderhit = false;
alpha = std::max(alpha - aspirationDelta, -VALUE_INFINITE);
aspirationDelta += aspirationDelta / 2;
alpha = std::max(alpha - delta, -VALUE_INFINITE);
delta += delta / 2;
}
else
break;
@ -564,7 +563,6 @@ namespace {
bestMove = RootMoves[0].pv[0];
*ponderMove = RootMoves[0].pv[1];
bestValues[depth] = bestValue;
bestMoveChanges[depth] = BestMoveChanges;
// Skills: Do we need to pick now the best and the ponder moves ?