X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.h;h=84420373482dfce078751b7883d04bedd59ae1cd;hp=6248cd0193310bf4c577f1bfd9d248230c4c326d;hb=24dac5ccd309837c6767dcf6b145be385eea2e21;hpb=80d7556af785f57a4f90d121c57c9c2f85a2963e diff --git a/src/search.h b/src/search.h index 6248cd01..84420373 100644 --- a/src/search.h +++ b/src/search.h @@ -2,6 +2,7 @@ Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, 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 @@ -39,10 +40,8 @@ struct Stack { Move* pv; int ply; Move currentMove; - Move ttMove; Move excludedMove; Move killers[2]; - Depth reduction; Value staticEval; bool skipEarlyPruning; int moveCount; @@ -56,7 +55,7 @@ struct RootMove { explicit RootMove(Move m) : pv(1, m) {} - bool operator<(const RootMove& m) const { return score > m.score; } // Ascending sort + bool operator<(const RootMove& m) const { return m.score < score; } // Descending sort bool operator==(const Move& m) const { return pv[0] == m; } void insert_pv_in_tt(Position& pos); bool extract_ponder_from_tt(Position& pos); @@ -93,7 +92,7 @@ struct LimitsType { /// typically in an async fashion e.g. to stop the search by the GUI. struct SignalsType { - std::atomic stop, stopOnPonderhit, firstRootMove, failedLowAtRoot; + std::atomic_bool stop, stopOnPonderhit; }; typedef std::unique_ptr> StateStackPtr; @@ -103,8 +102,8 @@ extern LimitsType Limits; extern StateStackPtr SetupStates; void init(); -void reset(); -template uint64_t perft(Position& pos, Depth depth); +void clear(); +template uint64_t perft(Position& pos, Depth depth); } // namespace Search