bool UseQSearchFutilityPruning = true;
bool UseFutilityPruning = true;
- // Margins for futility pruning in the quiescence search, at frontier
- // nodes, and at pre-frontier nodes
- Value FutilityMargin0 = Value(0x80);
- Value FutilityMargin1 = Value(0x100);
- Value FutilityMargin2 = Value(0x200);
- const Value FutilityMargins[6] = { Value(0x120), Value(0x220), Value(0x250),
- Value(0x280), Value(0x320), Value(0x360) };
+ // Margins for futility pruning in the quiescence search, and at frontier
+ // and near frontier nodes
+ Value FutilityMarginQS = Value(0x80);
+ Value FutilityMargins[6] = { Value(0x100), Value(0x200), Value(0x250),
+ Value(0x2A0), Value(0x340), Value(0x3A0) };
// Razoring
+ const bool RazorAtDepthOne = false;
Depth RazorDepth = 4*OnePly;
Value RazorMargin = Value(0x300);
bool connected_moves(const Position &pos, Move m1, Move m2);
bool value_is_mate(Value value);
bool move_is_killer(Move m, const SearchStack& ss);
- Depth extension(const Position &pos, Move m, bool pvNode, bool check, bool singleReply, bool mateThreat, bool* dangerous);
+ Depth extension(const Position &pos, Move m, bool pvNode, bool capture, bool check, bool singleReply, bool mateThreat, bool* dangerous);
bool ok_to_do_nullmove(const Position &pos);
bool ok_to_prune(const Position &pos, Move m, Move threat, Depth d);
bool ok_to_use_TT(const TTEntry* tte, Depth depth, Value beta, int ply);
bool idle_thread_exists(int master);
bool split(const Position &pos, SearchStack *ss, int ply,
Value *alpha, Value *beta, Value *bestValue, Depth depth,
- int *moves, MovePicker *mp, Bitboard dcCandidates, int master,
- bool pvNode);
+ int *moves, MovePicker *mp, int master, bool pvNode);
void wake_sleeping_threads();
#if !defined(_MSC_VER)
UseQSearchFutilityPruning = get_option_value_bool("Futility Pruning (Quiescence Search)");
UseFutilityPruning = get_option_value_bool("Futility Pruning (Main Search)");
- FutilityMargin0 = value_from_centipawns(get_option_value_int("Futility Margin 0"));
- FutilityMargin1 = value_from_centipawns(get_option_value_int("Futility Margin 1"));
- FutilityMargin2 = value_from_centipawns(get_option_value_int("Futility Margin 2"));
+ FutilityMarginQS = value_from_centipawns(get_option_value_int("Futility Margin (Quiescence Search)"));
+ int fmScale = get_option_value_int("Futility Margin Scale Factor (Main Search)");
+ for (int i = 0; i < 6; i++)
+ FutilityMargins[i] = (FutilityMargins[i] * fmScale) / 100;
RazorDepth = (get_option_value_int("Maximum Razoring Depth") + 1) * OnePly;
RazorMargin = value_from_centipawns(get_option_value_int("Razoring Margin"));
// Set thinking time:
int myTime = time[side_to_move];
int myIncrement = increment[side_to_move];
- int oppTime = time[1 - side_to_move];
if (!movesToGo) // Sudden death time control
{
Value alpha = -VALUE_INFINITE;
Value beta = VALUE_INFINITE, value;
- Bitboard dcCandidates = pos.discovered_check_candidates(pos.side_to_move());
// Loop through all the moves in the root move list
for (int i = 0; i < rml.move_count() && !AbortSearch; i++)
// Decide search depth for this move
bool dangerous;
- ext = extension(pos, move, true, pos.move_is_check(move), false, false, &dangerous);
+ ext = extension(pos, move, true, pos.move_is_capture(move), pos.move_is_check(move), false, false, &dangerous);
newDepth = (Iteration - 2) * OnePly + ext + InitialDepth;
// Make the move, and search it
- pos.do_move(move, u, dcCandidates);
+ pos.do_move(move, u);
if (i < MultiPV)
{
}
}
- pos.undo_move(move, u);
+ pos.undo_move(move);
// Finished searching the move. If AbortSearch is true, the search
// was aborted because the user interrupted the search or because we
Move move, movesSearched[256];
int moveCount = 0;
Value value, bestValue = -VALUE_INFINITE;
- Bitboard dcCandidates = mp.discovered_check_candidates();
+ Color us = pos.side_to_move();
bool isCheck = pos.is_check();
- bool mateThreat = pos.has_mate_threat(opposite_color(pos.side_to_move()));
+ bool mateThreat = pos.has_mate_threat(opposite_color(us));
// Loop through all legal moves until no moves remain or a beta cutoff
// occurs.
assert(move_is_ok(move));
bool singleReply = (isCheck && mp.number_of_moves() == 1);
- bool moveIsCheck = pos.move_is_check(move, dcCandidates);
+ bool moveIsCheck = pos.move_is_check(move);
bool moveIsCapture = pos.move_is_capture(move);
movesSearched[moveCount++] = ss[ply].currentMove = move;
// Decide the new search depth
bool dangerous;
- Depth ext = extension(pos, move, true, moveIsCheck, singleReply, mateThreat, &dangerous);
+ Depth ext = extension(pos, move, true, moveIsCapture, moveIsCheck, singleReply, mateThreat, &dangerous);
Depth newDepth = depth - OnePly + ext;
// Make and search the move
UndoInfo u;
- pos.do_move(move, u, dcCandidates);
+ pos.do_move(move, u);
if (moveCount == 1) // The first move in list is the PV
value = -search_pv(pos, ss, -beta, -alpha, newDepth, ply+1, threadID);
}
}
}
- pos.undo_move(move, u);
+ pos.undo_move(move);
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
&& !AbortSearch
&& !thread_should_stop(threadID)
&& split(pos, ss, ply, &alpha, &beta, &bestValue, depth,
- &moveCount, &mp, dcCandidates, threadID, true))
+ &moveCount, &mp, threadID, true))
break;
}
&& pos.see(ss[ply + 1].currentMove) + nullValue >= beta)
nullDrivenIID = true;
- pos.undo_null_move(u);
+ pos.undo_null_move();
if (value_is_mate(nullValue))
{
else if ( !value_is_mate(beta)
&& approximateEval < beta - RazorMargin
&& depth < RazorDepth
- && depth > OnePly
+ && (RazorAtDepthOne || depth > OnePly)
&& ttMove == MOVE_NONE
&& !pos.has_pawn_on_7th(pos.side_to_move()))
{
Value v = qsearch(pos, ss, beta-1, beta, Depth(0), ply, threadID);
- if (v < beta - RazorMargin / 2 - int(depth - OnePly) * RazorMargin / 8)
+ if ( (v < beta - RazorMargin - RazorMargin / 4)
+ || (depth < 3*OnePly && v < beta - RazorMargin)
+ || (depth < 2*OnePly && v < beta - RazorMargin / 2))
return v;
}
Move move, movesSearched[256];
int moveCount = 0;
Value value, bestValue = -VALUE_INFINITE;
- Bitboard dcCandidates = mp.discovered_check_candidates();
Value futilityValue = VALUE_NONE;
bool useFutilityPruning = UseFutilityPruning
&& depth < SelectiveDepth
assert(move_is_ok(move));
bool singleReply = (isCheck && mp.number_of_moves() == 1);
- bool moveIsCheck = pos.move_is_check(move, dcCandidates);
+ bool moveIsCheck = pos.move_is_check(move);
bool moveIsCapture = pos.move_is_capture(move);
movesSearched[moveCount++] = ss[ply].currentMove = move;
// Decide the new search depth
bool dangerous;
- Depth ext = extension(pos, move, false, moveIsCheck, singleReply, mateThreat, &dangerous);
+ Depth ext = extension(pos, move, false, moveIsCapture, moveIsCheck, singleReply, mateThreat, &dangerous);
Depth newDepth = depth - OnePly + ext;
// Futility pruning
// Make and search the move
UndoInfo u;
- pos.do_move(move, u, dcCandidates);
+ pos.do_move(move, u);
// 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.
ss[ply].reduction = Depth(0);
value = -search(pos, ss, -(beta-1), newDepth, ply+1, true, threadID);
}
- pos.undo_move(move, u);
+ pos.undo_move(move);
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
&& !AbortSearch
&& !thread_should_stop(threadID)
&& split(pos, ss, ply, &beta, &beta, &bestValue, depth, &moveCount,
- &mp, dcCandidates, threadID, false))
+ &mp, threadID, false))
break;
}
MovePicker mp = MovePicker(pos, pvNode, MOVE_NONE, EmptySearchStack, depth, isCheck ? NULL : &ei);
Move move;
int moveCount = 0;
- Bitboard dcCandidates = mp.discovered_check_candidates();
- bool enoughMaterial = pos.non_pawn_material(pos.side_to_move()) > RookValueMidgame;
+ Color us = pos.side_to_move();
+ bool enoughMaterial = pos.non_pawn_material(us) > RookValueMidgame;
// Loop through the moves until no moves remain or a beta cutoff
// occurs.
&& !isCheck
&& !pvNode
&& !move_promotion(move)
- && !pos.move_is_check(move, dcCandidates)
+ && !pos.move_is_check(move)
&& !pos.move_is_passed_pawn_push(move))
{
Value futilityValue = staticValue
+ Max(pos.midgame_value_of_piece_on(move_to(move)),
pos.endgame_value_of_piece_on(move_to(move)))
+ (move_is_ep(move) ? PawnValueEndgame : Value(0))
- + FutilityMargin0
+ + FutilityMarginQS
+ ei.futilityMargin;
if (futilityValue < alpha)
// Make and search the move.
UndoInfo u;
- pos.do_move(move, u, dcCandidates);
+ pos.do_move(move, u);
Value value = -qsearch(pos, ss, -beta, -alpha, depth-OnePly, ply+1, threadID);
- pos.undo_move(move, u);
+ pos.undo_move(move);
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
{
assert(move_is_ok(move));
- bool moveIsCheck = pos.move_is_check(move, sp->dcCandidates);
+ bool moveIsCheck = pos.move_is_check(move);
bool moveIsCapture = pos.move_is_capture(move);
lock_grab(&(sp->lock));
// Decide the new search depth.
bool dangerous;
- Depth ext = extension(pos, move, false, moveIsCheck, false, false, &dangerous);
+ Depth ext = extension(pos, move, false, moveIsCapture, moveIsCheck, false, false, &dangerous);
Depth newDepth = sp->depth - OnePly + ext;
// Prune?
// Make and search the move.
UndoInfo u;
- pos.do_move(move, u, sp->dcCandidates);
+ pos.do_move(move, u);
// 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.
ss[sp->ply].reduction = Depth(0);
value = -search(pos, ss, -(sp->beta - 1), newDepth, sp->ply+1, true, threadID);
}
- pos.undo_move(move, u);
+ pos.undo_move(move);
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
&& !thread_should_stop(threadID)
&& (move = sp->mp->get_next_move(sp->lock)) != MOVE_NONE)
{
- bool moveIsCheck = pos.move_is_check(move, sp->dcCandidates);
+ bool moveIsCheck = pos.move_is_check(move);
bool moveIsCapture = pos.move_is_capture(move);
assert(move_is_ok(move));
// Decide the new search depth.
bool dangerous;
- Depth ext = extension(pos, move, true, moveIsCheck, false, false, &dangerous);
+ Depth ext = extension(pos, move, true, moveIsCapture, moveIsCheck, false, false, &dangerous);
Depth newDepth = sp->depth - OnePly + ext;
// Make and search the move.
UndoInfo u;
- pos.do_move(move, u, sp->dcCandidates);
+ pos.do_move(move, u);
// 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.
Threads[threadID].failHighPly1 = false;
}
}
- pos.undo_move(move, u);
+ pos.undo_move(move);
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
pos.do_move(moves[count].move, u);
moves[count].score = -qsearch(pos, ss, -VALUE_INFINITE, VALUE_INFINITE,
Depth(0), 1, 0);
- pos.undo_move(moves[count].move, u);
+ pos.undo_move(moves[count].move);
moves[count].pv[0] = moves[i].move;
moves[count].pv[1] = MOVE_NONE; // FIXME
count++;
// Case 4: The destination square for m2 is attacked by the moving piece
// in m1:
- if(pos.piece_attacks_square(t1, t2))
+ if(pos.piece_attacks_square(pos.piece_on(t1), t1, t2))
return true;
// Case 5: Discovered check, checking piece is the piece moved in m1:
// extended, as example because the corresponding UCI option is set to zero,
// the move is marked as 'dangerous' so, at least, we avoid to prune it.
- Depth extension(const Position &pos, Move m, bool pvNode, bool check,
+ Depth extension(const Position& pos, Move m, bool pvNode, bool capture, bool check,
bool singleReply, bool mateThreat, bool* dangerous) {
assert(m != MOVE_NONE);
if (mateThreat)
result += MateThreatExtension[pvNode];
- if (pos.move_is_pawn_push_to_7th(m))
+ if (pos.type_of_piece_on(move_from(m)) == PAWN)
{
- result += PawnPushTo7thExtension[pvNode];
- *dangerous = true;
- }
- if (pos.move_is_passed_pawn_push(m))
- {
- result += PassedPawnExtension[pvNode];
- *dangerous = true;
+ if (pos.move_is_pawn_push_to_7th(m))
+ {
+ result += PawnPushTo7thExtension[pvNode];
+ *dangerous = true;
+ }
+ if (pos.move_is_passed_pawn_push(m))
+ {
+ result += PassedPawnExtension[pvNode];
+ *dangerous = true;
+ }
}
- if ( pos.move_is_capture(m)
+ if ( capture
&& pos.type_of_piece_on(move_to(m)) != PAWN
&& ( pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK)
- pos.midgame_value_of_piece_on(move_to(m)) == Value(0))
}
if ( pvNode
- && pos.move_is_capture(m)
+ && capture
&& pos.type_of_piece_on(move_to(m)) != PAWN
&& pos.see(m) >= 0)
{
bool split(const Position &p, SearchStack *sstck, int ply,
Value *alpha, Value *beta, Value *bestValue,
- Depth depth, int *moves,
- MovePicker *mp, Bitboard dcCandidates, int master, bool pvNode) {
+ Depth depth, int *moves, MovePicker *mp, int master, bool pvNode) {
assert(p.is_ok());
assert(sstck != NULL);
assert(ply >= 0 && ply < PLY_MAX);
splitPoint->alpha = pvNode? *alpha : (*beta - 1);
splitPoint->beta = *beta;
splitPoint->pvNode = pvNode;
- splitPoint->dcCandidates = dcCandidates;
splitPoint->bestValue = *bestValue;
splitPoint->master = master;
splitPoint->mp = mp;
projects / stockfish / blobdiff