kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-01 01:03:09 +00:00
Code Issues Releases Wiki Activity

Simplify search results update

Browse source 
Also some rename while there.

No functional change.
This commit is contained in:
Marco Costalba 2013-06-30 12:30:57 +02:00
parent 92dcbfa658
commit 4fc7734547
1 changed files with 30 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/search.cpp
View file

@ -491,7 +491,7 @@ namespace {
assert(PvNode || (alpha == beta - 1)); assert(PvNode || (alpha == beta - 1));
assert(depth > DEPTH_ZERO); assert(depth > DEPTH_ZERO);
Move movesSearched[64]; Move quietsSearched[64];
StateInfo st; StateInfo st;
const TTEntry *tte; const TTEntry *tte;
SplitPoint* splitPoint; SplitPoint* splitPoint;
@ -502,11 +502,11 @@ namespace {
Value eval, nullValue, futilityValue; Value eval, nullValue, futilityValue;
bool inCheck, givesCheck, pvMove, singularExtensionNode; bool inCheck, givesCheck, pvMove, singularExtensionNode;
bool captureOrPromotion, dangerous, doFullDepthSearch; bool captureOrPromotion, dangerous, doFullDepthSearch;
int moveCount, playedMoveCount; int moveCount, quietCount;
// Step 1. Initialize node // Step 1. Initialize node
Thread* thisThread = pos.this_thread(); Thread* thisThread = pos.this_thread();
moveCount = playedMoveCount = 0; moveCount = quietCount = 0;
inCheck = pos.checkers(); inCheck = pos.checkers();
if (SpNode) if (SpNode)
@ -926,8 +926,8 @@ split_point_start: // At split points actual search starts from here
pvMove = PvNode && moveCount == 1; pvMove = PvNode && moveCount == 1;
ss->currentMove = move; ss->currentMove = move;
if (!SpNode && !captureOrPromotion && playedMoveCount < 64) if (!SpNode && !captureOrPromotion && quietCount < 64)
movesSearched[playedMoveCount++] = move; quietsSearched[quietCount++] = move;
// Step 14. Make the move // Step 14. Make the move
pos.do_move(move, st, ci, givesCheck); pos.do_move(move, st, ci, givesCheck);
@ -1078,43 +1078,37 @@ split_point_start: // At split points actual search starts from here
// If we have pruned all the moves without searching return a fail-low score // If we have pruned all the moves without searching return a fail-low score
if (bestValue == -VALUE_INFINITE) if (bestValue == -VALUE_INFINITE)
{
assert(!playedMoveCount);
bestValue = alpha; bestValue = alpha;
}
if (bestValue >= beta) // Failed high TT.store(posKey, value_to_tt(bestValue, ss->ply),
bestValue >= beta ? BOUND_LOWER :
PvNode && bestMove ? BOUND_EXACT : BOUND_UPPER,
depth, bestMove, ss->staticEval, ss->evalMargin);
// Quiet best move: update killers, history and countermoves
if ( bestValue >= beta
&& !pos.is_capture_or_promotion(bestMove)
&& !inCheck)
{ {
TT.store(posKey, value_to_tt(bestValue, ss->ply), BOUND_LOWER, depth, if (ss->killers[0] != bestMove)
bestMove, ss->staticEval, ss->evalMargin);
if (!pos.is_capture_or_promotion(bestMove) && !inCheck)
{ {
if (bestMove != ss->killers[0]) ss->killers[1] = ss->killers[0];
{ ss->killers[0] = bestMove;
ss->killers[1] = ss->killers[0];
ss->killers[0] = bestMove;
}
// Increase history value of the cut-off move
Value bonus = Value(int(depth) * int(depth));
History.update(pos.piece_moved(bestMove), to_sq(bestMove), bonus);
if (is_ok((ss-1)->currentMove))
Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, bestMove);
// Decrease history of all the other played non-capture moves
for (int i = 0; i < playedMoveCount - 1; i++)
{
Move m = movesSearched[i];
History.update(pos.piece_moved(m), to_sq(m), -bonus);
}
} }
// Increase history value of the cut-off move and decrease all the other
// played non-capture moves.
Value bonus = Value(int(depth) * int(depth));
History.update(pos.piece_moved(bestMove), to_sq(bestMove), bonus);
for (int i = 0; i < quietCount - 1; i++)
{
Move m = quietsSearched[i];
History.update(pos.piece_moved(m), to_sq(m), -bonus);
}
if (is_ok((ss-1)->currentMove))
Countermoves.update(pos.piece_on(prevMoveSq), prevMoveSq, bestMove);
} }
else // Failed low or PV search
TT.store(posKey, value_to_tt(bestValue, ss->ply),
PvNode && bestMove != MOVE_NONE ? BOUND_EXACT : BOUND_UPPER,
depth, bestMove, ss->staticEval, ss->evalMargin);
assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE); assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE);