if (Options["Contempt Factor"] && !Options["UCI_AnalyseMode"])
{
int cf = Options["Contempt Factor"] * PawnValueMg / 100; // From centipawns
- cf = cf * MaterialTable::game_phase(RootPos) / PHASE_MIDGAME; // Scale down with phase
+ cf = cf * Material::game_phase(RootPos) / PHASE_MIDGAME; // Scale down with phase
DrawValue[ RootColor] = VALUE_DRAW - Value(cf);
DrawValue[~RootColor] = VALUE_DRAW + Value(cf);
}
Key posKey;
Move ttMove, move, excludedMove, bestMove, threatMove;
Depth ext, newDepth;
- Value bestValue, value, ttValue, ttValueUpper;
+ Value bestValue, value, ttValue;
Value eval, nullValue, futilityValue;
bool inCheck, givesCheck, pvMove, singularExtensionNode;
bool captureOrPromotion, dangerous, doFullDepthSearch;
tte = TT.probe(posKey);
ttMove = RootNode ? RootMoves[PVIdx].pv[0] : tte ? tte->move() : MOVE_NONE;
ttValue = tte ? value_from_tt(tte->value(), ss->ply) : VALUE_NONE;
- ttValueUpper = tte ? value_from_tt(tte->value_upper(), ss->ply) : VALUE_NONE;
// At PV nodes we check for exact scores, while at non-PV nodes we check for
// a fail high/low. Biggest advantage at probing at PV nodes is to have a
// smooth experience in analysis mode. We don't probe at Root nodes otherwise
// we should also update RootMoveList to avoid bogus output.
- if (!RootNode && tte)
+ if ( !RootNode
+ && tte
+ && tte->depth() >= depth
+ && ttValue != VALUE_NONE // Only in case of TT access race
+ && ( PvNode ? tte->type() == BOUND_EXACT
+ : ttValue >= beta ? (tte->type() & BOUND_LOWER)
+ : (tte->type() & BOUND_UPPER)))
{
- // Fail High
- if ( (tte->type() & BOUND_LOWER)
- && ttValue >= beta
- && tte->depth() >= depth
- && ttValue != VALUE_NONE) // Only in case of TT access race
- {
- // Update killers, we assume ttMove caused a cut-off
- if ( ttMove
- && !pos.is_capture_or_promotion(ttMove)
- && ttMove != ss->killers[0])
- {
- ss->killers[1] = ss->killers[0];
- ss->killers[0] = ttMove;
- }
- TT.refresh(tte);
- ss->currentMove = ttMove; // Can be MOVE_NONE
- return ttValue;
- }
+ TT.refresh(tte);
+ ss->currentMove = ttMove; // Can be MOVE_NONE
- // Fail Low
- if ( (tte->type() & BOUND_UPPER)
- && ttValueUpper < beta
- && tte->depth_upper() >= depth
- && ttValueUpper != VALUE_NONE) // Only in case of TT access race
+ if ( ttValue >= beta
+ && ttMove
+ && !pos.is_capture_or_promotion(ttMove)
+ && ttMove != ss->killers[0])
{
- TT.refresh(tte);
- ss->currentMove = ttMove; // Can be MOVE_NONE
- return ttValueUpper;
+ ss->killers[1] = ss->killers[0];
+ ss->killers[0] = ttMove;
}
+ return ttValue;
}
// Step 5. Evaluate the position statically and update parent's gain statistics
// Step 19. Check for splitting the search
if ( !SpNode
&& depth >= Threads.min_split_depth()
- && bestValue < beta
&& Threads.available_slave_exists(thisThread))
{
+ assert(bestValue < beta);
+
bestValue = Threads.split<FakeSplit>(pos, ss, alpha, beta, bestValue, &bestMove,
depth, threatMove, moveCount, mp, NT);
if (bestValue >= beta)
const TTEntry* tte;
Key posKey;
Move ttMove, move, bestMove;
- Value bestValue, value, ttValue, ttValueUpper, futilityValue, futilityBase, oldAlpha;
+ Value bestValue, value, ttValue, futilityValue, futilityBase, oldAlpha;
bool givesCheck, enoughMaterial, evasionPrunable, fromNull;
Depth ttDepth;
tte = TT.probe(posKey);
ttMove = tte ? tte->move() : MOVE_NONE;
ttValue = tte ? value_from_tt(tte->value(),ss->ply) : VALUE_NONE;
- ttValueUpper = tte ? value_from_tt(tte->value_upper(),ss->ply) : VALUE_NONE;
// Decide whether or not to include checks, this fixes also the type of
// TT entry depth that we are going to use. Note that in qsearch we use
// only two types of depth in TT: DEPTH_QS_CHECKS or DEPTH_QS_NO_CHECKS.
ttDepth = InCheck || depth >= DEPTH_QS_CHECKS ? DEPTH_QS_CHECKS
: DEPTH_QS_NO_CHECKS;
- if (tte)
+ if ( tte
+ && tte->depth() >= ttDepth
+ && ttValue != VALUE_NONE // Only in case of TT access race
+ && ( PvNode ? tte->type() == BOUND_EXACT
+ : ttValue >= beta ? (tte->type() & BOUND_LOWER)
+ : (tte->type() & BOUND_UPPER)))
{
- // Fail High
- if ( (tte->type() & BOUND_LOWER)
- && ttValue >= beta
- && tte->depth() >= ttDepth
- && ttValue != VALUE_NONE) // Only in case of TT access race
- {
- ss->currentMove = ttMove; // Can be MOVE_NONE
- return ttValue;
- }
-
- // Fail Low
- if ( (tte->type() & BOUND_UPPER)
- && ttValueUpper < beta
- && tte->depth_upper() >= ttDepth
- && ttValueUpper != VALUE_NONE) // Only in case of TT access race
- {
- ss->currentMove = ttMove; // Can be MOVE_NONE
- return ttValueUpper;
- }
+ ss->currentMove = ttMove; // Can be MOVE_NONE
+ return ttValue;
}
// Evaluate the position statically
do {
pv.push_back(m);
- assert(pos.move_is_legal(pv[ply]));
+ assert(MoveList<LEGAL>(pos).contains(pv[ply]));
+
pos.do_move(pv[ply++], *st++);
tte = TT.probe(pos.key());
if (!tte || tte->move() != pv[ply]) // Don't overwrite correct entries
TT.store(pos.key(), VALUE_NONE, BOUND_NONE, DEPTH_NONE, pv[ply]);
- assert(pos.move_is_legal(pv[ply]));
+ assert(MoveList<LEGAL>(pos).contains(pv[ply]));
+
pos.do_move(pv[ply++], *st++);
} while (pv[ply] != MOVE_NONE);