X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.h;h=900d51fbb3b6d99a8e001a754312d951f2d04c96;hp=03179190cb7419fce0a8246607c77e08b789e7de;hb=00d9e9fd283b31e63389af091b158dbc3fedfc0e;hpb=49d52b82667bdbcdefc5868d7adcaeb4483dc7c1

diff --git a/src/search.h b/src/search.h
index 03179190..740063b9 100644
--- a/src/search.h
+++ b/src/search.h
@@ -1,92 +1,114 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008 Marco Costalba
+  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
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
-  
+
   Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-#if !defined(SEARCH_H_INCLUDED)
+#ifndef SEARCH_H_INCLUDED
 #define SEARCH_H_INCLUDED
 
-////
-//// Includes
-////
+#include <atomic>
+#include <memory>  // For std::unique_ptr
+#include <stack>
+#include <vector>
 
-#include "types.h"
-#include "depth.h"
-#include "history.h"
-#include "lock.h"
-#include "movegen.h"
+#include "misc.h"
 #include "position.h"
-#include "tt.h"
-#include "value.h"
+#include "types.h"
 
+struct SplitPoint;
 
-////
-//// Constants
-////
+namespace Search {
 
-const int PLY_MAX = 100;
-const int PLY_MAX_PLUS_2 = 102;
-const int KILLER_MAX = 2;
+/// 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;
+  bool skipEarlyPruning;
+  int moveCount;
+};
 
-////
-//// Types
-////
+/// 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.
 
-/// The SearchStack 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 SearchStack objects, indexed by the
-/// current ply.
+struct RootMove {
 
-struct SearchStack {
-  Move pv[PLY_MAX];
-  Move currentMove;
-  Value currentMoveCaptureValue;
-  Move mateKiller;
-  Move threatMove;
-  Move killers[KILLER_MAX];
-  Depth reduction;
+  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 insert_pv_in_tt(Position& pos);
+  bool extract_ponder_from_tt(Position& pos);
+
+  Value score = -VALUE_INFINITE;
+  Value previousScore = -VALUE_INFINITE;
+  std::vector<Move> pv;
 };
 
+typedef std::vector<RootMove> RootMoveVector;
+
+/// 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 {
 
-////
-//// Global variables
-////
+  LimitsType() { // Init explicitly due to broken value-initialization of non POD in MSVC
+    nodes = time[WHITE] = time[BLACK] = inc[WHITE] = inc[BLACK] = npmsec = movestogo =
+    depth = movetime = mate = infinite = ponder = 0;
+  }
 
-extern SearchStack EmptySearchStack;
-extern TranspositionTable TT;
-extern int ActiveThreads;
-extern Lock SMPLock;
+  bool use_time_management() const {
+    return !(mate | movetime | depth | nodes | infinite);
+  }
 
-// Perhaps better to make H local, and pass as parameter to MovePicker?
-extern History H;  
+  std::vector<Move> searchmoves;
+  int time[COLOR_NB], inc[COLOR_NB], npmsec, movestogo, depth, movetime, mate, infinite, ponder;
+  int64_t nodes;
+  TimePoint startTime;
+};
+
+/// The SignalsType struct stores atomic flags updated during the search
+/// typically in an async fashion e.g. to stop the search by the GUI.
+
+struct SignalsType {
+  std::atomic<bool> stop, stopOnPonderhit, firstRootMove, failedLowAtRoot;
+};
 
+typedef std::unique_ptr<std::stack<StateInfo>> StateStackPtr;
 
-////
-//// Prototypes
-////
+extern SignalsType Signals;
+extern LimitsType Limits;
+extern StateStackPtr SetupStates;
 
-extern void init_threads();
-extern void stop_threads();
-extern void think(const Position &pos, bool infinite, bool ponder, int side_to_move,
-                  int time[], int increment[], int movesToGo, int maxDepth, 
-                  int maxNodes, int maxTime, Move searchMoves[]);
-extern int64_t nodes_searched();
+void init();
+void reset();
+template<bool Root> uint64_t perft(Position& pos, Depth depth);
 
+} // namespace Search
 
-#endif // !defined(SEARCH_H_INCLUDED)
+#endif // #ifndef SEARCH_H_INCLUDED