X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsearch.h;h=25e71a845c36c201b54fbd405e7fc2587d76a656;hb=77341f67f30456dc456177062309ad5e73e2e1a4;hp=03fa5c640373f73affd8a41818ade11606da5845;hpb=70b1b79264b2a160f72dd2aa92c2f80045e4cd83;p=stockfish
diff --git a/src/search.h b/src/search.h
index 03fa5c64..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-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,7 +17,7 @@
along with this program. If not, see .
*/
-#if !defined(SEARCH_H_INCLUDED)
+#ifndef SEARCH_H_INCLUDED
#define SEARCH_H_INCLUDED
#include
@@ -38,14 +38,14 @@ 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 killers[2];
Depth reduction;
Value staticEval;
- Value evalMargin;
int skipNullMove;
};
@@ -56,12 +56,11 @@ struct Stack {
/// all non-pv moves.
struct RootMove {
- RootMove(){} // Needed by sort()
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; }
+ 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);
@@ -75,19 +74,19 @@ 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)); }
- bool use_time_management() const { return !(movetime | depth | nodes | infinite); }
+ 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, infinite, ponder;
+ 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;
@@ -98,9 +97,9 @@ typedef std::auto_ptr > StateStackPtr;
extern volatile SignalsType Signals;
extern LimitsType Limits;
extern std::vector RootMoves;
-extern Position RootPosition;
+extern Position RootPos;
extern Color RootColor;
-extern Time::point SearchTime;
+extern Time::point SearchTime, IterationTime;
extern StateStackPtr SetupStates;
extern void init();
@@ -109,4 +108,4 @@ extern void think();
} // namespace Search
-#endif // !defined(SEARCH_H_INCLUDED)
+#endif // #ifndef SEARCH_H_INCLUDED