Retire mateKiller

[stockfish] / src / search.h

diff --git a/src/search.h b/src/search.h
index 0bdabdac6507cf89859eb2d3aec83e4b2264cf09..955056e1e9d9686d4d6aeccf2cda12fb5436f656 100644 (file)
--- 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 Marco Costalba
+  Copyright (C) 2008-2010 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,35 +17,16 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(SEARCH_H_INCLUDED)
 #define SEARCH_H_INCLUDED
 
-////
-//// Includes
-////
-
-#include "depth.h"
-#include "history.h"
-#include "lock.h"
-#include "movegen.h"
-#include "position.h"
-#include "tt.h"
-#include "value.h"
-
+#include <cstring>
 
-////
-//// Constants
-////
+#include "move.h"
+#include "types.h"
 
-const int PLY_MAX = 100;
-const int PLY_MAX_PLUS_2 = 102;
-const int KILLER_MAX = 2;
-
-
-////
-//// Types
-////
+class Position;
+struct SplitPoint;
 
 /// The SearchStack struct keeps track of the information we need to remember
 /// from nodes shallower and deeper in the tree during the search.  Each
@@ -53,39 +34,39 @@ const int KILLER_MAX = 2;
 /// current ply.
 
 struct SearchStack {
-  Move pv[PLY_MAX];
+  int ply;
   Move currentMove;
-  Value currentMoveCaptureValue;
-  Move mateKiller;
-  Move threatMove;
-  Move killers[KILLER_MAX];
+  Move excludedMove;
+  Move bestMove;
+  Move killers[2];
   Depth reduction;
+  Value eval;
+  Value evalMargin;
+  bool skipNullMove;
+  SplitPoint* sp;
 };
 
 
-////
-//// Global variables
-////
+/// The SearchLimits 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.
 
-extern SearchStack EmptySearchStack;
-extern TranspositionTable TT;
-extern int ActiveThreads;
-extern Lock SMPLock;
+struct SearchLimits {
 
-// Perhaps better to make H local, and pass as parameter to MovePicker?
-extern History H;
+  SearchLimits() { memset(this, 0, sizeof(SearchLimits)); }
 
+  SearchLimits(int t, int i, int mtg, int mt, int md, int mn, bool inf, bool pon)
+              : time(t), increment(i), movesToGo(mtg), maxTime(mt), maxDepth(md),
+                maxNodes(mn), infinite(inf), ponder(pon) {}
 
-////
-//// Prototypes
-////
+  bool useTimeManagement() const { return !(maxTime | maxDepth | maxNodes | int(infinite)); }
 
-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();
+  int time, increment, movesToGo, maxTime, maxDepth, maxNodes;
+  bool infinite, ponder;
+};
 
+extern void init_search();
+extern int64_t perft(Position& pos, Depth depth);
+extern bool think(Position& pos, const SearchLimits& limits, Move searchMoves[]);
 
 #endif // !defined(SEARCH_H_INCLUDED)