Introduce enum VALUE_ZERO instead of Value(0)

[stockfish] / src / evaluate.h

diff --git a/src/evaluate.h b/src/evaluate.h
index f33774acea4246adc50e3e7ad3376ab6cb64b7e4..75e1f9150cc77958014207a4f81b21ecd9e1e6b4 100644 (file)
--- 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(Value(0)) {}
+  EvalInfo() { kingDanger[0] = kingDanger[1] = VALUE_ZERO; }
 
   // Middle game and endgame evaluations
   Score value;
@@ -89,15 +89,11 @@ 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.
+  // Middle game and endgame mobility scores
   Score mobility;
 
-  // Extra futility margin. This is added to the standard futility margin
-  // in the quiescence search.
-  Value futilityMargin;
+  // Value of the danger for the king of the given color
+  Value kingDanger[2];
 };
 
 
@@ -105,7 +101,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);