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

Rename ok_to_prune() in connected_threat()

Browse source 
It is more up to the point. Also small speedup
due to checking for threat move before calling
the function. This saves more then 90% of function calls.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2010-06-01 15:02:14 +01:00
parent c0136fb728
commit a3819188de
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/search.cpp
View file

@ -302,8 +302,8 @@ namespace {
bool value_is_mate(Value value); bool value_is_mate(Value value);
bool move_is_killer(Move m, SearchStack* ss); bool move_is_killer(Move m, SearchStack* ss);
bool ok_to_do_nullmove(const Position& pos); bool ok_to_do_nullmove(const Position& pos);
bool ok_to_prune(const Position& pos, Move m, Move threat);
bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply); bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply);
bool connected_threat(const Position& pos, Move m, Move threat);
Value refine_eval(const TTEntry* tte, Value defaultEval, int ply); Value refine_eval(const TTEntry* tte, Value defaultEval, int ply);
void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount); void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount);
void update_killers(Move m, SearchStack* ss); void update_killers(Move m, SearchStack* ss);
@ -1286,7 +1286,7 @@ namespace {
{ {
// Move count based pruning // Move count based pruning
if ( moveCount >= futility_move_count(depth) if ( moveCount >= futility_move_count(depth)
&& ok_to_prune(pos, move, ss->threatMove) && !(ss->threatMove && connected_threat(pos, move, ss->threatMove))
&& bestValue > value_mated_in(PLY_MAX)) && bestValue > value_mated_in(PLY_MAX))
continue; continue;
@ -1328,9 +1328,9 @@ namespace {
ss->reduction = reduction<PvNode>(depth, moveCount); ss->reduction = reduction<PvNode>(depth, moveCount);
if (ss->reduction) if (ss->reduction)
{ {
Depth r = newDepth - ss->reduction; Depth d = newDepth - ss->reduction;
value = r < OnePly ? -qsearch<NonPV>(pos, ss+1, -(alpha+1), -alpha, Depth(0), threadID) value = d < OnePly ? -qsearch<NonPV>(pos, ss+1, -(alpha+1), -alpha, Depth(0), threadID)
: - search<NonPV>(pos, ss+1, -(alpha+1), -alpha, r, true, threadID); : - search<NonPV>(pos, ss+1, -(alpha+1), -alpha, d, true, threadID);
doFullDepthSearch = (value > alpha); doFullDepthSearch = (value > alpha);
} }
@ -1681,7 +1681,7 @@ namespace {
{ {
// Move count based pruning // Move count based pruning
if ( moveCount >= futility_move_count(sp->depth) if ( moveCount >= futility_move_count(sp->depth)
&& ok_to_prune(pos, move, ss->threatMove) && !(ss->threatMove && connected_threat(pos, move, ss->threatMove))
&& sp->bestValue > value_mated_in(PLY_MAX)) && sp->bestValue > value_mated_in(PLY_MAX))
{ {
lock_grab(&(sp->lock)); lock_grab(&(sp->lock));
@ -1978,24 +1978,19 @@ namespace {
} }
// ok_to_prune() tests whether it is safe to forward prune a move. Only // connected_threat() tests whether it is safe to forward prune a move or if
// non-tactical moves late in the move list close to the leaves are // is somehow coonected to the threat move returned by null search.
// candidates for pruning.
bool ok_to_prune(const Position& pos, Move m, Move threat) { bool connected_threat(const Position& pos, Move m, Move threat) {
assert(move_is_ok(m)); assert(move_is_ok(m));
assert(threat == MOVE_NONE || move_is_ok(threat)); assert(threat && move_is_ok(threat));
assert(!pos.move_is_check(m)); assert(!pos.move_is_check(m));
assert(!pos.move_is_capture_or_promotion(m)); assert(!pos.move_is_capture_or_promotion(m));
assert(!pos.move_is_passed_pawn_push(m)); assert(!pos.move_is_passed_pawn_push(m));
Square mfrom, mto, tfrom, tto; Square mfrom, mto, tfrom, tto;
// Prune if there isn't any threat move
if (threat == MOVE_NONE)
return true;
mfrom = move_from(m); mfrom = move_from(m);
mto = move_to(m); mto = move_to(m);
tfrom = move_from(threat); tfrom = move_from(threat);
@ -2003,7 +1998,7 @@ namespace {
// Case 1: Don't prune moves which move the threatened piece // Case 1: Don't prune moves which move the threatened piece
if (mfrom == tto) if (mfrom == tto)
return false; return true;
// Case 2: If the threatened piece has value less than or equal to the // Case 2: If the threatened piece has value less than or equal to the
// value of the threatening piece, don't prune move which defend it. // value of the threatening piece, don't prune move which defend it.
@ -2011,16 +2006,16 @@ namespace {
&& ( pos.midgame_value_of_piece_on(tfrom) >= pos.midgame_value_of_piece_on(tto) && ( pos.midgame_value_of_piece_on(tfrom) >= pos.midgame_value_of_piece_on(tto)
|| pos.type_of_piece_on(tfrom) == KING) || pos.type_of_piece_on(tfrom) == KING)
&& pos.move_attacks_square(m, tto)) && pos.move_attacks_square(m, tto))
return false; return true;
// Case 3: If the moving piece in the threatened move is a slider, don't // Case 3: If the moving piece in the threatened move is a slider, don't
// prune safe moves which block its ray. // prune safe moves which block its ray.
if ( piece_is_slider(pos.piece_on(tfrom)) if ( piece_is_slider(pos.piece_on(tfrom))
&& bit_is_set(squares_between(tfrom, tto), mto) && bit_is_set(squares_between(tfrom, tto), mto)
&& pos.see_sign(m) >= 0) && pos.see_sign(m) >= 0)
return false; return true;
return true; return false;
} }