X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsearch.h;h=e2a136062c689a79695b4c725719f7c9cb562bdc;hb=5e331f9618a0a6dcab888cf17898feaa914ff37c;hp=63b9b3264a7fb1f138bbe7e6705e119602069251;hpb=3df2c01b5769c7ae996fb5b992c06e4a5428ad35;p=stockfish
diff --git a/src/search.h b/src/search.h
index 63b9b326..e2a13606 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-2013 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,15 +38,16 @@ 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 excludedMove;
Move killers[2];
Depth reduction;
- Value eval;
+ Value staticEval;
Value evalMargin;
int skipNullMove;
+ int futilityMoveCount;
};
@@ -56,12 +57,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);
@@ -79,10 +79,10 @@ struct RootMove {
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[2], inc[2], movestogo, depth, nodes, movetime, infinite, ponder;
+ int time[COLOR_NB], inc[COLOR_NB], movestogo, depth, nodes, movetime, mate, infinite, ponder;
};
@@ -98,8 +98,9 @@ typedef std::auto_ptr > StateStackPtr;
extern volatile SignalsType Signals;
extern LimitsType Limits;
extern std::vector RootMoves;
-extern Position RootPosition;
-extern Time SearchTime;
+extern Position RootPos;
+extern Color RootColor;
+extern Time::point SearchTime;
extern StateStackPtr SetupStates;
extern void init();
@@ -108,4 +109,4 @@ extern void think();
} // namespace Search
-#endif // !defined(SEARCH_H_INCLUDED)
+#endif // #ifndef SEARCH_H_INCLUDED