kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-11 19:49:14 +00:00
Code Issues Releases Wiki Activity

Sync root_search() with search()

Browse source 
This will let unification easier.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-01-16 12:34:47 +01:00
parent c17a127c42
commit 842efefcad
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/search.cpp
View file

@ -626,6 +626,14 @@ namespace {
// Search to the current depth, rml is updated and sorted // Search to the current depth, rml is updated and sorted
value = root_search(pos, ss, alpha, beta, depth, rml); value = root_search(pos, ss, alpha, beta, depth, rml);
// Sort the moves before to return
rml.sort();
// Write PV lines to transposition table, in case the relevant entries
// have been overwritten during the search.
for (int i = 0; i < Min(MultiPV, (int)rml.size()); i++)
rml[i].insert_pv_in_tt(pos);
if (StopRequest) if (StopRequest)
break; break;
@ -731,11 +739,11 @@ namespace {
Move move; Move move;
Depth ext, newDepth; Depth ext, newDepth;
ValueType vt; ValueType vt;
Value value, oldAlpha; Value bestValue, value, oldAlpha;
bool isCheck, moveIsCheck, captureOrPromotion, dangerous, isPvMove; bool isCheck, moveIsCheck, captureOrPromotion, dangerous, isPvMove;
int moveCount = 0; int moveCount = 0;
value = -VALUE_INFINITE; bestValue = value = -VALUE_INFINITE;
oldAlpha = alpha; oldAlpha = alpha;
isCheck = pos.is_check(); isCheck = pos.is_check();
@ -761,10 +769,11 @@ namespace {
CheckInfo ci(pos); CheckInfo ci(pos);
int64_t nodes; int64_t nodes;
RootMoveList::iterator rm = rml.begin(); RootMoveList::iterator rm = rml.begin();
bestValue = alpha;
// Step 10. Loop through moves // Step 10. Loop through moves
// Loop through all legal moves until no moves remain or a beta cutoff occurs // Loop through all legal moves until no moves remain or a beta cutoff occurs
while ( alpha < beta while ( bestValue < beta
&& rm != rml.end() && rm != rml.end()
&& !StopRequest) && !StopRequest)
{ {
@ -898,10 +907,10 @@ namespace {
{ {
// Raise alpha to setup proper non-pv search upper bound // Raise alpha to setup proper non-pv search upper bound
if (value > alpha) if (value > alpha)
alpha = value; alpha = bestValue = value;
} }
else // Set alpha equal to minimum score among the PV lines else // Set alpha equal to minimum score among the PV lines
alpha = rml[Min(moveCount, MultiPV) - 1].pv_score; // FIXME why moveCount? alpha = bestValue = rml[Min(moveCount, MultiPV) - 1].pv_score; // FIXME why moveCount?
} // PV move or new best move } // PV move or new best move
@ -909,20 +918,19 @@ namespace {
} // Root moves loop } // Root moves loop
// Step 20. Update tables // Step 20. Update tables
// If the search is not aborted, update the transposition table, // If the search is not aborted, update the transposition table,
// history counters, and killer moves. // history counters, and killer moves.
if (!StopRequest) if (!StopRequest)
{ {
move = alpha <= oldAlpha ? MOVE_NONE : ss->bestMove; move = bestValue <= oldAlpha ? MOVE_NONE : ss->bestMove;
vt = alpha <= oldAlpha ? VALUE_TYPE_UPPER vt = bestValue <= oldAlpha ? VALUE_TYPE_UPPER
: alpha >= beta ? VALUE_TYPE_LOWER : VALUE_TYPE_EXACT; : bestValue >= beta ? VALUE_TYPE_LOWER : VALUE_TYPE_EXACT;
TT.store(posKey, value_to_tt(alpha, 0), vt, depth, move, ss->eval, ss->evalMargin); TT.store(posKey, value_to_tt(bestValue, 0), vt, depth, move, ss->eval, ss->evalMargin);
// Update killers and history only for non capture moves that fails high // Update killers and history only for non capture moves that fails high
if ( alpha >= beta if ( bestValue >= beta
&& !pos.move_is_capture_or_promotion(move)) && !pos.move_is_capture_or_promotion(move))
{ {
update_history(pos, move, depth, movesSearched, moveCount); update_history(pos, move, depth, movesSearched, moveCount);
@ -930,17 +938,9 @@ namespace {
} }
} }
// Sort the moves before to return assert(bestValue > -VALUE_INFINITE && bestValue < VALUE_INFINITE);
rml.sort();
// Write PV lines to transposition table, in case the relevant entries return bestValue;
// have been overwritten during the search.
for (int i = 0; i < Min(MultiPV, (int)rml.size()); i++)
rml[i].insert_pv_in_tt(pos);
assert(alpha > -VALUE_INFINITE && alpha < VALUE_INFINITE);
return alpha;
} }