X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.h;h=e233c1c8577059dd4e416a46d829eb4621793592;hp=ab1076cd61891559d84d198940880e6cbf988f61;hb=6fa6da3ee13d2b7bdbec3cd24ff8ca43233c74fb;hpb=a5869d8d2532c6bb8dbcba7d74331c0ac0230482 diff --git a/src/search.h b/src/search.h index ab1076cd..e233c1c8 100644 --- a/src/search.h +++ b/src/search.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,8 +20,7 @@ #ifndef SEARCH_H_INCLUDED #define SEARCH_H_INCLUDED -#include -#include +#include // For std::auto_ptr #include #include @@ -33,77 +32,82 @@ struct SplitPoint; namespace Search { -/// The Stack struct keeps track of the information we need to remember from -/// nodes shallower and deeper in the tree during the search. Each search thread -/// has its own array of Stack objects, indexed by the current ply. +/// Stack struct keeps track of the information we need to remember from nodes +/// shallower and deeper in the tree during the search. Each search thread has +/// its own array of Stack objects, indexed by the current ply. struct Stack { SplitPoint* splitPoint; + Move* pv; int ply; Move currentMove; + Move ttMove; Move excludedMove; Move killers[2]; Depth reduction; Value staticEval; - int skipNullMove; + bool skipEarlyPruning; }; +/// RootMove struct is used for moves at the root of the tree. For each root move +/// we store a score and a PV (really a refutation in the case of moves which +/// fail low). Score is normally set at -VALUE_INFINITE for all non-pv moves. -/// RootMove struct is used for moves at the root of the tree. For each root -/// move we store a score, a node count, and a PV (really a refutation in the -/// case of moves which fail low). Score is normally set at -VALUE_INFINITE for -/// all non-pv moves. struct RootMove { - RootMove(Move m) : score(-VALUE_INFINITE), prevScore(-VALUE_INFINITE) { - pv.push_back(m); pv.push_back(MOVE_NONE); - } + explicit RootMove(Move m) : pv(1, m) {} bool operator<(const RootMove& m) const { return score > m.score; } // Ascending sort bool operator==(const Move& m) const { return pv[0] == m; } - - void extract_pv_from_tt(Position& pos); void insert_pv_in_tt(Position& pos); + bool extract_ponder_from_tt(Position& pos); - Value score; - Value prevScore; + Value score = -VALUE_INFINITE; + Value previousScore = -VALUE_INFINITE; std::vector pv; }; +typedef std::vector RootMoveVector; -/// The LimitsType struct stores information sent by GUI about available time -/// to search the current move, maximum depth/time, if we are in analysis mode -/// or if we have to ponder while it's our opponent's turn to move. +/// LimitsType struct stores information sent by GUI about available time to +/// search the current move, maximum depth/time, if we are in analysis mode or +/// if we have to ponder while it's our opponent's turn to move. struct LimitsType { - LimitsType() { std::memset(this, 0, sizeof(LimitsType)); } - bool use_time_management() const { return !(mate | movetime | depth | nodes | infinite); } + LimitsType() { // Init explicitly due to broken value-initialization of non POD in MSVC + nodes = time[WHITE] = time[BLACK] = inc[WHITE] = inc[BLACK] = movestogo = + depth = movetime = mate = infinite = ponder = 0; + } + + bool use_time_management() const { + return !(mate | movetime | depth | nodes | infinite); + } - int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, nodes, movetime, mate, infinite, ponder; + std::vector searchmoves; + int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, movetime, mate, infinite, ponder; + int64_t nodes; }; - /// The SignalsType struct stores volatile flags updated during the search /// typically in an async fashion e.g. to stop the search by the GUI. struct SignalsType { - bool stopOnPonderhit, firstRootMove, stop, failedLowAtRoot; + bool stop, stopOnPonderhit, firstRootMove, failedLowAtRoot; }; -typedef std::auto_ptr > StateStackPtr; +typedef std::unique_ptr> StateStackPtr; extern volatile SignalsType Signals; extern LimitsType Limits; -extern std::vector RootMoves; +extern RootMoveVector RootMoves; extern Position RootPos; -extern Color RootColor; -extern Time::point SearchTime, IterationTime; +extern TimePoint SearchTime; extern StateStackPtr SetupStates; -extern void init(); -extern size_t perft(Position& pos, Depth depth); -extern void think(); +void init(); +void think(); +template uint64_t perft(Position& pos, Depth depth); } // namespace Search