void extract_pv_from_tt(Position& pos);
void insert_pv_in_tt(Position& pos);
- std::string pv_info_to_uci(Position& pos, Value alpha, Value beta, int pvLine = 0);
+ std::string pv_info_to_uci(Position& pos, Depth depth, Value alpha, Value beta, int pvLine = 0);
int64_t nodes;
Value pv_score;
typedef std::vector<RootMove> Base;
- RootMoveList(Position& pos, Move searchMoves[]);
+ void init(Position& pos, Move searchMoves[]);
void set_non_pv_scores(const Position& pos, Move ttm, SearchStack* ss);
void sort() { insertion_sort<RootMove, Base::iterator>(begin(), end()); }
void sort_multipv(int n) { insertion_sort<RootMove, Base::iterator>(begin(), begin() + n); }
+
+ int bestMoveChanges;
};
Book OpeningBook;
// Pointer to root move list
- RootMoveList* Rml;
-
- // Iteration counter
- int Iteration;
-
- // Scores and number of times the best move changed for each iteration
- Value ValueByIteration[PLY_MAX_PLUS_2];
- int BestMoveChangesByIteration[PLY_MAX_PLUS_2];
-
- // Search window management
- int AspirationDelta;
+ RootMoveList Rml;
// MultiPV mode
int MultiPV;
template<> struct MovePickerExt<false, true> {
MovePickerExt(const Position&, Move, Depth, const History&, SearchStack*, Value)
- : rm(Rml->begin()), firstCall(true) {}
+ : rm(Rml.begin()), firstCall(true) {}
Move get_next_move() {
else
firstCall = false;
- return rm != Rml->end() ? rm->pv[0] : MOVE_NONE;
+ return rm != Rml.end() ? rm->pv[0] : MOVE_NONE;
}
- int number_of_evasions() const { return (int)Rml->size(); }
+ int number_of_evasions() const { return (int)Rml.size(); }
RootMoveList::iterator rm;
bool firstCall;
Move id_loop(Position& pos, Move searchMoves[], Move* ponderMove) {
SearchStack ss[PLY_MAX_PLUS_2];
+
Depth depth;
Move EasyMove = MOVE_NONE;
Value value, alpha = -VALUE_INFINITE, beta = VALUE_INFINITE;
int researchCountFL, researchCountFH;
+ int iteration;
+ int bestMoveChanges[PLY_MAX_PLUS_2];
+ Value values[PLY_MAX_PLUS_2];
+ int aspirationDelta = 0;
+
// Moves to search are verified, scored and sorted
- RootMoveList rml(pos, searchMoves);
- Rml = &rml;
+ Rml.init(pos, searchMoves);
// Handle special case of searching on a mate/stale position
- if (rml.size() == 0)
+ if (Rml.size() == 0)
{
Value s = (pos.is_check() ? -VALUE_MATE : VALUE_DRAW);
TT.new_search();
H.clear();
init_ss_array(ss, PLY_MAX_PLUS_2);
- ValueByIteration[1] = rml[0].pv_score;
- Iteration = 1;
+ values[1] = Rml[0].pv_score;
+ iteration = 1;
// Send initial RootMoveList scoring (iteration 1)
cout << set960(pos.is_chess960()) // Is enough to set once at the beginning
- << "info depth " << Iteration
- << "\n" << rml[0].pv_info_to_uci(pos, alpha, beta) << endl;
+ << "info depth " << iteration
+ << "\n" << Rml[0].pv_info_to_uci(pos, ONE_PLY, alpha, beta) << endl;
// Is one move significantly better than others after initial scoring ?
- if ( rml.size() == 1
- || rml[0].pv_score > rml[1].pv_score + EasyMoveMargin)
- EasyMove = rml[0].pv[0];
+ if ( Rml.size() == 1
+ || Rml[0].pv_score > Rml[1].pv_score + EasyMoveMargin)
+ EasyMove = Rml[0].pv[0];
// Iterative deepening loop
- while (Iteration < PLY_MAX)
+ while (iteration < PLY_MAX)
{
// Initialize iteration
- Iteration++;
- BestMoveChangesByIteration[Iteration] = 0;
+ iteration++;
+ Rml.bestMoveChanges = 0;
- cout << "info depth " << Iteration << endl;
+ cout << "info depth " << iteration << endl;
// Calculate dynamic aspiration window based on previous iterations
- if (MultiPV == 1 && Iteration >= 6 && abs(ValueByIteration[Iteration - 1]) < VALUE_KNOWN_WIN)
+ if (MultiPV == 1 && iteration >= 6 && abs(values[iteration - 1]) < VALUE_KNOWN_WIN)
{
- int prevDelta1 = ValueByIteration[Iteration - 1] - ValueByIteration[Iteration - 2];
- int prevDelta2 = ValueByIteration[Iteration - 2] - ValueByIteration[Iteration - 3];
+ int prevDelta1 = values[iteration - 1] - values[iteration - 2];
+ int prevDelta2 = values[iteration - 2] - values[iteration - 3];
- AspirationDelta = Max(abs(prevDelta1) + abs(prevDelta2) / 2, 16);
- AspirationDelta = (AspirationDelta + 7) / 8 * 8; // Round to match grainSize
+ aspirationDelta = Max(abs(prevDelta1) + abs(prevDelta2) / 2, 16);
+ aspirationDelta = (aspirationDelta + 7) / 8 * 8; // Round to match grainSize
- alpha = Max(ValueByIteration[Iteration - 1] - AspirationDelta, -VALUE_INFINITE);
- beta = Min(ValueByIteration[Iteration - 1] + AspirationDelta, VALUE_INFINITE);
+ alpha = Max(values[iteration - 1] - aspirationDelta, -VALUE_INFINITE);
+ beta = Min(values[iteration - 1] + aspirationDelta, VALUE_INFINITE);
}
- depth = (Iteration - 2) * ONE_PLY + InitialDepth;
+ depth = (iteration - 2) * ONE_PLY + InitialDepth;
researchCountFL = researchCountFH = 0;
while (true)
{
// Sort the moves before to (re)search
- rml.set_non_pv_scores(pos, rml[0].pv[0], ss);
- rml.sort();
+ Rml.set_non_pv_scores(pos, Rml[0].pv[0], ss);
+ Rml.sort();
- // Search to the current depth, rml is updated and sorted
+ // Search to the current depth
value = search<PV, false, true>(pos, ss, alpha, beta, depth, 0);
- // Sort the moves before to return
- rml.sort();
+ // Sort the moves and write PV lines to transposition table, in case
+ // the relevant entries have been overwritten during the search.
+ Rml.sort();
+ for (int i = 0; i < Min(MultiPV, (int)Rml.size()); i++)
+ Rml[i].insert_pv_in_tt(pos);
- // Write PV lines to transposition table, in case the relevant entries
- // have been overwritten during the search.
- for (int i = 0; i < Min(MultiPV, (int)rml.size()); i++)
- rml[i].insert_pv_in_tt(pos);
+ bestMoveChanges[iteration] = Rml.bestMoveChanges;
if (StopRequest)
break;
if (value >= beta)
{
// Prepare for a research after a fail high, each time with a wider window
- beta = Min(beta + AspirationDelta * (1 << researchCountFH), VALUE_INFINITE);
+ beta = Min(beta + aspirationDelta * (1 << researchCountFH), VALUE_INFINITE);
researchCountFH++;
}
else if (value <= alpha)
StopOnPonderhit = false;
// Prepare for a research after a fail low, each time with a wider window
- alpha = Max(alpha - AspirationDelta * (1 << researchCountFL), -VALUE_INFINITE);
+ alpha = Max(alpha - aspirationDelta * (1 << researchCountFL), -VALUE_INFINITE);
researchCountFL++;
}
else
break; // Value cannot be trusted. Break out immediately!
//Save info about search result
- ValueByIteration[Iteration] = value;
+ values[iteration] = value;
// Drop the easy move if differs from the new best move
- if (rml[0].pv[0] != EasyMove)
+ if (Rml[0].pv[0] != EasyMove)
EasyMove = MOVE_NONE;
if (UseTimeManagement)
{
// Time to stop?
- bool stopSearch = false;
+ bool noMoreTime = false;
// Stop search early if there is only a single legal move,
// we search up to Iteration 6 anyway to get a proper score.
- if (Iteration >= 6 && rml.size() == 1)
- stopSearch = true;
+ if (iteration >= 6 && Rml.size() == 1)
+ noMoreTime = true;
// Stop search early when the last two iterations returned a mate score
- if ( Iteration >= 6
- && abs(ValueByIteration[Iteration]) >= abs(VALUE_MATE) - 100
- && abs(ValueByIteration[Iteration-1]) >= abs(VALUE_MATE) - 100)
- stopSearch = true;
+ if ( iteration >= 6
+ && abs(values[iteration]) >= abs(VALUE_MATE) - 100
+ && abs(values[iteration-1]) >= abs(VALUE_MATE) - 100)
+ noMoreTime = true;
// Stop search early if one move seems to be much better than the others
- if ( Iteration >= 8
- && EasyMove == rml[0].pv[0]
- && ( ( rml[0].nodes > (pos.nodes_searched() * 85) / 100
+ if ( iteration >= 8
+ && EasyMove == Rml[0].pv[0]
+ && ( ( Rml[0].nodes > (pos.nodes_searched() * 85) / 100
&& current_search_time() > TimeMgr.available_time() / 16)
- ||( rml[0].nodes > (pos.nodes_searched() * 98) / 100
+ ||( Rml[0].nodes > (pos.nodes_searched() * 98) / 100
&& current_search_time() > TimeMgr.available_time() / 32)))
- stopSearch = true;
+ noMoreTime = true;
// Add some extra time if the best move has changed during the last two iterations
- if (Iteration > 5 && Iteration <= 50)
- TimeMgr.pv_instability(BestMoveChangesByIteration[Iteration],
- BestMoveChangesByIteration[Iteration-1]);
+ if (iteration > 5 && iteration <= 50)
+ TimeMgr.pv_instability(bestMoveChanges[iteration], bestMoveChanges[iteration-1]);
// Stop search if most of MaxSearchTime is consumed at the end of the
// iteration. We probably don't have enough time to search the first
// move at the next iteration anyway.
if (current_search_time() > (TimeMgr.available_time() * 80) / 128)
- stopSearch = true;
+ noMoreTime = true;
- if (stopSearch)
+ if (noMoreTime)
{
if (Pondering)
StopOnPonderhit = true;
}
}
- if (MaxDepth && Iteration >= MaxDepth)
+ if (MaxDepth && iteration >= MaxDepth)
break;
}
- *ponderMove = rml[0].pv[1];
- return rml[0].pv[0];
+ *ponderMove = Rml[0].pv[1];
+ return Rml[0].pv[0];
}
// iteration. This information is used for time managment: When
// the best move changes frequently, we allocate some more time.
if (!isPvMove && MultiPV == 1)
- BestMoveChangesByIteration[Iteration]++;
+ Rml.bestMoveChanges++;
// Inform GUI that PV has changed, in case of multi-pv UCI protocol
// requires we send all the PV lines properly sorted.
- Rml->sort_multipv(moveCount);
+ Rml.sort_multipv(moveCount);
- for (int j = 0; j < Min(MultiPV, (int)Rml->size()); j++)
- cout << (*Rml)[j].pv_info_to_uci(pos, alpha, beta, j) << endl;
+ for (int j = 0; j < Min(MultiPV, (int)Rml.size()); j++)
+ cout << Rml[j].pv_info_to_uci(pos, depth, alpha, beta, j) << endl;
// Update alpha. In multi-pv we don't use aspiration window
if (MultiPV == 1)
alpha = bestValue = value;
}
else // Set alpha equal to minimum score among the PV lines
- alpha = bestValue = (*Rml)[Min(moveCount, MultiPV) - 1].pv_score; // FIXME why moveCount?
+ alpha = bestValue = Rml[Min(moveCount, MultiPV) - 1].pv_score; // FIXME why moveCount?
} // PV move or new best move
}
&& bestValue < beta
&& ThreadsMgr.available_thread_exists(threadID)
&& !StopRequest
- && !ThreadsMgr.cutoff_at_splitpoint(threadID)
- && Iteration <= 99)
+ && !ThreadsMgr.cutoff_at_splitpoint(threadID))
ThreadsMgr.split<FakeSplit>(pos, ss, ply, &alpha, beta, &bestValue, depth,
threatMove, mateThreat, moveCount, (MovePicker*)&mp, PvNode);
}
// formatted according to UCI specification and eventually writes the info
// to a log file. It is called at each iteration or after a new pv is found.
- std::string RootMove::pv_info_to_uci(Position& pos, Value alpha, Value beta, int pvLine) {
+ std::string RootMove::pv_info_to_uci(Position& pos, Depth depth, Value alpha, Value beta, int pvLine) {
std::stringstream s, l;
Move* m = pv;
while (*m != MOVE_NONE)
l << *m++ << " ";
- s << "info depth " << Iteration // FIXME
+ s << "info depth " << depth / ONE_PLY
<< " seldepth " << int(m - pv)
<< " multipv " << pvLine + 1
<< " score " << value_to_uci(pv_score)
ValueType t = pv_score >= beta ? VALUE_TYPE_LOWER :
pv_score <= alpha ? VALUE_TYPE_UPPER : VALUE_TYPE_EXACT;
- LogFile << pretty_pv(pos, current_search_time(), Iteration, pv_score, t, pv) << endl;
+ LogFile << pretty_pv(pos, current_search_time(), depth / ONE_PLY, pv_score, t, pv) << endl;
}
return s.str();
}
- RootMoveList::RootMoveList(Position& pos, Move searchMoves[]) {
+ void RootMoveList::init(Position& pos, Move searchMoves[]) {
SearchStack ss[PLY_MAX_PLUS_2];
MoveStack mlist[MOVES_MAX];
// Initialize search stack
init_ss_array(ss, PLY_MAX_PLUS_2);
ss[0].eval = ss[0].evalMargin = VALUE_NONE;
+ bestMoveChanges = 0;
+ clear();
// Generate all legal moves
MoveStack* last = generate<MV_LEGAL>(pos, mlist);
projects / stockfish / blobdiff