HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-21 01:27:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use Depth instead of int in search

Browse Source 
And make it more ONE_PLY value independent,
although we are not there yet.

No functional change.

Resolves #111
This commit is contained in:
Marco Costalba
2014-11-10 15:09:36 +01:00
committed by Joona Kiiski
parent c6d45c60b5
commit db4b8ee000
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/search.cpp
View File

@@ -88,7 +88,7 @@ namespace {
Value value_to_tt(Value v, int ply); Value value_to_tt(Value v, int ply);
Value value_from_tt(Value v, int ply); Value value_from_tt(Value v, int ply);
void update_stats(const Position& pos, Stack* ss, Move move, Depth depth, Move* quiets, int quietsCnt); void update_stats(const Position& pos, Stack* ss, Move move, Depth depth, Move* quiets, int quietsCnt);
string uci_pv(const Position& pos, int depth, Value alpha, Value beta); string uci_pv(const Position& pos, Depth depth, Value alpha, Value beta);
struct Skill { struct Skill {
Skill(int l, size_t rootSize) : level(l), Skill(int l, size_t rootSize) : level(l),
@@ -101,7 +101,7 @@ namespace {
} }
size_t candidates_size() const { return candidates; } size_t candidates_size() const { return candidates; }
bool time_to_pick(int depth) const { return depth == 1 + level; } bool time_to_pick(Depth depth) const { return depth == 1 + level; }
Move pick_move(); Move pick_move();
int level; int level;
@@ -239,12 +239,12 @@ namespace {
void id_loop(Position& pos) { void id_loop(Position& pos) {
Stack stack[MAX_PLY+4], *ss = stack+2; // To allow referencing (ss-2) and (ss+2) Stack stack[MAX_PLY+4], *ss = stack+2; // To allow referencing (ss-2) and (ss+2)
int depth; Depth depth;
Value bestValue, alpha, beta, delta; Value bestValue, alpha, beta, delta;
std::memset(ss-2, 0, 5 * sizeof(Stack)); std::memset(ss-2, 0, 5 * sizeof(Stack));
depth = 0; depth = DEPTH_ZERO;
BestMoveChanges = 0; BestMoveChanges = 0;
bestValue = delta = alpha = -VALUE_INFINITE; bestValue = delta = alpha = -VALUE_INFINITE;
beta = VALUE_INFINITE; beta = VALUE_INFINITE;
@@ -277,7 +277,7 @@ namespace {
for (PVIdx = 0; PVIdx < std::min(multiPV, RootMoves.size()) && !Signals.stop; ++PVIdx) for (PVIdx = 0; PVIdx < std::min(multiPV, RootMoves.size()) && !Signals.stop; ++PVIdx)
{ {
// Reset aspiration window starting size // Reset aspiration window starting size
if (depth >= 5) if (depth >= 5 * ONE_PLY)
{ {
delta = Value(16); delta = Value(16);
alpha = std::max(RootMoves[PVIdx].prevScore - delta,-VALUE_INFINITE); alpha = std::max(RootMoves[PVIdx].prevScore - delta,-VALUE_INFINITE);
@@ -289,7 +289,7 @@ namespace {
// high/low anymore. // high/low anymore.
while (true) while (true)
{ {
bestValue = search<Root, false>(pos, ss, alpha, beta, depth * ONE_PLY, false); bestValue = search<Root, false>(pos, ss, alpha, beta, depth, false);
// Bring the best move to the front. It is critical that sorting // Bring the best move to the front. It is critical that sorting
// is done with a stable algorithm because all the values but the // is done with a stable algorithm because all the values but the
@@ -362,7 +362,7 @@ namespace {
if (Limits.use_time_management() && !Signals.stop && !Signals.stopOnPonderhit) if (Limits.use_time_management() && !Signals.stop && !Signals.stopOnPonderhit)
{ {
// Take some extra time if the best move has changed // Take some extra time if the best move has changed
if (depth > 4 && multiPV == 1) if (depth > 4 * ONE_PLY && multiPV == 1)
TimeMgr.pv_instability(BestMoveChanges); TimeMgr.pv_instability(BestMoveChanges);
// Stop the search if only one legal move is available or all // Stop the search if only one legal move is available or all
@@ -1303,7 +1303,7 @@ moves_loop: // When in check and at SpNode search starts from here
// requires that all (if any) unsearched PV lines are sent using a previous // requires that all (if any) unsearched PV lines are sent using a previous
// search score. // search score.
string uci_pv(const Position& pos, int depth, Value alpha, Value beta) { string uci_pv(const Position& pos, Depth depth, Value alpha, Value beta) {
std::stringstream ss; std::stringstream ss;
Time::point elapsed = Time::now() - SearchTime + 1; Time::point elapsed = Time::now() - SearchTime + 1;
@@ -1321,13 +1321,13 @@ moves_loop: // When in check and at SpNode search starts from here
if (depth == 1 && !updated) if (depth == 1 && !updated)
continue; continue;
int d = updated ? depth : depth - 1; Depth d = updated ? depth : depth - ONE_PLY;
Value v = updated ? RootMoves[i].score : RootMoves[i].prevScore; Value v = updated ? RootMoves[i].score : RootMoves[i].prevScore;
if (ss.rdbuf()->in_avail()) // Not at first line if (ss.rdbuf()->in_avail()) // Not at first line
ss << "\n"; ss << "\n";
ss << "info depth " << d ss << "info depth " << d / ONE_PLY
<< " seldepth " << selDepth << " seldepth " << selDepth
<< " multipv " << i + 1 << " multipv " << i + 1
<< " score " << (i == PVIdx ? UCI::format_value(v, alpha, beta) : UCI::format_value(v)) << " score " << (i == PVIdx ? UCI::format_value(v, alpha, beta) : UCI::format_value(v))