// and near frontier nodes.
const Value FutilityMarginQS = Value(0x80);
+ Value FutilityMargins[2 * PLY_MAX_PLUS_2]; // Initialized at startup.
+
// Each move futility margin is decreased
const Value IncrementalFutilityMargin = Value(0x8);
IterationInfoType IterationInfo[PLY_MAX_PLUS_2];
int BestMoveChangesByIteration[PLY_MAX_PLUS_2];
+ // Search window management
+ int AspirationDelta;
+
// MultiPV mode
int MultiPV;
/// Functions
Value id_loop(const Position& pos, Move searchMoves[]);
- Value root_search(Position& pos, SearchStack ss[], RootMoveList& rml, Value alpha, Value beta);
+ Value root_search(Position& pos, SearchStack ss[], RootMoveList& rml, Value& oldAlpha, Value& beta);
Value search_pv(Position& pos, SearchStack ss[], Value alpha, Value beta, Depth depth, int ply, int threadID);
Value search(Position& pos, SearchStack ss[], Value beta, Depth depth, int ply, bool allowNullmove, int threadID, Move excludedMove = MOVE_NONE);
Value qsearch(Position& pos, SearchStack ss[], Value alpha, Value beta, Depth depth, int ply, int threadID);
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);
Value refine_eval(const TTEntry* tte, Value defaultEval, int ply);
+ Depth calculate_reduction(double baseReduction, int moveCount, Depth depth, double reductionInhibitor);
void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount);
void update_killers(Move m, SearchStack& ss);
void update_gains(const Position& pos, Move move, Value before, Value after);
for (i = 0; i < THREAD_MAX; i++)
Threads[i].activeSplitPoints = 0;
+ // Init futility margins array
+ FutilityMargins[0] = FutilityMargins[1] = Value(0);
+
+ for (i = 2; i < 2 * PLY_MAX_PLUS_2; i++)
+ {
+ FutilityMargins[i] = Value(112 * bitScanReverse32(i * i / 2)); // FIXME: test using log instead of BSR
+ }
+
// Initialize global locks
lock_init(&MPLock, NULL);
lock_init(&IOLock, NULL);
int prevDelta1 = IterationInfo[Iteration - 1].speculatedValue - IterationInfo[Iteration - 2].speculatedValue;
int prevDelta2 = IterationInfo[Iteration - 2].speculatedValue - IterationInfo[Iteration - 3].speculatedValue;
- int delta = Max(2 * abs(prevDelta1) + abs(prevDelta2), ProblemMargin);
+ int delta = Max(abs(prevDelta1) + abs(prevDelta2) / 2, 16);
+
+ delta = (delta + 7) / 8 * 8; // Round to match grainSize
+ AspirationDelta = delta;
alpha = Max(IterationInfo[Iteration - 1].value - delta, -VALUE_INFINITE);
beta = Min(IterationInfo[Iteration - 1].value + delta, VALUE_INFINITE);
// similar to search_pv except that it uses a different move ordering
// scheme and prints some information to the standard output.
- Value root_search(Position& pos, SearchStack ss[], RootMoveList& rml, Value alpha, Value beta) {
+ Value root_search(Position& pos, SearchStack ss[], RootMoveList& rml, Value& oldAlpha, Value& beta) {
- Value oldAlpha = alpha;
- Value value = -VALUE_INFINITE;
+ Value alpha = oldAlpha;
+ Value value;
CheckInfo ci(pos);
+ int researchCount = 0;
bool isCheck = pos.is_check();
// Evaluate the position statically
else
ss[0].eval = VALUE_NONE;
+ while(1) // Fail low loop
+ {
+
// Loop through all the moves in the root move list
for (int i = 0; i < rml.move_count() && !AbortSearch; i++)
{
ext = extension(pos, move, true, captureOrPromotion, moveIsCheck, false, false, &dangerous);
newDepth = depth + ext;
+ value = - VALUE_INFINITE;
+
+ while (1) // Fail high loop
+ {
+
// Make the move, and search it
pos.do_move(move, st, ci, moveIsCheck);
- if (i < MultiPV)
+ if (i < MultiPV || value > alpha)
{
// Aspiration window is disabled in multi-pv case
if (MultiPV > 1)
&& !captureOrPromotion
&& !move_is_castle(move))
{
- double red = 0.5 + ln(RootMoveNumber - MultiPV + 1) * ln(depth / 2) / 6.0;
- if (red >= 1.0)
+ ss[0].reduction = calculate_reduction(0.5, RootMoveNumber - MultiPV + 1, depth, 6.0);
+ if (ss[0].reduction)
{
- ss[0].reduction = Depth(int(floor(red * int(OnePly))));
value = -search(pos, ss, -alpha, newDepth-ss[0].reduction, 1, true, 0);
doFullDepthSearch = (value > alpha);
}
if (doFullDepthSearch)
{
+ ss[0].reduction = Depth(0);
value = -search(pos, ss, -alpha, newDepth, 1, true, 0);
if (value > alpha)
pos.undo_move(move);
+ if (AbortSearch || value < beta)
+ break; // We are not failing high
+
+ // We are failing high and going to do a research. It's important to update score
+ // before research in case we run out of time while researching.
+ rml.set_move_score(i, value);
+ update_pv(ss, 0);
+ TT.extract_pv(pos, ss[0].pv, PLY_MAX);
+ rml.set_move_pv(i, ss[0].pv);
+
+ // Print search information to the standard output
+ cout << "info depth " << Iteration
+ << " score " << value_to_string(value)
+ << ((value >= beta) ? " lowerbound" :
+ ((value <= alpha)? " upperbound" : ""))
+ << " time " << current_search_time()
+ << " nodes " << nodes_searched()
+ << " nps " << nps()
+ << " pv ";
+
+ for (int j = 0; ss[0].pv[j] != MOVE_NONE && j < PLY_MAX; j++)
+ cout << ss[0].pv[j] << " ";
+
+ cout << endl;
+
+ if (UseLogFile)
+ {
+ ValueType type = (value >= beta ? VALUE_TYPE_LOWER
+ : (value <= alpha ? VALUE_TYPE_UPPER : VALUE_TYPE_EXACT));
+
+ LogFile << pretty_pv(pos, current_search_time(), Iteration,
+ nodes_searched(), value, type, ss[0].pv) << endl;
+ }
+
+ // Prepare for research
+ researchCount++;
+ beta = Min(beta + AspirationDelta * (1 << researchCount), VALUE_INFINITE);
+
+ } // End of fail high loop
+
// Finished searching the move. If AbortSearch is true, the search
// was aborted because the user interrupted the search or because we
// ran out of time. In this case, the return value of the search cannot
FailLow = (alpha == oldAlpha);
}
+
+ if (AbortSearch || alpha > oldAlpha)
+ break; // End search, we are not failing low
+
+ // Prepare for research
+ researchCount++;
+ alpha = Max(alpha - AspirationDelta * (1 << researchCount), -VALUE_INFINITE);
+ oldAlpha = alpha;
+
+ } // Fail low loop
+
return alpha;
}
&& !move_is_castle(move)
&& !move_is_killer(move, ss[ply]))
{
- double red = 0.5 + ln(moveCount) * ln(depth / 2) / 6.0;
- if (red >= 1.0)
- {
- ss[ply].reduction = Depth(int(floor(red * int(OnePly))));
- value = -search(pos, ss, -alpha, newDepth-ss[ply].reduction, ply+1, true, threadID);
- doFullDepthSearch = (value > alpha);
- }
+ ss[ply].reduction = calculate_reduction(0.5, moveCount, depth, 6.0);
+ if (ss[ply].reduction)
+ {
+ value = -search(pos, ss, -alpha, newDepth-ss[ply].reduction, ply+1, true, threadID);
+ doFullDepthSearch = (value > alpha);
+ }
}
if (doFullDepthSearch) // Go with full depth non-pv search
// Calculate depth dependant futility pruning parameters
const int FutilityMoveCountMargin = 3 + (1 << (3 * int(depth) / 8));
- const int PostFutilityValueMargin = 112 * bitScanReverse32(int(depth) * int(depth) / 2);
// Evaluate the position statically
if (!isCheck)
}
ss[ply].eval = staticValue;
- futilityValue = staticValue + PostFutilityValueMargin; //FIXME: Remove me, only for split
+ futilityValue = staticValue + FutilityMargins[int(depth)]; //FIXME: Remove me, only for split
staticValue = refine_eval(tte, staticValue, ply); // Enhance accuracy with TT value if possible
update_gains(pos, ss[ply - 1].currentMove, ss[ply - 1].eval, ss[ply].eval);
}
// FIXME: test with modified condition 'depth < RazorDepth'
if ( !isCheck
&& depth < SelectiveDepth
- && staticValue - PostFutilityValueMargin >= beta)
- return staticValue - PostFutilityValueMargin;
+ && staticValue - FutilityMargins[int(depth)] >= beta)
+ return staticValue - FutilityMargins[int(depth)];
// Null move search
if ( allowNullmove
int preFutilityValueMargin = 0;
if (newDepth >= OnePly)
- preFutilityValueMargin = 112 * bitScanReverse32(int(newDepth) * int(newDepth) / 2);
+ preFutilityValueMargin = FutilityMargins[int(newDepth)];
Value futilityCaptureValue = ss[ply].eval + pos.endgame_value_of_piece_on(move_to(move)) + preFutilityValueMargin + ei.futilityMargin + 90;
// Value based pruning
Depth predictedDepth = newDepth;
- //FIXME HACK: awful code duplication
- double red = 0.5 + ln(moveCount) * ln(depth / 2) / 3.0;
- if (red >= 1.0)
- predictedDepth -= int(floor(red * int(OnePly)));
+ //FIXME: We are ignoring condition: depth >= 3*OnePly, BUG??
+ ss[ply].reduction = calculate_reduction(0.5, moveCount, depth, 3.0);
+ if (ss[ply].reduction)
+ predictedDepth -= ss[ply].reduction;
if (predictedDepth < SelectiveDepth)
{
int preFutilityValueMargin = 0;
if (predictedDepth >= OnePly)
- preFutilityValueMargin = 112 * bitScanReverse32(int(predictedDepth) * int(predictedDepth) / 2);
+ preFutilityValueMargin = FutilityMargins[int(predictedDepth)];
preFutilityValueMargin += H.gain(pos.piece_on(move_from(move)), move_from(move), move_to(move)) + 45;
&& !dangerous
&& !captureOrPromotion
&& !move_is_castle(move)
- && !move_is_killer(move, ss[ply])
- /* && move != ttMove*/)
+ && !move_is_killer(move, ss[ply]))
{
- double red = 0.5 + ln(moveCount) * ln(depth / 2) / 3.0;
- if (red >= 1.0)
+ ss[ply].reduction = calculate_reduction(0.5, moveCount, depth, 3.0);
+ if (ss[ply].reduction)
{
- ss[ply].reduction = Depth(int(floor(red * int(OnePly))));
value = -search(pos, ss, -(beta-1), newDepth-ss[ply].reduction, ply+1, true, threadID);
doFullDepthSearch = (value >= beta);
}
&& !move_is_castle(move)
&& !move_is_killer(move, ss[sp->ply]))
{
- double red = 0.5 + ln(moveCount) * ln(sp->depth / 2) / 3.0;
- if (red >= 1.0)
+ ss[sp->ply].reduction = calculate_reduction(0.5, moveCount, sp->depth, 3.0);
+ if (ss[sp->ply].reduction)
{
- 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);
doFullDepthSearch = (value >= sp->beta);
}
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
if (thread_should_stop(threadID))
+ {
+ lock_grab(&(sp->lock));
break;
+ }
// New best move?
if (value > sp->bestValue) // Less then 2% of cases
&& !move_is_castle(move)
&& !move_is_killer(move, ss[sp->ply]))
{
- double red = 0.5 + ln(moveCount) * ln(sp->depth / 2) / 6.0;
- if (red >= 1.0)
+ ss[sp->ply].reduction = calculate_reduction(0.5, moveCount, sp->depth, 6.0);
+ if (ss[sp->ply].reduction)
{
Value localAlpha = sp->alpha;
- ss[sp->ply].reduction = Depth(int(floor(red * int(OnePly))));
value = -search(pos, ss, -localAlpha, newDepth-ss[sp->ply].reduction, sp->ply+1, true, threadID);
doFullDepthSearch = (value > localAlpha);
}
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
if (thread_should_stop(threadID))
+ {
+ lock_grab(&(sp->lock));
break;
+ }
// New best move?
if (value > sp->bestValue) // Less then 2% of cases
return defaultEval;
}
+ // calculate_reduction() returns reduction in plies based on
+ // moveCount and depth. Reduction is always at least one ply.
+
+ Depth calculate_reduction(double baseReduction, int moveCount, Depth depth, double reductionInhibitor) {
+
+ double red = baseReduction + ln(moveCount) * ln(depth / 2) / reductionInhibitor;
+
+ if (red >= 1.0)
+ return Depth(int(floor(red * int(OnePly))));
+ else
+ return Depth(0);
+
+ }
+
// update_history() registers a good move that produced a beta-cutoff
// in history and marks as failures all the other moves of that ply.
projects / stockfish / blobdiff