X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.h;h=2b2533907a5ed56cc53bae49b46ba1a58d802e51;hp=067baa3cf2e0c717f98a3f136f6f13ece186a6bf;hb=c7a932bc744f899f53ce0013cbbbaa86915bb2e8;hpb=35ada63174bbec6289d6dea6d3cfc5b5f14d1d27 diff --git a/src/evaluate.h b/src/evaluate.h index 067baa3c..2b253390 100644 --- a/src/evaluate.h +++ b/src/evaluate.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-2009 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 @@ -47,7 +47,7 @@ class Position; struct EvalInfo { - EvalInfo() { futilityMargin[0] = futilityMargin[1] = Value(0); } + EvalInfo() { margin[WHITE] = margin[BLACK] = VALUE_ZERO; } // Middle game and endgame evaluations Score value; @@ -89,15 +89,8 @@ struct EvalInfo { // 2 to kingAdjacentZoneAttacksCount[BLACK]. int kingAdjacentZoneAttacksCount[2]; - // mateThreat[color] is a move for the given side which gives a direct mate. - Move mateThreat[2]; - - // Middle game and endgame mobility scores. - Score mobility; - - // Extra futility margin. This is added to the standard futility margin - // in the quiescence search. One for each color. - Value futilityMargin[2]; + // Value of the score margin we should consider for the given color + Value margin[2]; }; @@ -105,7 +98,7 @@ struct EvalInfo { //// Prototypes //// -extern Value evaluate(const Position& pos, EvalInfo& ei, int threadID); +extern Value evaluate(const Position& pos, EvalInfo& ei); extern void init_eval(int threads); extern void quit_eval(); extern void read_weights(Color sideToMove);