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

Synchronize sp_search_pv() with search_pv()

Browse source 
Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Joona Kiiski 2010-02-24 17:52:37 +02:00 • committed by Marco Costalba
parent 62f6d39204
commit 1a03f0b0d3
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/search.cpp
View file

@ -1917,10 +1917,13 @@ namespace {
Position pos(*sp->pos); Position pos(*sp->pos);
CheckInfo ci(pos); CheckInfo ci(pos);
SearchStack* ss = sp->sstack[threadID]; SearchStack* ss = sp->sstack[threadID];
StateInfo st;
Value value = -VALUE_INFINITE; Value value = -VALUE_INFINITE;
int moveCount; int moveCount;
Move move; Move move;
// Step 10. Loop through moves
// Loop through all legal moves until no moves remain or a beta cutoff occurs
lock_grab(&(sp->lock)); lock_grab(&(sp->lock));
while ( sp->alpha < sp->beta while ( sp->alpha < sp->beta
@ -1935,18 +1938,20 @@ namespace {
bool moveIsCheck = pos.move_is_check(move, ci); bool moveIsCheck = pos.move_is_check(move, ci);
bool captureOrPromotion = pos.move_is_capture_or_promotion(move); bool captureOrPromotion = pos.move_is_capture_or_promotion(move);
ss[sp->ply].currentMove = move; // Step 11. Decide the new search depth
// Decide the new search depth
bool dangerous; bool dangerous;
Depth ext = extension(pos, move, true, captureOrPromotion, moveIsCheck, false, false, &dangerous); Depth ext = extension(pos, move, true, captureOrPromotion, moveIsCheck, false, false, &dangerous);
Depth newDepth = sp->depth - OnePly + ext; Depth newDepth = sp->depth - OnePly + ext;
// Make and search the move. // Update current move
StateInfo st; ss[sp->ply].currentMove = move;
// Step 12. Futility pruning (is omitted in PV nodes)
// Step 13. Make the move
pos.do_move(move, st, ci, moveIsCheck); pos.do_move(move, st, ci, moveIsCheck);
// Try to reduce non-pv search depth by one ply if move seems not problematic, // Step 14. Reduced search
// if the move fails high will be re-searched at full depth. // if the move fails high will be re-searched at full depth.
bool doFullDepthSearch = true; bool doFullDepthSearch = true;
@ -1964,7 +1969,8 @@ namespace {
} }
} }
if (doFullDepthSearch) // Go with full depth non-pv search // Step 15. Full depth search
if (doFullDepthSearch)
{ {
Value localAlpha = sp->alpha; Value localAlpha = sp->alpha;
ss[sp->ply].reduction = Depth(0); ss[sp->ply].reduction = Depth(0);
@ -1979,11 +1985,13 @@ namespace {
value = -search_pv(pos, ss, -sp->beta, -localAlpha, newDepth, sp->ply+1, threadID); value = -search_pv(pos, ss, -sp->beta, -localAlpha, newDepth, sp->ply+1, threadID);
} }
} }
// Step 16. Undo move
pos.undo_move(move); pos.undo_move(move);
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE); assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
// New best move? // Step 17. Check for new best move
lock_grab(&(sp->lock)); lock_grab(&(sp->lock));
if (value > sp->bestValue && !TM.thread_should_stop(threadID)) if (value > sp->bestValue && !TM.thread_should_stop(threadID))

2
src/thread.h
View file

@ -53,7 +53,7 @@ struct SplitPoint {
const Position* pos; const Position* pos;
bool pvNode; bool pvNode;
Depth depth; Depth depth;
Value beta, futilityValue; Value beta;
int ply, master, slaves[MAX_THREADS]; int ply, master, slaves[MAX_THREADS];
SearchStack sstack[MAX_THREADS][PLY_MAX_PLUS_2]; SearchStack sstack[MAX_THREADS][PLY_MAX_PLUS_2];