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()); }
Book OpeningBook;
// Pointer to root move list
- RootMoveList* Rml;
+ 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;
+ Value bestValues[PLY_MAX_PLUS_2];
int bestMoveChanges[PLY_MAX_PLUS_2];
- Value values[PLY_MAX_PLUS_2];
- int aspirationDelta = 0;
+ int iteration, researchCountFL, researchCountFH, aspirationDelta;
+ Value value, alpha, beta;
+ Depth depth;
+ Move EasyMove;
// Moves to search are verified, scored and sorted
- RootMoveList rml(pos, searchMoves);
- Rml = &rml;
+ Rml.init(pos, searchMoves);
+
+ // Initialize FIXME move before Rml.init()
+ TT.new_search();
+ H.clear();
+ init_ss_array(ss, PLY_MAX_PLUS_2);
+ alpha = -VALUE_INFINITE, beta = VALUE_INFINITE;
+ EasyMove = MOVE_NONE;
+ aspirationDelta = 0;
+ iteration = 1;
// 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);
-
- cout << "info depth " << 1
- << " score " << value_to_uci(s) << endl;
+ cout << "info depth " << iteration << " score "
+ << value_to_uci(pos.is_check() ? -VALUE_MATE : VALUE_DRAW)
+ << endl;
return MOVE_NONE;
}
- // Initialize
- TT.new_search();
- H.clear();
- init_ss_array(ss, PLY_MAX_PLUS_2);
- values[1] = rml[0].pv_score;
- iteration = 1;
-
- // Send initial RootMoveList scoring (iteration 1)
+ // Send initial 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, ONE_PLY, alpha, beta) << endl;
+ << "\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 && (!MaxDepth || iteration <= MaxDepth) && !StopRequest)
{
- // Initialize iteration
- iteration++;
- Rml->bestMoveChanges = 0;
-
cout << "info depth " << iteration << endl;
+ Rml.bestMoveChanges = researchCountFL = researchCountFH = 0;
+ depth = (iteration - 2) * ONE_PLY + InitialDepth;
+
// Calculate dynamic aspiration window based on previous iterations
- if (MultiPV == 1 && iteration >= 6 && abs(values[iteration - 1]) < VALUE_KNOWN_WIN)
+ if (MultiPV == 1 && iteration >= 6 && abs(bestValues[iteration - 1]) < VALUE_KNOWN_WIN)
{
- int prevDelta1 = values[iteration - 1] - values[iteration - 2];
- int prevDelta2 = values[iteration - 2] - values[iteration - 3];
+ int prevDelta1 = bestValues[iteration - 1] - bestValues[iteration - 2];
+ int prevDelta2 = bestValues[iteration - 2] - bestValues[iteration - 3];
aspirationDelta = Max(abs(prevDelta1) + abs(prevDelta2) / 2, 16);
aspirationDelta = (aspirationDelta + 7) / 8 * 8; // Round to match grainSize
- alpha = Max(values[iteration - 1] - aspirationDelta, -VALUE_INFINITE);
- beta = Min(values[iteration - 1] + aspirationDelta, VALUE_INFINITE);
+ alpha = Max(bestValues[iteration - 1] - aspirationDelta, -VALUE_INFINITE);
+ beta = Min(bestValues[iteration - 1] + aspirationDelta, VALUE_INFINITE);
}
- depth = (iteration - 2) * ONE_PLY + InitialDepth;
-
- researchCountFL = researchCountFH = 0;
-
// We start with small aspiration window and in case of fail high/low, we
// research with bigger window until we are not failing high/low anymore.
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
value = search<PV, false, true>(pos, ss, alpha, beta, depth, 0);
// 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);
-
- bestMoveChanges[iteration] = Rml->bestMoveChanges;
+ Rml.sort();
+ for (int i = 0; i < Min(MultiPV, (int)Rml.size()); i++)
+ Rml[i].insert_pv_in_tt(pos);
+ // Value cannot be trusted. Break out immediately!
if (StopRequest)
break;
assert(value >= alpha);
+ bestMoveChanges[iteration] = Rml.bestMoveChanges; // FIXME move outside fail high/low loop
+
+ // In case of failing high/low increase aspiration window and research,
+ // otherwise exit the fail high/low loop.
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);
researchCountFH++;
}
AspirationFailLow = true;
StopOnPonderhit = false;
- // Prepare for a research after a fail low, each time with a wider window
alpha = Max(alpha - aspirationDelta * (1 << researchCountFL), -VALUE_INFINITE);
researchCountFL++;
}
break;
}
- if (StopRequest)
- break; // Value cannot be trusted. Break out immediately!
-
//Save info about search result
- values[iteration] = value;
+ bestValues[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)
+ if (UseTimeManagement && !StopRequest)
{
// Time to stop?
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)
+ if (iteration >= 6 && Rml.size() == 1)
noMoreTime = true;
// Stop search early when the last two iterations returned a mate score
if ( iteration >= 6
- && abs(values[iteration]) >= abs(VALUE_MATE) - 100
- && abs(values[iteration-1]) >= abs(VALUE_MATE) - 100)
+ && abs(bestValues[iteration]) >= abs(VALUE_MATE) - 100
+ && abs(bestValues[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
+ && 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)))
noMoreTime = true;
break;
}
}
-
- 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];
}
mateThreat = sp->mateThreat;
goto split_point_start;
}
+ else if (Root)
+ bestValue = alpha;
else {} // Hack to fix icc's "statement is unreachable" warning
// Step 1. Initialize node and poll. Polling can abort search
&& !excludedMove // Do not allow recursive singular extension search
&& (tte->type() & VALUE_TYPE_LOWER)
&& tte->depth() >= depth - 3 * ONE_PLY;
- if (Root)
- bestValue = alpha;
-
if (SpNode)
{
lock_grab(&(sp->lock));
// iteration. This information is used for time managment: When
// the best move changes frequently, we allocate some more time.
if (!isPvMove && MultiPV == 1)
- Rml->bestMoveChanges++;
+ 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, depth, 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
}
ValueType t = pv_score >= beta ? VALUE_TYPE_LOWER :
pv_score <= alpha ? VALUE_TYPE_UPPER : VALUE_TYPE_EXACT;
- LogFile << pretty_pv(pos, current_search_time(), depth, 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];
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