struct RootMove {
- RootMove();
- bool operator<(const RootMove&) const; // Used to sort
+ RootMove() { nodes = cumulativeNodes = ourBeta = theirBeta = 0ULL; }
+
+ // RootMove::operator<() is the comparison function used when
+ // sorting the moves. A move m1 is considered to be better
+ // than a move m2 if it has a higher score, or if the moves
+ // have equal score but m1 has the higher node count.
+ bool operator<(const RootMove& m) const {
+
+ return score != m.score ? score < m.score : theirBeta <= m.theirBeta;
+ }
Move move;
Value score;
public:
RootMoveList(Position& pos, Move searchMoves[]);
- inline Move get_move(int moveNum) const;
- inline Value get_move_score(int moveNum) const;
- inline void set_move_score(int moveNum, Value score);
- inline void set_move_nodes(int moveNum, int64_t nodes);
- inline void set_beta_counters(int moveNum, int64_t our, int64_t their);
+
+ int move_count() const { return count; }
+ Move get_move(int moveNum) const { return moves[moveNum].move; }
+ Value get_move_score(int moveNum) const { return moves[moveNum].score; }
+ void set_move_score(int moveNum, Value score) { moves[moveNum].score = score; }
+ Move get_move_pv(int moveNum, int i) const { return moves[moveNum].pv[i]; }
+ int64_t get_move_cumulative_nodes(int moveNum) const { return moves[moveNum].cumulativeNodes; }
+
+ void set_move_nodes(int moveNum, int64_t nodes);
+ void set_beta_counters(int moveNum, int64_t our, int64_t their);
void set_move_pv(int moveNum, const Move pv[]);
- inline Move get_move_pv(int moveNum, int i) const;
- inline int64_t get_move_cumulative_nodes(int moveNum) const;
- inline int move_count() const;
- inline void sort();
+ void sort();
void sort_multipv(int n);
private:
// evaluation of the position is more than NullMoveMargin below beta.
const Value NullMoveMargin = Value(0x300);
- // Pruning criterions. See the code and comments in ok_to_prune() to
- // understand their precise meaning.
- const bool PruneEscapeMoves = false;
- const bool PruneDefendingMoves = false;
- const bool PruneBlockingMoves = false;
-
// If the TT move is at least SingleReplyMargin better then the
// remaining ones we will extend it.
const Value SingleReplyMargin = Value(0x20);
bool ok_to_do_nullmove(const Position& pos);
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);
- void update_history(const Position& pos, Move m, Depth depth, Move movesSearched[], int moveCount);
+ Value refine_eval(const TTEntry* tte, Value defaultEval, int ply);
+ void update_history(const Position& pos, Move move, Depth depth, Move movesSearched[], int moveCount);
void update_killers(Move m, SearchStack& ss);
bool fail_high_ply_1();
//// Functions
////
+//FIXME: HACK
+static double lnArray[512];
+
+inline double ln(int i)
+{
+ return lnArray[i];
+}
/// perft() is our utility to verify move generation is bug free. All the legal
/// moves up to given depth are generated and counted and the sum returned.
/// and initializes the split point stack and the global locks and condition
/// objects.
+#include <cmath> //FIXME: HACK
+
void init_threads() {
+ // FIXME: HACK!!
+ for (int i = 0; i < 512; i++)
+ lnArray[i] = log(double(i));
+
volatile int i;
#if !defined(_MSC_VER)
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
// 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 ( depth >= 3*OnePly
- && moveCount >= LMRPVMoves
&& !dangerous
&& !captureOrPromotion
&& !move_is_castle(move)
&& !move_is_killer(move, ss[ply]))
{
- ss[ply].reduction = OnePly;
- value = -search(pos, ss, -alpha, newDepth-OnePly, ply+1, true, threadID);
+ 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);
+ }
+ else
+ value = alpha + 1; // Just to trigger next condition
}
else
value = alpha + 1; // Just to trigger next condition
return value_from_tt(tte->value(), ply);
}
- approximateEval = quick_evaluate(pos);
+ approximateEval = refine_eval(tte, quick_evaluate(pos), ply);
isCheck = pos.is_check();
// Null move search
pos.do_null_move(st);
// Null move dynamic reduction based on depth
- int R = (depth >= 5 * OnePly ? 4 : 3);
+ int R = 3 + (depth >= 5 * OnePly ? depth / 8 : 0);
// Null move dynamic reduction based on value
if (approximateEval - beta > PawnValueMidgame)
// 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 ( depth >= 3*OnePly
- && moveCount >= LMRNonPVMoves
&& !dangerous
&& !captureOrPromotion
&& !move_is_castle(move)
- && !move_is_killer(move, ss[ply]))
+ && !move_is_killer(move, ss[ply])
+ /* && move != ttMove*/)
{
- ss[ply].reduction = OnePly;
- value = -search(pos, ss, -(beta-1), newDepth-OnePly, ply+1, true, threadID);
+ double red = 0.5 + ln(moveCount) * ln(depth / 2) / 3.0;
+ if (red >= 1.0)
+ {
+ ss[ply].reduction = Depth(int(floor(red * int(OnePly))));
+ value = -search(pos, ss, -(beta-1), newDepth-ss[ply].reduction, ply+1, true, threadID);
+ }
+ else
+ value = beta; // Just to trigger next condition
}
else
value = beta; // Just to trigger next condition
// 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 ( !dangerous
- && moveCount >= LMRNonPVMoves
&& !captureOrPromotion
&& !move_is_castle(move)
&& !move_is_killer(move, ss[sp->ply]))
{
- ss[sp->ply].reduction = OnePly;
- value = -search(pos, ss, -(sp->beta-1), newDepth - OnePly, sp->ply+1, true, threadID);
+ double red = 0.5 + ln(moveCount) * ln(sp->depth / 2) / 3.0;
+ if (red >= 1.0)
+ {
+ 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
+ value = sp->beta; // Just to trigger next condition
}
else
value = sp->beta; // Just to trigger next condition
// 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 ( !dangerous
- && moveCount >= LMRPVMoves
&& !captureOrPromotion
&& !move_is_castle(move)
&& !move_is_killer(move, ss[sp->ply]))
{
- ss[sp->ply].reduction = OnePly;
- value = -search(pos, ss, -sp->alpha, newDepth - OnePly, sp->ply+1, true, threadID);
+ double red = 0.5 + ln(moveCount) * ln(sp->depth / 2) / 6.0;
+ if (red >= 1.0)
+ {
+ 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
+ value = sp->alpha + 1; // Just to trigger next condition
}
else
value = sp->alpha + 1; // Just to trigger next condition
}
- /// The RootMove class
-
- // Constructor
-
- RootMove::RootMove() {
- nodes = cumulativeNodes = ourBeta = theirBeta = 0ULL;
- }
-
- // RootMove::operator<() is the comparison function used when
- // sorting the moves. A move m1 is considered to be better
- // than a move m2 if it has a higher score, or if the moves
- // have equal score but m1 has the higher node count.
-
- bool RootMove::operator<(const RootMove& m) const {
-
- if (score != m.score)
- return (score < m.score);
-
- return theirBeta <= m.theirBeta;
- }
-
/// The RootMoveList class
- // Constructor
+ // RootMoveList c'tor
RootMoveList::RootMoveList(Position& pos, Move searchMoves[]) : count(0) {
}
- // Simple accessor methods for the RootMoveList class
-
- inline Move RootMoveList::get_move(int moveNum) const {
- return moves[moveNum].move;
- }
-
- inline Value RootMoveList::get_move_score(int moveNum) const {
- return moves[moveNum].score;
- }
+ // RootMoveList simple methods definitions
- inline void RootMoveList::set_move_score(int moveNum, Value score) {
- moves[moveNum].score = score;
- }
+ void RootMoveList::set_move_nodes(int moveNum, int64_t nodes) {
- inline void RootMoveList::set_move_nodes(int moveNum, int64_t nodes) {
moves[moveNum].nodes = nodes;
moves[moveNum].cumulativeNodes += nodes;
}
- inline void RootMoveList::set_beta_counters(int moveNum, int64_t our, int64_t their) {
+ void RootMoveList::set_beta_counters(int moveNum, int64_t our, int64_t their) {
+
moves[moveNum].ourBeta = our;
moves[moveNum].theirBeta = their;
}
void RootMoveList::set_move_pv(int moveNum, const Move pv[]) {
- int j;
- for (j = 0; pv[j] != MOVE_NONE; j++)
- moves[moveNum].pv[j] = pv[j];
- moves[moveNum].pv[j] = MOVE_NONE;
- }
- inline Move RootMoveList::get_move_pv(int moveNum, int i) const {
- return moves[moveNum].pv[i];
- }
+ int j;
- inline int64_t RootMoveList::get_move_cumulative_nodes(int moveNum) const {
- return moves[moveNum].cumulativeNodes;
- }
+ for (j = 0; pv[j] != MOVE_NONE; j++)
+ moves[moveNum].pv[j] = pv[j];
- inline int RootMoveList::move_count() const {
- return count;
+ moves[moveNum].pv[j] = MOVE_NONE;
}
// RootMoveList::sort() sorts the root move list at the beginning of a new
// iteration.
- inline void RootMoveList::sort() {
+ void RootMoveList::sort() {
- sort_multipv(count - 1); // all items
+ sort_multipv(count - 1); // Sort all items
}
void RootMoveList::sort_multipv(int n) {
- for (int i = 1; i <= n; i++)
+ int i,j;
+
+ for (i = 1; i <= n; i++)
{
- RootMove rm = moves[i];
- int j;
- for (j = i; j > 0 && moves[j-1] < rm; j--)
- moves[j] = moves[j-1];
- moves[j] = rm;
+ RootMove rm = moves[i];
+ for (j = i; j > 0 && moves[j - 1] < rm; j--)
+ moves[j] = moves[j - 1];
+
+ moves[j] = rm;
}
}
// init_node() is called at the beginning of all the search functions
- // (search(), search_pv(), qsearch(), and so on) and initializes the search
- // stack object corresponding to the current node. Once every
+ // (search(), search_pv(), qsearch(), and so on) and initializes the
+ // search stack object corresponding to the current node. Once every
// NodesBetweenPolls nodes, init_node() also calls poll(), which polls
// for user input and checks whether it is time to stop the search.
}
}
ss[ply].init(ply);
- ss[ply+2].initKillers();
+ ss[ply + 2].initKillers();
if (Threads[threadID].printCurrentLine)
print_current_line(ss, ply, threadID);
}
- // update_pv() is called whenever a search returns a value > alpha. It
- // updates the PV in the SearchStack object corresponding to the current
- // node.
+ // update_pv() is called whenever a search returns a value > alpha.
+ // It updates the PV in the SearchStack object corresponding to the
+ // current node.
void update_pv(SearchStack ss[], int ply) {
+
assert(ply >= 0 && ply < PLY_MAX);
- ss[ply].pv[ply] = ss[ply].currentMove;
int p;
- for (p = ply + 1; ss[ply+1].pv[p] != MOVE_NONE; p++)
- ss[ply].pv[p] = ss[ply+1].pv[p];
+
+ ss[ply].pv[ply] = ss[ply].currentMove;
+
+ for (p = ply + 1; ss[ply + 1].pv[p] != MOVE_NONE; p++)
+ ss[ply].pv[p] = ss[ply + 1].pv[p];
+
ss[ply].pv[p] = MOVE_NONE;
}
- // sp_update_pv() is a variant of update_pv for use at split points. The
+ // sp_update_pv() is a variant of update_pv for use at split points. The
// difference between the two functions is that sp_update_pv also updates
// the PV at the parent node.
void sp_update_pv(SearchStack* pss, SearchStack ss[], int ply) {
+
assert(ply >= 0 && ply < PLY_MAX);
- ss[ply].pv[ply] = pss[ply].pv[ply] = ss[ply].currentMove;
int p;
- for (p = ply + 1; ss[ply+1].pv[p] != MOVE_NONE; p++)
- ss[ply].pv[p] = pss[ply].pv[p] = ss[ply+1].pv[p];
+
+ ss[ply].pv[ply] = pss[ply].pv[ply] = ss[ply].currentMove;
+
+ for (p = ply + 1; ss[ply + 1].pv[p] != MOVE_NONE; p++)
+ ss[ply].pv[p] = pss[ply].pv[p] = ss[ply + 1].pv[p];
+
ss[ply].pv[p] = pss[ply].pv[p] = MOVE_NONE;
}
// connected_moves() tests whether two moves are 'connected' in the sense
// that the first move somehow made the second move possible (for instance
- // if the moving piece is the same in both moves). The first move is
- // assumed to be the move that was made to reach the current position, while
- // the second move is assumed to be a move from the current position.
+ // if the moving piece is the same in both moves). The first move is assumed
+ // to be the move that was made to reach the current position, while the
+ // second move is assumed to be a move from the current position.
bool connected_moves(const Position& pos, Move m1, Move m2) {
&& bit_is_set(squares_between(f2, t2), f1))
return true;
- // Case 4: The destination square for m2 is attacked by the moving piece in m1
+ // Case 4: The destination square for m2 is defended by the moving piece in m1
p = pos.piece_on(t1);
if (bit_is_set(pos.attacks_from(p, t1), t2))
return true;
// Case 5: Discovered check, checking piece is the piece moved in m1
- if ( piece_is_slider(p)
- && bit_is_set(squares_between(t1, pos.king_square(pos.side_to_move())), f2)
+ if ( piece_is_slider(p)
+ && bit_is_set(squares_between(t1, pos.king_square(pos.side_to_move())), f2)
&& !bit_is_set(squares_between(t1, pos.king_square(pos.side_to_move())), t2))
{
- Bitboard occ = pos.occupied_squares();
- Color us = pos.side_to_move();
- Square ksq = pos.king_square(us);
- clear_bit(&occ, f2);
- if (type_of_piece(p) == BISHOP)
- {
- if (bit_is_set(bishop_attacks_bb(ksq, occ), t1))
- return true;
- }
- else if (type_of_piece(p) == ROOK)
- {
- if (bit_is_set(rook_attacks_bb(ksq, occ), t1))
- return true;
- }
- else
- {
- assert(type_of_piece(p) == QUEEN);
- if (bit_is_set(queen_attacks_bb(ksq, occ), t1))
- return true;
- }
+ // discovered_check_candidates() works also if the Position's side to
+ // move is the opposite of the checking piece.
+ Color them = opposite_color(pos.side_to_move());
+ Bitboard dcCandidates = pos.discovered_check_candidates(them);
+
+ if (bit_is_set(dcCandidates, f2))
+ return true;
}
return false;
}
// extension() decides whether a move should be searched with normal depth,
- // or with extended depth. Certain classes of moves (checking moves, in
+ // or with extended depth. Certain classes of moves (checking moves, in
// particular) are searched with bigger depth than ordinary moves and in
// any case are marked as 'dangerous'. Note that also if a move is not
// extended, as example because the corresponding UCI option is set to zero,
// ok_to_do_nullmove() looks at the current position and decides whether
- // doing a 'null move' should be allowed. In order to avoid zugzwang
+ // doing a 'null move' should be allowed. In order to avoid zugzwang
// problems, null moves are not allowed when the side to move has very
- // little material left. Currently, the test is a bit too simple: Null
- // moves are avoided only when the side to move has only pawns left. It's
- // probably a good idea to avoid null moves in at least some more
+ // little material left. Currently, the test is a bit too simple: Null
+ // moves are avoided only when the side to move has only pawns left.
+ // It's probably a good idea to avoid null moves in at least some more
// complicated endgames, e.g. KQ vs KR. FIXME
bool ok_to_do_nullmove(const Position& pos) {
}
- // ok_to_prune() tests whether it is safe to forward prune a move. Only
+ // ok_to_prune() tests whether it is safe to forward prune a move. Only
// non-tactical moves late in the move list close to the leaves are
// candidates for pruning.
Square mfrom, mto, tfrom, tto;
+ // Prune if there isn't any threat move and
+ // is not a castling move (common case).
+ if (threat == MOVE_NONE && !move_is_castle(m))
+ return true;
+
mfrom = move_from(m);
mto = move_to(m);
tfrom = move_from(threat);
return false;
// Case 2: Don't prune moves which move the threatened piece
- if (!PruneEscapeMoves && threat != MOVE_NONE && mfrom == tto)
+ if (mfrom == tto)
return false;
// Case 3: If the threatened piece has value less than or equal to the
// value of the threatening piece, don't prune move which defend it.
- if ( !PruneDefendingMoves
- && threat != MOVE_NONE
- && pos.move_is_capture(threat)
+ if ( pos.move_is_capture(threat)
&& ( pos.midgame_value_of_piece_on(tfrom) >= pos.midgame_value_of_piece_on(tto)
|| pos.type_of_piece_on(tfrom) == KING)
&& pos.move_attacks_square(m, tto))
// Case 4: If the moving piece in the threatened move is a slider, don't
// prune safe moves which block its ray.
- if ( !PruneBlockingMoves
- && threat != MOVE_NONE
- && piece_is_slider(pos.piece_on(tfrom))
+ if ( piece_is_slider(pos.piece_on(tfrom))
&& bit_is_set(squares_between(tfrom, tto), mto)
&& pos.see_sign(m) >= 0)
return false;
}
+ // refine_eval() returns the transposition table score if
+ // possible otherwise falls back on static position evaluation.
+
+ Value refine_eval(const TTEntry* tte, Value defaultEval, int ply) {
+
+ if (!tte)
+ return defaultEval;
+
+ Value v = value_from_tt(tte->value(), ply);
+
+ if ( (is_lower_bound(tte->type()) && v >= defaultEval)
+ || (is_upper_bound(tte->type()) && v < defaultEval))
+ return v;
+
+ return defaultEval;
+ }
+
// update_history() registers a good move that produced a beta-cutoff
// in history and marks as failures all the other moves of that ply.
- void update_history(const Position& pos, Move m, Depth depth,
+ void update_history(const Position& pos, Move move, Depth depth,
Move movesSearched[], int moveCount) {
- H.success(pos.piece_on(move_from(m)), move_to(m), depth);
+ Move m;
+
+ H.success(pos.piece_on(move_from(move)), move_to(move), depth);
for (int i = 0; i < moveCount - 1; i++)
{
- assert(m != movesSearched[i]);
- if (!pos.move_is_capture_or_promotion(movesSearched[i]))
- H.failure(pos.piece_on(move_from(movesSearched[i])), move_to(movesSearched[i]), depth);
+ m = movesSearched[i];
+
+ assert(m != move);
+
+ if (!pos.move_is_capture_or_promotion(m))
+ H.failure(pos.piece_on(move_from(m)), move_to(m), depth);
}
}
// fail_high_ply_1() checks if some thread is currently resolving a fail
// high at ply 1 at the node below the first root node. This information
- // is used for time managment.
+ // is used for time management.
bool fail_high_ply_1() {
if (AllThreadsShouldExit && threadID != 0)
break;
- // If we are not thinking, wait for a condition to be signaled instead
- // of wasting CPU time polling for work.
+ // If we are not thinking, wait for a condition to be signaled
+ // instead of wasting CPU time polling for work.
while (threadID != 0 && (Idle || threadID >= ActiveThreads))
{
// thread_should_stop() checks whether the thread with a given threadID has
// been asked to stop, directly or indirectly. This can happen if a beta
- // cutoff has occured in the thread's currently active split point, or in
+ // cutoff has occurred in the thread's currently active split point, or in
// some ancestor of the current split point.
bool thread_should_stop(int threadID) {
if (ActiveThreads == 2)
return true;
- // Apply the "helpful master" concept if possible.
+ // Apply the "helpful master" concept if possible
if (SplitPointStack[slave][Threads[slave].activeSplitPoints - 1].slaves[master])
return true;
projects / stockfish / blobdiff