Rename ei.kingDanger in ei.margin

[stockfish] / src / evaluate.h

diff --git a/src/evaluate.h b/src/evaluate.h
index 48b627b9db19f81cc767509c0dc42717f1c87b0a..2b2533907a5ed56cc53bae49b46ba1a58d802e51 100644 (file)
--- a/src/evaluate.h
+++ b/src/evaluate.h
@@ -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);