int64_t nodes;
Move move;
StateInfo st;
- Depth ext, newDepth;
+ Depth depth, ext, newDepth;
RootMoveNumber = i + 1;
FailHigh = false;
bool moveIsCheck = pos.move_is_check(move);
bool captureOrPromotion = pos.move_is_capture_or_promotion(move);
bool dangerous;
+ depth = (Iteration - 2) * OnePly + InitialDepth;
ext = extension(pos, move, true, captureOrPromotion, moveIsCheck, false, false, &dangerous);
- newDepth = (Iteration - 2) * OnePly + ext + InitialDepth;
+ newDepth = depth + ext;
// Make the move, and search it
pos.do_move(move, st, ci, moveIsCheck);
{
// Try to reduce non-pv search depth by one ply if move seems not problematic,
// if the move fails high will be re-searched at full depth.
- if ( newDepth >= 3*OnePly
- && i >= MultiPV + LMRPVMoves
+ if ( depth >= 3*OnePly // FIXME was newDepth
&& !dangerous
&& !captureOrPromotion
&& !move_is_castle(move))
{
- ss[0].reduction = OnePly;
- value = -search(pos, ss, -alpha, newDepth-OnePly, 1, true, 0);
+ double red = 0.5 + ln(RootMoveNumber - MultiPV + 1) * ln(depth / 2) / 6.0;
+ if (red >= 1.0)
+ {
+ ss[0].reduction = Depth(int(floor(red * int(OnePly))));
+ value = -search(pos, ss, -alpha, newDepth-ss[0].reduction, 1, true, 0);
+ }
+ else
+ value = alpha + 1; // Just to trigger next condition
} else
value = alpha + 1; // Just to trigger next condition
&& !move_is_castle(move)
&& !move_is_killer(move, ss[ply]))
{
- double red = ln(moveCount) * ln(depth / 2) / 3.0;
+ double red = 0.5 + ln(moveCount) * ln(depth / 2) / 6.0;
if (red >= 1.0)
{
- ss[ply].reduction = Depth(floor(red * int(OnePly)));
+ ss[ply].reduction = Depth(int(floor(red * int(OnePly))));
value = -search(pos, ss, -alpha, newDepth-ss[ply].reduction, ply+1, true, threadID);
}
else
const TTEntry* tte;
Move ttMove, move;
Depth ext, newDepth;
- Value approximateEval, nullValue, value, futilityValue, futilityValueScaled;
+ Value staticValue, nullValue, value, futilityValue, futilityValueScaled;
bool isCheck, useFutilityPruning, singleEvasion, moveIsCheck, captureOrPromotion, dangerous;
bool mateThreat = false;
int moveCount = 0;
return value_from_tt(tte->value(), ply);
}
- approximateEval = refine_eval(tte, quick_evaluate(pos), ply);
isCheck = pos.is_check();
+ ei.futilityMargin = Value(0); // Manually initialize futilityMargin
+
+ // Evaluate the position statically
+ if (isCheck)
+ staticValue = quick_evaluate(pos);
+ else if (tte && (tte->type() & VALUE_TYPE_EVAL))
+ staticValue = value_from_tt(tte->value(), ply);
+ else
+ staticValue = evaluate(pos, ei, threadID);
+
+ // Calculate depth dependant futility pruning parameters
+ const int FutilityMoveCountMargin = 3 + (1 << (3 * int(depth) / 8));
+ const int FutilityValueMargin = 112 * bitScanReverse32(int(depth) * int(depth) / 2);
+
+ // Enhance position with TT value if possible
+ futilityValue = staticValue + FutilityValueMargin;
+ staticValue = refine_eval(tte, staticValue, ply);
// Null move search
if ( allowNullmove
&& !isCheck
&& !value_is_mate(beta)
&& ok_to_do_nullmove(pos)
- && approximateEval >= beta - NullMoveMargin)
+ && staticValue >= beta - NullMoveMargin)
{
ss[ply].currentMove = MOVE_NULL;
int R = 3 + (depth >= 5 * OnePly ? depth / 8 : 0);
// Null move dynamic reduction based on value
- if (approximateEval - beta > PawnValueMidgame)
+ if (staticValue - beta > PawnValueMidgame)
R++;
nullValue = -search(pos, ss, -(beta-1), depth-R*OnePly, ply+1, false, threadID);
// Null move search not allowed, try razoring
else if ( !value_is_mate(beta)
&& depth < RazorDepth
- && approximateEval < beta - RazorApprMargins[int(depth) - 2]
+ && staticValue < beta - RazorApprMargins[int(depth) - 2]
&& ss[ply - 1].currentMove != MOVE_NULL
&& ttMove == MOVE_NONE
&& !pos.has_pawn_on_7th(pos.side_to_move()))
// to search all moves.
MovePicker mp = MovePicker(pos, ttMove, depth, H, &ss[ply]);
CheckInfo ci(pos);
- futilityValue = VALUE_NONE;
useFutilityPruning = depth < SelectiveDepth && !isCheck;
- // Calculate depth dependant futility pruning parameters
- const int FutilityMoveCountMargin = 3 + (1 << (3 * int(depth) / 8));
- const int FutilityValueMargin = 112 * bitScanReverse32(int(depth) * int(depth) / 2);
-
- // Avoid calling evaluate() if we already have the score in TT
- if (tte && (tte->type() & VALUE_TYPE_EVAL))
- futilityValue = value_from_tt(tte->value(), ply) + FutilityValueMargin;
-
// Loop through all legal moves until no moves remain or a beta cutoff occurs
while ( bestValue < beta
&& (move = mp.get_next_move()) != MOVE_NONE
continue;
// Value based pruning
- if (futilityValue == VALUE_NONE)
- futilityValue = evaluate(pos, ei, threadID) + FutilityValueMargin;
-
futilityValueScaled = futilityValue - moveCount * IncrementalFutilityMargin;
if (futilityValueScaled < beta)
&& !move_is_killer(move, ss[ply])
/* && move != ttMove*/)
{
- double red = ln(moveCount) * ln(depth / 2) / 1.5;
+ double red = 0.5 + ln(moveCount) * ln(depth / 2) / 3.0;
if (red >= 1.0)
{
- ss[ply].reduction = Depth(floor(red * int(OnePly)));
+ ss[ply].reduction = Depth(int(floor(red * int(OnePly))));
value = -search(pos, ss, -(beta-1), newDepth-ss[ply].reduction, ply+1, true, threadID);
}
else
&& !move_is_castle(move)
&& !move_is_killer(move, ss[sp->ply]))
{
- double red = ln(moveCount) * ln(sp->depth / 2) / 1.5;
+ double red = 0.5 + ln(moveCount) * ln(sp->depth / 2) / 3.0;
if (red >= 1.0)
{
- ss[sp->ply].reduction = Depth(floor(red * int(OnePly)));
+ ss[sp->ply].reduction = Depth(int(floor(red * int(OnePly))));
value = -search(pos, ss, -(sp->beta-1), newDepth-ss[sp->ply].reduction, sp->ply+1, true, threadID);
}
else
&& !move_is_castle(move)
&& !move_is_killer(move, ss[sp->ply]))
{
- double red = ln(moveCount) * ln(sp->depth / 2) / 3.0;
+ double red = 0.5 + ln(moveCount) * ln(sp->depth / 2) / 6.0;
if (red >= 1.0)
{
- ss[sp->ply].reduction = Depth(floor(red * int(OnePly)));
+ ss[sp->ply].reduction = Depth(int(floor(red * int(OnePly))));
value = -search(pos, ss, -sp->alpha, newDepth-ss[sp->ply].reduction, sp->ply+1, true, threadID);
}
else
projects / stockfish / blobdiff