X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fevaluate.h;h=e2cdb21019ac08c62a4571e12aba53a242a10e17;hb=644f6d47909f3cf2bd3e70485db792789ccad89e;hp=f09163a25430ba92166ef5c6a1092e19ccdaff3c;hpb=d810441b359508577b736d7b6410190ba13078f5;p=stockfish
diff --git a/src/evaluate.h b/src/evaluate.h
index f09163a2..e2cdb210 100644
--- a/src/evaluate.h
+++ b/src/evaluate.h
@@ -1,7 +1,6 @@
/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
- Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2004-2021 The Stockfish developers (see AUTHORS file)
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,61 +16,47 @@
along with this program. If not, see .
*/
-#if !defined(EVALUATE_H_INCLUDED)
+#ifndef EVALUATE_H_INCLUDED
#define EVALUATE_H_INCLUDED
-#include "material.h"
-#include "pawns.h"
+#include
+#include
+
#include "types.h"
+namespace Stockfish {
+
class Position;
namespace Eval {
-// Struct Eval::Info contains various information computed and collected
-// by the evaluation functions.
-struct Info {
-
- // Pointers to material and pawn hash table entries
- 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][ALL_PIECES]
- // contains all squares attacked by the given color.
- Bitboard attackedBy[COLOR_NB][PIECE_TYPE_NB];
-
- // 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, kingRing[BLACK] is a bitboard containing the squares f8, h8,
- // f7, g7, h7, f6, g6 and h6.
- Bitboard kingRing[COLOR_NB];
-
- // kingAttackersCount[color] is the number of pieces of the given color
- // 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 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[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[COLOR_NB];
-};
-
-extern void init();
-extern Value evaluate(const Position& pos, Value& margin, Info* ei);
-extern std::string trace(const Position& pos);
-
-}
-
-#endif // !defined(EVALUATE_H_INCLUDED)
+ std::string trace(Position& pos);
+ Value evaluate(const Position& pos);
+
+ extern bool useNNUE;
+ extern std::string currentEvalFileName;
+
+ // The default net name MUST follow the format nn-[SHA256 first 12 digits].nnue
+ // for the build process (profile-build and fishtest) to work. Do not change the
+ // name of the macro, as it is used in the Makefile.
+ #define EvalFileDefaultName "nn-13406b1dcbe0.nnue"
+
+ namespace NNUE {
+
+ std::string trace(Position& pos);
+ Value evaluate(const Position& pos, bool adjusted = false);
+
+ void init();
+ void verify();
+
+ bool load_eval(std::string name, std::istream& stream);
+ bool save_eval(std::ostream& stream);
+ bool save_eval(const std::optional& filename);
+
+ } // namespace NNUE
+
+} // namespace Eval
+
+} // namespace Stockfish
+
+#endif // #ifndef EVALUATE_H_INCLUDED