// best move from the previous iteration, Problem is set back to false.
const Value NoProblemMargin = Value(0x14);
- // Null move margin. A null move search will not be done if the approximate
+ // Null move margin. A null move search will not be done if the static
// evaluation of the position is more than NullMoveMargin below beta.
- const Value NullMoveMargin = Value(0x300);
+ const Value NullMoveMargin = Value(0x200);
// If the TT move is at least SingleReplyMargin better then the
// remaining ones we will extend it.
// Depth limit for razoring
const Depth RazorDepth = 4 * OnePly;
- // Remaining depth: 1 ply 1.5 ply 2 ply 2.5 ply 3 ply 3.5 ply
- const Value RazorMargins[6] = { Value(0x180), Value(0x300), Value(0x300), Value(0x3C0), Value(0x3C0), Value(0x3C0) };
-
- // Remaining depth: 1 ply 1.5 ply 2 ply 2.5 ply 3 ply 3.5 ply
- const Value RazorApprMargins[6] = { Value(0x520), Value(0x300), Value(0x300), Value(0x300), Value(0x300), Value(0x300) };
-
-
/// Variables initialized by UCI options
// Minimum number of full depth (i.e. non-reduced) moves at PV and non-PV nodes
int SearchStartTime;
int MaxNodes, MaxDepth;
int MaxSearchTime, AbsoluteMaxSearchTime, ExtraSearchTime, ExactMaxTime;
- bool InfiniteSearch, PonderSearch, StopOnPonderhit;
+ bool UseTimeManagement, InfiniteSearch, PonderSearch, StopOnPonderhit;
bool AbortSearch, Quit;
bool FailHigh, FailLow, Problem;
int time[], int increment[], int movesToGo, int maxDepth,
int maxNodes, int maxTime, Move searchMoves[]) {
- // Look for a book move
- if (!infinite && !ponder && get_option_value_bool("OwnBook"))
+ // Initialize global search variables
+ Idle = StopOnPonderhit = AbortSearch = Quit = false;
+ FailHigh = FailLow = Problem = false;
+ NodesSincePoll = 0;
+ SearchStartTime = get_system_time();
+ ExactMaxTime = maxTime;
+ MaxDepth = maxDepth;
+ MaxNodes = maxNodes;
+ InfiniteSearch = infinite;
+ PonderSearch = ponder;
+ UseTimeManagement = !ExactMaxTime && !MaxDepth && !MaxNodes && !InfiniteSearch;
+
+ // Look for a book move, only during games, not tests
+ if (UseTimeManagement && !ponder && get_option_value_bool("OwnBook"))
{
Move bookMove;
if (get_option_value_string("Book File") != OpeningBook.file_name())
}
}
- // Initialize global search variables
- Idle = StopOnPonderhit = AbortSearch = Quit = false;
- FailHigh = FailLow = Problem = false;
- SearchStartTime = get_system_time();
- ExactMaxTime = maxTime;
- NodesSincePoll = 0;
- InfiniteSearch = infinite;
- PonderSearch = ponder;
-
for (int i = 0; i < THREAD_MAX; i++)
{
Threads[i].nodes = 0ULL;
// Set thinking time
int myTime = time[side_to_move];
int myIncrement = increment[side_to_move];
-
- if (!movesToGo) // Sudden death time control
+ if (UseTimeManagement)
{
- if (myIncrement)
- {
- MaxSearchTime = myTime / 30 + myIncrement;
- AbsoluteMaxSearchTime = Max(myTime / 4, myIncrement - 100);
- }
- else // Blitz game without increment
+ if (!movesToGo) // Sudden death time control
{
- MaxSearchTime = myTime / 30;
- AbsoluteMaxSearchTime = myTime / 8;
+ if (myIncrement)
+ {
+ MaxSearchTime = myTime / 30 + myIncrement;
+ AbsoluteMaxSearchTime = Max(myTime / 4, myIncrement - 100);
+ }
+ else // Blitz game without increment
+ {
+ MaxSearchTime = myTime / 30;
+ AbsoluteMaxSearchTime = myTime / 8;
+ }
}
- }
- else // (x moves) / (y minutes)
- {
- if (movesToGo == 1)
+ else // (x moves) / (y minutes)
{
- MaxSearchTime = myTime / 2;
- AbsoluteMaxSearchTime = (myTime > 3000)? (myTime - 500) : ((myTime * 3) / 4);
+ if (movesToGo == 1)
+ {
+ MaxSearchTime = myTime / 2;
+ AbsoluteMaxSearchTime = (myTime > 3000)? (myTime - 500) : ((myTime * 3) / 4);
+ }
+ else
+ {
+ MaxSearchTime = myTime / Min(movesToGo, 20);
+ AbsoluteMaxSearchTime = Min((4 * myTime) / movesToGo, myTime / 3);
+ }
}
- else
+
+ if (PonderingEnabled)
{
- MaxSearchTime = myTime / Min(movesToGo, 20);
- AbsoluteMaxSearchTime = Min((4 * myTime) / movesToGo, myTime / 3);
+ MaxSearchTime += MaxSearchTime / 4;
+ MaxSearchTime = Min(MaxSearchTime, AbsoluteMaxSearchTime);
}
}
- if (PonderingEnabled)
- {
- MaxSearchTime += MaxSearchTime / 4;
- MaxSearchTime = Min(MaxSearchTime, AbsoluteMaxSearchTime);
- }
-
- // Fixed depth or fixed number of nodes?
- MaxDepth = maxDepth;
- if (MaxDepth)
- InfiniteSearch = true; // HACK
-
- MaxNodes = maxNodes;
+ // Set best NodesBetweenPolls interval
if (MaxNodes)
- {
NodesBetweenPolls = Min(MaxNodes, 30000);
- InfiniteSearch = true; // HACK
- }
else if (myTime && myTime < 1000)
NodesBetweenPolls = 1000;
else if (myTime && myTime < 5000)
pv[ply] = pv[ply + 1] = MOVE_NONE;
currentMove = threatMove = MOVE_NONE;
reduction = Depth(0);
+ eval = VALUE_NONE;
}
void SearchStack::initKillers() {
Problem = false;
- if (!InfiniteSearch)
+ if (UseTimeManagement)
{
// Time to stop?
bool stopSearch = false;
rml.sort();
- // If we are pondering, we shouldn't print the best move before we
- // are told to do so
- if (PonderSearch)
+ // If we are pondering or in infinite search, we shouldn't print the
+ // best move before we are told to do so.
+ if (!AbortSearch && (PonderSearch || InfiniteSearch))
wait_for_stop_or_ponderhit();
else
// Print final search statistics
assert(threadID >= 0 && threadID < ActiveThreads);
Move movesSearched[256];
- EvalInfo ei;
StateInfo st;
const TTEntry* tte;
Move ttMove, move;
if (AbortSearch || thread_should_stop(threadID))
return Value(0);
- if (pos.is_draw())
+ if (pos.is_draw() || ply >= PLY_MAX - 1)
return VALUE_DRAW;
- if (ply >= PLY_MAX - 1)
- return pos.is_check() ? quick_evaluate(pos) : evaluate(pos, ei, threadID);
-
// Mate distance pruning
oldAlpha = alpha;
alpha = Max(value_mated_in(ply), alpha);
const TTEntry* tte;
Move ttMove, move;
Depth ext, newDepth;
- Value staticValue, nullValue, value, futilityValue, futilityValueScaled;
+ Value bestValue, staticValue, nullValue, value, futilityValue, futilityValueScaled;
bool isCheck, useFutilityPruning, singleEvasion, moveIsCheck, captureOrPromotion, dangerous;
bool mateThreat = false;
int moveCount = 0;
- Value bestValue = -VALUE_INFINITE;
+ futilityValue = staticValue = bestValue = -VALUE_INFINITE;
if (depth < OnePly)
return qsearch(pos, ss, beta-1, beta, Depth(0), ply, threadID);
if (AbortSearch || thread_should_stop(threadID))
return Value(0);
- if (pos.is_draw())
+ if (pos.is_draw() || ply >= PLY_MAX - 1)
return VALUE_DRAW;
- if (ply >= PLY_MAX - 1)
- return pos.is_check() ? quick_evaluate(pos) : evaluate(pos, ei, threadID);
-
// Mate distance pruning
if (value_mated_in(ply) >= beta)
return beta;
}
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 score accuracy with TT value if possible
- futilityValue = staticValue + FutilityValueMargin;
- staticValue = refine_eval(tte, staticValue, ply);
+ // Evaluate the position statically
+ if (isCheck)
+ ss[ply].eval = VALUE_NONE;
+ else
+ {
+ if (tte && (tte->type() & VALUE_TYPE_EVAL))
+ staticValue = value_from_tt(tte->value(), ply);
+ else
+ staticValue = evaluate(pos, ei, threadID);
+
+ ss[ply].eval = staticValue;
+ futilityValue = staticValue + FutilityValueMargin;
+ staticValue = refine_eval(tte, staticValue, ply); // Enhance accuracy with TT value if possible
+ }
// Null move search
if ( allowNullmove
}
// Null move search not allowed, try razoring
else if ( !value_is_mate(beta)
+ && !isCheck
&& depth < RazorDepth
- && staticValue < beta - RazorApprMargins[int(depth) - 2]
+ && staticValue < beta - (NullMoveMargin + 16 * depth)
&& ss[ply - 1].currentMove != MOVE_NULL
&& ttMove == MOVE_NONE
&& !pos.has_pawn_on_7th(pos.side_to_move()))
{
- Value rbeta = beta - RazorMargins[int(depth) - 2];
+ Value rbeta = beta - (NullMoveMargin + 16 * depth);
Value v = qsearch(pos, ss, rbeta-1, rbeta, Depth(0), ply, threadID);
if (v < rbeta)
return v;
if (AbortSearch || thread_should_stop(threadID))
return Value(0);
- if (pos.is_draw())
+ if (pos.is_draw() || ply >= PLY_MAX - 1)
return VALUE_DRAW;
- if (ply >= PLY_MAX - 1)
- return pos.is_check() ? quick_evaluate(pos) : evaluate(pos, ei, threadID);
-
// Transposition table lookup. At PV nodes, we don't use the TT for
// pruning, but only for move ordering.
tte = TT.retrieve(pos.get_key());
}
isCheck = pos.is_check();
- ei.futilityMargin = Value(0); // Manually initialize futilityMargin
// Evaluate the position statically
if (isCheck)
|| stillAtFirstMove //FIXME: We are not checking any problem flags, BUG?
|| noProblemFound;
- if ( (Iteration >= 3 && !InfiniteSearch && noMoreTime)
+ if ( (Iteration >= 3 && UseTimeManagement && noMoreTime)
|| (ExactMaxTime && t >= ExactMaxTime)
|| (Iteration >= 3 && MaxNodes && nodes_searched() >= MaxNodes))
AbortSearch = true;
|| stillAtFirstMove
|| noProblemFound;
- if (Iteration >= 3 && !InfiniteSearch && (noMoreTime || StopOnPonderhit))
+ if (Iteration >= 3 && UseTimeManagement && (noMoreTime || StopOnPonderhit))
AbortSearch = true;
}
projects / stockfish / blobdiff