X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fsearch.h;h=7fe2749cea74fbe204aaab167be7be8f55288d24;hp=600d7a75198500dfd4582f48e76c239ebb5b2a50;hb=d810441b359508577b736d7b6410190ba13078f5;hpb=ce063f59cd0fea215309c719ee56cbf486a5ea80 diff --git a/src/search.h b/src/search.h index 600d7a75..7fe2749c 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 @@ -25,6 +25,7 @@ #include #include +#include "evaluate.h" #include "misc.h" #include "position.h" #include "types.h" @@ -38,7 +39,7 @@ 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; @@ -47,6 +48,8 @@ struct Stack { Value staticEval; Value evalMargin; int skipNullMove; + int futilityMoveCount; + Eval::Info* ei; }; @@ -56,12 +59,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);