Retire attackedBy[] access functions

[stockfish] / src / evaluate.h

diff --git a/src/evaluate.h b/src/evaluate.h
index 2531182af244a95fe55cba173cbb5762b6568b63..6a8ef7f16244dd181da636989dc3b9ff7c6bffc9 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
@@ -25,6 +25,8 @@
 //// Includes
 ////
 
+#include <iostream>
+
 #include "material.h"
 #include "pawns.h"
 
@@ -40,13 +42,18 @@
 /// contents to make intelligent search decisions.
 ///
 /// At the moment, this is not utilized very much: The only part of the
-/// EvalInfo object which is used by the search is futilityMargin.
+/// EvalInfo object which is used by the search is margin.
 class Position;
 
 struct EvalInfo {
 
-  // Middle game and endgame evaluations
-  Value mgValue, egValue;
+  // Middle and end game position's static evaluations
+  Score value;
+
+  // margin[color] stores the evaluation margins we should consider for
+  // the given position. This is a kind of uncertainty estimation and
+  // typically is used by the search for pruning decisions.
+  Value margin[2];
 
   // Pointers to material and pawn hash table entries
   MaterialInfo* mi;
@@ -56,8 +63,6 @@ struct EvalInfo {
   // attacked by a given color and piece type, attackedBy[color][0] contains
   // all squares attacked by the given color.
   Bitboard attackedBy[2][8];
-  Bitboard attacked_by(Color c) const { return attackedBy[c][0]; }
-  Bitboard attacked_by(Color c, PieceType pt) const { return attackedBy[c][pt]; }
 
   // kingZone[color] is the zone around the enemy king which is considered
   // by the king safety evaluation. This consists of the squares directly
@@ -84,16 +89,6 @@ struct EvalInfo {
   // king is on g8 and there's a white knight on g5, this knight adds
   // 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.
-  Value mgMobility, egMobility;
-
-  // Extra futility margin. This is added to the standard futility margin
-  // in the quiescence search.
-  Value futilityMargin;
 };
 
 
@@ -101,8 +96,7 @@ struct EvalInfo {
 //// Prototypes
 ////
 
-extern Value evaluate(const Position& pos, EvalInfo& ei, int threadID);
-extern Value quick_evaluate(const Position& pos);
+extern Value evaluate(const Position& pos, EvalInfo& ei);
 extern void init_eval(int threads);
 extern void quit_eval();
 extern void read_weights(Color sideToMove);