X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.h;h=f09163a25430ba92166ef5c6a1092e19ccdaff3c;hp=48b627b9db19f81cc767509c0dc42717f1c87b0a;hb=d810441b359508577b736d7b6410190ba13078f5;hpb=9fc602bae74b8e09bd45ace3b42a8ce84d56b23c

diff --git a/src/evaluate.h b/src/evaluate.h
index 48b627b9..f09163a2 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-2010 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
@@ -17,98 +17,61 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
 #if !defined(EVALUATE_H_INCLUDED)
 #define EVALUATE_H_INCLUDED
 
-////
-//// Includes
-////
-
-#include <iostream>
-
 #include "material.h"
 #include "pawns.h"
+#include "types.h"
 
-
-////
-//// Types
-////
-
-
-/// The EvalInfo struct contains various information computed and collected
-/// by the evaluation function. An EvalInfo object is passed as one of the
-/// arguments to the evaluation function, and the search can make use of its
-/// 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.
 class Position;
 
-struct EvalInfo {
+namespace Eval {
 
-  EvalInfo() { futilityMargin[0] = futilityMargin[1] = Value(0); }
-
-  // Middle game and endgame evaluations
-  Score value;
+// Struct Eval::Info contains various information computed and collected
+// by the evaluation functions.
+struct Info {
 
   // Pointers to material and pawn hash table entries
-  MaterialInfo* mi;
-  PawnInfo* pi;
+  Material::Entry* mi;
+  Pawns::Entry* pi;
 
   // attackedBy[color][piece type] is a bitboard representing all squares
-  // 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]; }
+  // attacked by a given color and piece type, attackedBy[color][ALL_PIECES]
+  // contains all squares attacked by the given color.
+  Bitboard attackedBy[COLOR_NB][PIECE_TYPE_NB];
 
-  // kingZone[color] is the zone around the enemy king which is considered
+  // kingRing[color] is the zone around the king which is considered
   // by the king safety evaluation. This consists of the squares directly
   // adjacent to the king, and the three (or two, for a king on an edge file)
   // squares two ranks in front of the king. For instance, if black's king
-  // is on g8, kingZone[WHITE] is a bitboard containing the squares f8, h8,
+  // is on g8, kingRing[BLACK] is a bitboard containing the squares f8, h8,
   // f7, g7, h7, f6, g6 and h6.
-  Bitboard kingZone[2];
+  Bitboard kingRing[COLOR_NB];
 
   // kingAttackersCount[color] is the number of pieces of the given color
-  // which attack a square in the kingZone of the enemy king.
-  int kingAttackersCount[2];
+  // which attack a square in the kingRing of the enemy king.
+  int kingAttackersCount[COLOR_NB];
 
   // kingAttackersWeight[color] is the sum of the "weight" of the pieces of the
-  // given color which attack a square in the kingZone of the enemy king. The
+  // given color which attack a square in the kingRing of the enemy king. The
   // weights of the individual piece types are given by the variables
   // QueenAttackWeight, RookAttackWeight, BishopAttackWeight and
   // KnightAttackWeight in evaluate.cpp
-  int kingAttackersWeight[2];
+  int kingAttackersWeight[COLOR_NB];
 
   // kingAdjacentZoneAttacksCount[color] is the number of attacks to squares
   // directly adjacent to the king of the given color. Pieces which attack
   // more than one square are counted multiple times. For instance, if black's
   // 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.
-  Score mobility;
-
-  // Extra futility margin. This is added to the standard futility margin
-  // in the quiescence search. One for each color.
-  Value futilityMargin[2];
+  int kingAdjacentZoneAttacksCount[COLOR_NB];
 };
 
+extern void init();
+extern Value evaluate(const Position& pos, Value& margin, Info* ei);
+extern std::string trace(const Position& pos);
 
-////
-//// Prototypes
-////
-
-extern Value evaluate(const Position& pos, EvalInfo& ei, int threadID);
-extern void init_eval(int threads);
-extern void quit_eval();
-extern void read_weights(Color sideToMove);
-
+}
 
 #endif // !defined(EVALUATE_H_INCLUDED)