Depth depth, int ply, int threadID);
void sp_search(SplitPoint *sp, int threadID);
void sp_search_pv(SplitPoint *sp, int threadID);
- void init_search_stack(SearchStack& ss);
- void init_search_stack(SearchStack ss[]);
void init_node(const Position &pos, SearchStack ss[], int ply, int threadID);
void update_pv(SearchStack ss[], int ply);
void sp_update_pv(SearchStack *pss, SearchStack ss[], int ply);
bool thread_is_available(int slave, int master);
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);
+ Value *alpha, Value *beta, Value *bestValue, Depth depth, int *moves,
+ MovePicker *mp, Bitboard dcCandidates, int master, bool pvNode);
void wake_sleeping_threads();
#if !defined(_MSC_VER)
SearchStack EmptySearchStack;
+// SearchStack::init() initializes a search stack. Used at the beginning of a
+// new search from the root.
+void SearchStack::init(int ply) {
+
+ pv[ply] = pv[ply + 1] = MOVE_NONE;
+ currentMove = threatMove = MOVE_NONE;
+ reduction = Depth(0);
+ currentMoveCaptureValue = Value(0);
+}
+
+void SearchStack::initKillers() {
+
+ mateKiller = MOVE_NONE;
+ for (int i = 0; i < KILLER_MAX; i++)
+ killers[i] = MOVE_NONE;
+}
+
+
////
//// Functions
////
}
// Init also the empty search stack
- init_search_stack(EmptySearchStack);
+ EmptySearchStack.init(0);
+ EmptySearchStack.initKillers();
}
// Initialize
TT.new_search();
H.clear();
- init_search_stack(ss);
-
+ for (int i = 0; i < 3; i++)
+ {
+ ss[i].init(i);
+ ss[i].initKillers();
+ }
ValueByIteration[0] = Value(0);
ValueByIteration[1] = rml.get_move_score(0);
Iteration = 1;
if (dbg_show_hit_rate)
dbg_print_hit_rate(LogFile);
- UndoInfo u;
+ StateInfo st;
LogFile << "Nodes: " << nodes_searched() << std::endl
<< "Nodes/second: " << nps() << std::endl
<< "Best move: " << move_to_san(p, ss[0].pv[0]) << std::endl;
- p.do_move(ss[0].pv[0], u);
+ p.do_move(ss[0].pv[0], st);
LogFile << "Ponder move: " << move_to_san(p, ss[0].pv[1])
<< std::endl << std::endl;
}
{
int64_t nodes;
Move move;
- UndoInfo u;
+ StateInfo st;
Depth ext, newDepth;
RootMoveNumber = i + 1;
newDepth = (Iteration - 2) * OnePly + ext + InitialDepth;
// Make the move, and search it
- pos.do_move(move, u, dcCandidates);
+ pos.do_move(move, st, dcCandidates);
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
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);
+ bool moveIsCheck = pos.move_is_check(move, dcCandidates);
bool moveIsCapture = pos.move_is_capture(move);
movesSearched[moveCount++] = ss[ply].currentMove = move;
Depth newDepth = depth - OnePly + ext;
// Make and search the move
- UndoInfo u;
- pos.do_move(move, u, dcCandidates);
+ StateInfo st;
+ pos.do_move(move, st, dcCandidates);
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);
{
ss[ply].currentMove = MOVE_NULL;
- UndoInfo u;
- pos.do_null_move(u);
+ StateInfo st;
+ pos.do_null_move(st);
int R = (depth >= 4 * OnePly ? 4 : 3); // Null move dynamic reduction
Value nullValue = -search(pos, ss, -(beta-1), depth-R*OnePly, ply+1, false, threadID);
&& pos.see(ss[ply + 1].currentMove) + nullValue >= beta)
nullDrivenIID = true;
- pos.undo_null_move(u);
+ pos.undo_null_move();
if (value_is_mate(nullValue))
{
assert(move_is_ok(move));
bool singleReply = (isCheck && mp.number_of_moves() == 1);
- bool moveIsCheck = pos.move_is_check(move);
+ bool moveIsCheck = pos.move_is_check(move, dcCandidates);
bool moveIsCapture = pos.move_is_capture(move);
movesSearched[moveCount++] = ss[ply].currentMove = move;
}
// Make and search the move
- UndoInfo u;
- pos.do_move(move, u, dcCandidates);
+ StateInfo st;
+ pos.do_move(move, st, dcCandidates);
// 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);
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)
+ && !pos.move_is_check(move, dcCandidates)
&& !pos.move_is_passed_pawn_push(move))
{
Value futilityValue = staticValue
continue;
// Make and search the move.
- UndoInfo u;
- pos.do_move(move, u, dcCandidates);
+ StateInfo st;
+ pos.do_move(move, st, dcCandidates);
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);
&& (move = sp->mp->get_next_move(sp->lock)) != MOVE_NONE)
{
assert(move_is_ok(move));
- assert(pos.discovered_check_candidates(pos.side_to_move()) == sp->dcCandidates);
- bool moveIsCheck = pos.move_is_check(move);
+ bool moveIsCheck = pos.move_is_check(move, sp->dcCandidates);
bool moveIsCapture = pos.move_is_capture(move);
lock_grab(&(sp->lock));
continue;
// Make and search the move.
- UndoInfo u;
- pos.do_move(move, u, sp->dcCandidates);
+ StateInfo st;
+ pos.do_move(move, st, sp->dcCandidates);
// 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)
{
- assert(pos.discovered_check_candidates(pos.side_to_move()) == sp->dcCandidates);
-
- bool moveIsCheck = pos.move_is_check(move);
+ bool moveIsCheck = pos.move_is_check(move, sp->dcCandidates);
bool moveIsCapture = pos.move_is_capture(move);
assert(move_is_ok(move));
Depth newDepth = sp->depth - OnePly + ext;
// Make and search the move.
- UndoInfo u;
- pos.do_move(move, u, sp->dcCandidates);
+ StateInfo st;
+ pos.do_move(move, st, sp->dcCandidates);
// 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);
if (includeMove)
{
// Find a quick score for the move
- UndoInfo u;
+ StateInfo st;
SearchStack ss[PLY_MAX_PLUS_2];
moves[count].move = mlist[i].move;
moves[count].nodes = 0ULL;
- pos.do_move(moves[count].move, u);
+ pos.do_move(moves[count].move, st);
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++;
}
- // init_search_stack() initializes a search stack at the beginning of a
- // new search from the root.
- void init_search_stack(SearchStack& ss) {
-
- ss.pv[0] = MOVE_NONE;
- ss.pv[1] = MOVE_NONE;
- ss.currentMove = MOVE_NONE;
- ss.threatMove = MOVE_NONE;
- ss.reduction = Depth(0);
- for (int j = 0; j < KILLER_MAX; j++)
- ss.killers[j] = MOVE_NONE;
- }
-
- void init_search_stack(SearchStack ss[]) {
-
- for (int i = 0; i < 3; i++)
- {
- ss[i].pv[i] = MOVE_NONE;
- ss[i].pv[i+1] = MOVE_NONE;
- ss[i].currentMove = MOVE_NONE;
- ss[i].threatMove = MOVE_NONE;
- ss[i].reduction = Depth(0);
- for (int j = 0; j < KILLER_MAX; j++)
- ss[i].killers[j] = MOVE_NONE;
- }
- }
-
-
// 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
NodesSincePoll = 0;
}
}
- ss[ply].pv[ply] = ss[ply].pv[ply+1] = ss[ply].currentMove = MOVE_NONE;
- ss[ply+2].mateKiller = MOVE_NONE;
- ss[ply].threatMove = MOVE_NONE;
- ss[ply].reduction = Depth(0);
- ss[ply].currentMoveCaptureValue = Value(0);
- for (int j = 0; j < KILLER_MAX; j++)
- ss[ply+2].killers[j] = MOVE_NONE;
+
+ ss[ply].init(ply);
+ ss[ply+2].initKillers();
if(Threads[threadID].printCurrentLine)
print_current_line(ss, ply, threadID);
// splitPoint->cpus becomes 0), split() returns true.
bool split(const Position &p, SearchStack *sstck, int ply,
- Value *alpha, Value *beta, Value *bestValue,
- Depth depth, int *moves,
+ Value *alpha, Value *beta, Value *bestValue, Depth depth, int *moves,
MovePicker *mp, Bitboard dcCandidates, int master, bool pvNode) {
+
assert(p.is_ok());
assert(sstck != NULL);
assert(ply >= 0 && ply < PLY_MAX);
projects / stockfish / blobdiff