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

Unify best move update logic

Browse Source 
Try to rewrite the Root case using as most as common
code as possible.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba
2011-02-17 09:24:55 +01:00
parent 5815718177
commit 29fa6f3c5f
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/search.cpp
View File

@@ -1192,14 +1192,14 @@ split_point_start: // At split points actual search starts from here
alpha = sp->alpha; alpha = sp->alpha;
} }
if (!Root && value > bestValue && !(SpNode && ThreadsMgr.cutoff_at_splitpoint(threadID))) if (value > bestValue && !(SpNode && ThreadsMgr.cutoff_at_splitpoint(threadID)))
{ {
bestValue = value; bestValue = value;
if (SpNode) if (SpNode)
sp->bestValue = value; sp->bestValue = value;
if (value > alpha) if (!Root && value > alpha)
{ {
if (PvNode && value < beta) // We want always alpha < beta if (PvNode && value < beta) // We want always alpha < beta
{ {
@@ -1223,10 +1223,6 @@ split_point_start: // At split points actual search starts from here
if (Root) if (Root)
{ {
// To avoid to exit with bestValue == -VALUE_INFINITE
if (value > bestValue)
bestValue = value;
// Finished searching the move. If StopRequest is true, the search // Finished searching the move. If StopRequest is true, the search
// was aborted because the user interrupted the search or because we // was aborted because the user interrupted the search or because we
// ran out of time. In this case, the return value of the search cannot // ran out of time. In this case, the return value of the search cannot
@@ -1238,13 +1234,9 @@ split_point_start: // At split points actual search starts from here
// Remember searched nodes counts for this move // Remember searched nodes counts for this move
mp.rm->nodes += pos.nodes_searched() - nodes; mp.rm->nodes += pos.nodes_searched() - nodes;
// Step 17. Check for new best move // PV move or new best move ?
if (!isPvMove && value <= alpha) if (isPvMove || value > alpha)
mp.rm->pv_score = -VALUE_INFINITE;
else
{ {
// PV move or new best move!
// Update PV // Update PV
ss->bestMove = move; ss->bestMove = move;
mp.rm->pv_score = value; mp.rm->pv_score = value;
@@ -1264,9 +1256,11 @@ split_point_start: // At split points actual search starts from here
alpha = Rml[Min(moveCount, MultiPV) - 1].pv_score; // FIXME why moveCount? alpha = Rml[Min(moveCount, MultiPV) - 1].pv_score; // FIXME why moveCount?
else if (value > alpha) else if (value > alpha)
alpha = value; alpha = value;
} // PV move or new best move
} }
else
mp.rm->pv_score = -VALUE_INFINITE;
} // Root
// Step 18. Check for split // Step 18. Check for split
if ( !Root if ( !Root