X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.h;h=25e71a845c36c201b54fbd405e7fc2587d76a656;hp=1fa7d064930af4b818bfff4c7ca105bc81739b1b;hb=216972186ea861c99d3a7bccabfff842ef87933c;hpb=2ef53ee368683d5aa62b028377b94efe961f18ac

diff --git a/src/search.h b/src/search.h
index 1fa7d064..25e71a84 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-2013 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,7 +17,7 @@
   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
 
 #include <cstring>
@@ -25,7 +25,6 @@
 #include <stack>
 #include <vector>
 
-#include "evaluate.h"
 #include "misc.h"
 #include "position.h"
 #include "types.h"
@@ -42,14 +41,12 @@ struct Stack {
   SplitPoint* splitPoint;
   int ply;
   Move currentMove;
+  Move ttMove;
   Move excludedMove;
   Move killers[2];
   Depth reduction;
   Value staticEval;
-  Value evalMargin;
   int skipNullMove;
-  int futilityMoveCount;
-  Eval::Info ei;
 };
 
 
@@ -77,11 +74,11 @@ 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)); }
+  LimitsType() { std::memset(this, 0, sizeof(LimitsType)); }
   bool use_time_management() const { return !(mate | movetime | depth | nodes | infinite); }
 
   int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, nodes, movetime, mate, infinite, ponder;
@@ -89,7 +86,7 @@ struct LimitsType {
 
 
 /// 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;
@@ -102,7 +99,7 @@ extern LimitsType Limits;
 extern std::vector<RootMove> RootMoves;
 extern Position RootPos;
 extern Color RootColor;
-extern Time::point SearchTime;
+extern Time::point SearchTime, IterationTime;
 extern StateStackPtr SetupStates;
 
 extern void init();
@@ -111,4 +108,4 @@ extern void think();
 
 } // namespace Search
 
-#endif // !defined(SEARCH_H_INCLUDED)
+#endif // #ifndef SEARCH_H_INCLUDED