X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=src%2Fsearch.h;h=5c2dfc8ac422b47777dca33164ea6ad6e7887d41;hb=eb50793cffd8ac059450a76760e2c3f8ae9cc931;hp=d805d4629424cf9a991ee1b06d8eb979d0dbdcc3;hpb=a29dd88f7563c5af871d9adc137218c39586b09c;p=stockfish
diff --git a/src/search.h b/src/search.h
index d805d462..5c2dfc8a 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,15 +17,17 @@
along with this program. If not, see .
*/
-#if !defined(SEARCH_H_INCLUDED)
+#ifndef SEARCH_H_INCLUDED
#define SEARCH_H_INCLUDED
-#include
-#include
+#include
+#include
+#include
+#include "misc.h"
+#include "position.h"
#include "types.h"
-class Position;
struct SplitPoint;
namespace Search {
@@ -35,48 +37,77 @@ 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 bestMove;
Move killers[2];
Depth reduction;
- Value eval;
- Value evalMargin;
- int skipNullMove;
+ Value staticEval;
+ bool skipNullMove;
+};
+
+
+/// 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);
+ }
+
+ 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);
+
+ Value score;
+ Value prevScore;
+ std::vector pv;
};
/// 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 !(maxTime | maxDepth | maxNodes | infinite); }
+ LimitsType() { // Using memset on a std::vector is undefined behavior
+ time[WHITE] = time[BLACK] = inc[WHITE] = inc[BLACK] = movestogo =
+ depth = nodes = movetime = mate = infinite = ponder = 0;
+ }
+ bool use_time_management() const { return !(mate | movetime | depth | nodes | infinite); }
- int time, increment, movesToGo, maxTime, maxDepth, maxNodes, infinite, ponder;
+ std::vector searchmoves;
+ int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, nodes, movetime, mate, infinite, ponder;
};
/// 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;
+
extern volatile SignalsType Signals;
extern LimitsType Limits;
-extern std::set SearchMoves;
-extern Position RootPosition;
+extern std::vector RootMoves;
+extern Position RootPos;
+extern Time::point SearchTime;
+extern StateStackPtr SetupStates;
extern void init();
-extern int64_t perft(Position& pos, Depth depth);
+extern uint64_t perft(Position& pos, Depth depth);
extern void think();
-} // namespace
+} // namespace Search
-#endif // !defined(SEARCH_H_INCLUDED)
+#endif // #ifndef SEARCH_H_INCLUDED