// -VALUE_INFINITE for all non-pv moves.
struct RootMove {
- RootMove();
- RootMove(const RootMove& rm) { *this = rm; }
- RootMove& operator=(const RootMove& rm);
-
// 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 an higher pv_score
int64_t nodes;
Value pv_score;
- Move pv[PLY_MAX_PLUS_2];
+ std::vector<Move> pv;
};
// RootMoveList struct is mainly a std::vector of RootMove objects
struct RootMoveList : public std::vector<RootMove> {
+
void init(Position& pos, Move searchMoves[]);
- RootMove* find(const Move &m, const int startIndex = 0);
+ RootMove* find(const Move& m, int startIndex = 0);
+
int bestMoveChanges;
};
void do_skill_level(Move* best, Move* ponder);
int current_search_time(int set = 0);
- string score_to_uci(Value v, Value alpha, Value beta);
+ string score_to_uci(Value v, Value alpha = -VALUE_INFINITE, Value beta = VALUE_INFINITE);
string speed_to_uci(int64_t nodes);
- string pv_to_uci(Move pv[], int pvNum, bool chess960);
+ string pv_to_uci(const Move pv[], int pvNum, bool chess960);
string pretty_pv(Position& pos, int depth, Value score, int time, Move pv[]);
string depth_to_uci(Depth depth);
void poll(const Position& pos);
};
// In case of a SpNode we use split point's shared MovePicker object as moves source
- template<> struct MovePickerExt<SplitPointNonPV> : public MovePickerExt<NonPV> {
+ template<> struct MovePickerExt<SplitPointNonPV> : public MovePicker {
MovePickerExt(const Position& p, Move ttm, Depth d, const History& h, SearchStack* ss, Value b)
- : MovePickerExt<NonPV>(p, ttm, d, h, ss, b), mp(ss->sp->mp) {}
+ : MovePicker(p, ttm, d, h, ss, b), mp(ss->sp->mp) {}
Move get_next_move() { return mp->get_next_move(); }
MovePicker* mp;
// Iterative deepening loop until requested to stop or target depth reached
while (!StopRequest && ++depth <= PLY_MAX && (!Limits.maxDepth || depth <= Limits.maxDepth))
{
- Rml.bestMoveChanges = 0;
-
// Remember best moves and values from previous iteration
- std::vector<Move> prevMoves;
- std::vector<Value> prevValues;
+ RootMoveList prevRml = Rml;
- for (int i = 0; i < Min(MultiPV, (int)Rml.size()); i++)
- {
- prevMoves.push_back(Rml[i].pv[0]);
- prevValues.push_back(Rml[i].pv_score);
- }
+ Rml.bestMoveChanges = 0;
// MultiPV iteration loop
for (MultiPVIteration = 0; MultiPVIteration < Min(MultiPV, (int)Rml.size()); MultiPVIteration++)
{
// Calculate dynamic aspiration window based on previous iterations
- if (depth >= 5 && abs(prevValues[MultiPVIteration]) < VALUE_KNOWN_WIN)
+ if (depth >= 5 && abs(prevRml[MultiPVIteration].pv_score) < VALUE_KNOWN_WIN)
{
int prevDelta1 = bestValues[depth - 1] - bestValues[depth - 2];
int prevDelta2 = bestValues[depth - 2] - bestValues[depth - 3];
aspirationDelta = Min(Max(abs(prevDelta1) + abs(prevDelta2) / 2, 16), 24);
aspirationDelta = (aspirationDelta + 7) / 8 * 8; // Round to match grainSize
- alpha = Max(prevValues[MultiPVIteration] - aspirationDelta, -VALUE_INFINITE);
- beta = Min(prevValues[MultiPVIteration] + aspirationDelta, VALUE_INFINITE);
+ alpha = Max(prevRml[MultiPVIteration].pv_score - aspirationDelta, -VALUE_INFINITE);
+ beta = Min(prevRml[MultiPVIteration].pv_score + aspirationDelta, VALUE_INFINITE);
}
else
{
for (int i = 0; i < Min(UCIMultiPV, (int)Rml.size()); i++)
{
bool updated = (i <= MultiPVIteration);
- bool match = (i == MultiPVIteration);
- if (!updated && depth == 1)
+ if (depth == 1 && !updated)
continue;
+ const RootMoveList& rml = (updated ? Rml : prevRml);
+
cout << "info"
<< depth_to_uci((updated ? depth : depth - 1) * ONE_PLY)
- << score_to_uci(updated ? Rml[i].pv_score : prevValues[i],
- match ? alpha : -VALUE_INFINITE,
- match ? beta : VALUE_INFINITE)
+ << (i == MultiPVIteration ? score_to_uci(rml[i].pv_score, alpha, beta)
+ : score_to_uci(rml[i].pv_score))
<< speed_to_uci(pos.nodes_searched())
- << pv_to_uci(updated ? Rml[i].pv : Rml.find(prevMoves[i])->pv,
- i + 1, pos.is_chess960())
+ << pv_to_uci(&rml[i].pv[0], i + 1, pos.is_chess960())
<< endl;
}
do_skill_level(&skillBest, &skillPonder);
if (LogFile.is_open())
- LogFile << pretty_pv(pos, depth, value, current_search_time(), Rml[0].pv) << endl;
+ LogFile << pretty_pv(pos, depth, value, current_search_time(), &Rml[0].pv[0]) << endl;
// Init easyMove after first iteration or drop if differs from the best move
if (depth == 1 && (Rml.size() == 1 || Rml[0].pv_score > Rml[1].pv_score + EasyMoveMargin))
break;
// Remember searched nodes counts for this move
- Rml.find(move)->nodes += pos.nodes_searched() - nodes;
+ RootMove* rm = Rml.find(move);
+ rm->nodes += pos.nodes_searched() - nodes;
// PV move or new best move ?
if (isPvMove || value > alpha)
{
// Update PV
- Rml.find(move)->pv_score = value;
- Rml.find(move)->extract_pv_from_tt(pos);
+ rm->pv_score = value;
+ rm->extract_pv_from_tt(pos);
// We record how often the best move has been changed in each
// iteration. This information is used for time management: When
// All other moves but the PV are set to the lowest value, this
// is not a problem when sorting becuase sort is stable and move
// position in the list is preserved, just the PV is pushed up.
- Rml.find(move)->pv_score = -VALUE_INFINITE;
+ rm->pv_score = -VALUE_INFINITE;
} // RootNode
// pv_to_uci() returns a string with information on the current PV line
// formatted according to UCI specification.
- string pv_to_uci(Move pv[], int pvNum, bool chess960) {
+ string pv_to_uci(const Move pv[], int pvNum, bool chess960) {
std::stringstream s;
/// RootMove and RootMoveList method's definitions
- RootMove::RootMove() {
-
- nodes = 0;
- pv_score = -VALUE_INFINITE;
- pv[0] = MOVE_NONE;
- }
-
- RootMove& RootMove::operator=(const RootMove& rm) {
-
- const Move* src = rm.pv;
- Move* dst = pv;
-
- // Avoid a costly full rm.pv[] copy
- do *dst++ = *src; while (*src++ != MOVE_NONE);
-
- nodes = rm.nodes;
- pv_score = rm.pv_score;
- return *this;
- }
-
void RootMoveList::init(Position& pos, Move searchMoves[]) {
Move* sm;
continue;
RootMove rm;
- rm.pv[0] = ml.move();
- rm.pv[1] = MOVE_NONE;
+ rm.pv.push_back(ml.move());
+ rm.pv.push_back(MOVE_NONE);
rm.pv_score = -VALUE_INFINITE;
+ rm.nodes = 0;
push_back(rm);
}
}
- RootMove* RootMoveList::find(const Move &m, const int startIndex) {
+ RootMove* RootMoveList::find(const Move& m, int startIndex) {
- for (int i = startIndex; i < int(size()); i++)
- {
- if ((*this)[i].pv[0] == m)
- return &(*this)[i];
- }
+ for (size_t i = startIndex; i < size(); i++)
+ if ((*this)[i].pv[0] == m)
+ return &(*this)[i];
- return NULL;
+ return NULL;
}
// extract_pv_from_tt() builds a PV by adding moves from the transposition table.
StateInfo state[PLY_MAX_PLUS_2], *st = state;
TTEntry* tte;
int ply = 1;
+ Move m = pv[0];
- assert(pv[0] != MOVE_NONE && pos.move_is_pl(pv[0]));
+ assert(m != MOVE_NONE && pos.move_is_pl(m));
- pos.do_move(pv[0], *st++);
+ pv.clear();
+ pv.push_back(m);
+ pos.do_move(m, *st++);
while ( (tte = TT.probe(pos.get_key())) != NULL
&& tte->move() != MOVE_NONE
&& ply < PLY_MAX
&& (!pos.is_draw<false>() || ply < 2))
{
- pv[ply] = tte->move();
- pos.do_move(pv[ply++], *st++);
+ pv.push_back(tte->move());
+ pos.do_move(tte->move(), *st++);
+ ply++;
}
- pv[ply] = MOVE_NONE;
+ pv.push_back(MOVE_NONE);
do pos.undo_move(pv[--ply]); while (ply);
}
projects / stockfish / blobdiff