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

Fix some silly bugs

Browse source 
SelectiveDepth was ignored

Test results for the whole futility pruning series:

4CPU:
Orig - Mod: 959 - 1027 (+12 elo)

1CPU:
Orig - Mod: 763 - 830 (+15 elo)

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Joona Kiiski 2010-01-22 22:54:28 +02:00 • committed by Marco Costalba
parent 6247f27a05
commit ea53006a9d
1 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/search.cpp
View file

@ -1359,7 +1359,7 @@ namespace {
Move ttMove, move;
Depth ext, newDepth;
Value bestValue, staticValue, nullValue, value, futilityValue, futilityValueScaled;
bool isCheck, useFutilityPruning, singleEvasion, moveIsCheck, captureOrPromotion, dangerous;
bool isCheck, singleEvasion, moveIsCheck, captureOrPromotion, dangerous;
bool mateThreat = false;
int moveCount = 0;
futilityValue = staticValue = bestValue = value = -VALUE_INFINITE;
@ -1430,7 +1430,7 @@ namespace {
}
// Post futility pruning
if (staticValue - PostFutilityValueMargin >= beta)
if (depth < SelectiveDepth && staticValue - PostFutilityValueMargin >= beta)
return (staticValue - PostFutilityValueMargin);
// Null move search
@ -1510,7 +1510,6 @@ namespace {
// to search all moves.
MovePicker mp = MovePicker(pos, ttMove, depth, H, &ss[ply]);
CheckInfo ci(pos);
useFutilityPruning = depth < SelectiveDepth && !isCheck;
// Loop through all legal moves until no moves remain or a beta cutoff occurs
while ( bestValue < beta
@ -1559,7 +1558,8 @@ namespace {
// Futility pruning for captures
Color them = opposite_color(pos.side_to_move());
if ( useFutilityPruning
if ( !isCheck
&& newDepth < SelectiveDepth
&& !dangerous
&& pos.move_is_capture(move)
&& !pos.move_is_check(move, ci)
@ -1579,7 +1579,7 @@ namespace {
// Futility pruning
if ( useFutilityPruning
if ( !isCheck
&& !dangerous
&& !captureOrPromotion
&& !move_is_castle(move)
@ -1599,19 +1599,22 @@ namespace {
if (red >= 1.0)
predictedDepth -= int(floor(red * int(OnePly)));
int preFutilityValueMargin = 0;
if (predictedDepth >= OnePly)
preFutilityValueMargin = 112 * bitScanReverse32(int(predictedDepth) * int(predictedDepth) / 2);
preFutilityValueMargin += MG.retrieve(pos.piece_on(move_from(move)), move_from(move), move_to(move)) + 45;
futilityValueScaled = ss[ply].eval + preFutilityValueMargin - moveCount * IncrementalFutilityMargin;
if (futilityValueScaled < beta)
if (predictedDepth < SelectiveDepth)
{
if (futilityValueScaled > bestValue)
bestValue = futilityValueScaled;
continue;
int preFutilityValueMargin = 0;
if (predictedDepth >= OnePly)
preFutilityValueMargin = 112 * bitScanReverse32(int(predictedDepth) * int(predictedDepth) / 2);
preFutilityValueMargin += MG.retrieve(pos.piece_on(move_from(move)), move_from(move), move_to(move)) + 45;
futilityValueScaled = ss[ply].eval + preFutilityValueMargin - moveCount * IncrementalFutilityMargin;
if (futilityValueScaled < beta)
{
if (futilityValueScaled > bestValue)
bestValue = futilityValueScaled;
continue;
}
}
}