X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.h;h=2fd160b68a6d9ab5a58f45e8321880c9ab3d9b98;hp=63b9b3264a7fb1f138bbe7e6705e119602069251;hb=bcbab1937670ca39ddb0a216ff9a787e56b79b3a;hpb=3df2c01b5769c7ae996fb5b992c06e4a5428ad35 diff --git a/src/search.h b/src/search.h index 63b9b326..2fd160b6 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-2012 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 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 @@ -17,10 +17,9 @@ along with this program. If not, see . */ -#if !defined(SEARCH_H_INCLUDED) +#ifndef SEARCH_H_INCLUDED #define SEARCH_H_INCLUDED -#include #include #include #include @@ -38,15 +37,15 @@ namespace Search { /// has its own array of Stack objects, indexed by the current ply. struct Stack { - SplitPoint* sp; + SplitPoint* splitPoint; int ply; Move currentMove; + Move ttMove; Move excludedMove; Move killers[2]; Depth reduction; - Value eval; - Value evalMargin; - int skipNullMove; + Value staticEval; + bool skipNullMove; }; @@ -56,12 +55,11 @@ struct Stack { /// all non-pv moves. struct RootMove { - RootMove(){} // Needed by sort() RootMove(Move m) : score(-VALUE_INFINITE), prevScore(-VALUE_INFINITE) { pv.push_back(m); pv.push_back(MOVE_NONE); } - bool operator<(const RootMove& m) const { return score < m.score; } + 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); @@ -75,22 +73,27 @@ struct RootMove { /// 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 is our opponent's side to move. +/// or if we have to ponder while it's our opponent's turn to move. struct LimitsType { - LimitsType() { memset(this, 0, sizeof(LimitsType)); } - bool use_time_management() const { return !(movetime | depth | nodes | infinite); } + LimitsType() { // Using memset on a std::vector is undefined behavior + 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[2], inc[2], movestogo, depth, nodes, movetime, 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, for instance to stop the search by the GUI. +/// 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; @@ -98,14 +101,14 @@ typedef std::auto_ptr > StateStackPtr; extern volatile SignalsType Signals; extern LimitsType Limits; extern std::vector RootMoves; -extern Position RootPosition; -extern Time SearchTime; +extern Position RootPos; +extern Time::point SearchTime; extern StateStackPtr SetupStates; extern void init(); -extern size_t perft(Position& pos, Depth depth); extern void think(); +template uint64_t perft(Position& pos, Depth depth); } // namespace Search -#endif // !defined(SEARCH_H_INCLUDED) +#endif // #ifndef SEARCH_H_INCLUDED