X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fevaluate.h;h=7dbc35deabdb4427243ea96388bf955e95cf8460;hb=736400675746c6b84a0bdf131babce1b07ade0df;hp=b95aa15d92aad4e662f90a1cc8f2f8d52fced5f1;hpb=ca4e78db8db1288eb5c8deecb9bdf402f53fdc98;p=stockfish
diff --git a/src/evaluate.h b/src/evaluate.h
index b95aa15d..7dbc35de 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 Marco Costalba
+ Copyright (C) 2004-2020 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,94 +16,37 @@
along with this program. If not, see .
*/
-
-#if !defined(EVALUATE_H_INCLUDED)
+#ifndef EVALUATE_H_INCLUDED
#define EVALUATE_H_INCLUDED
-////
-//// Includes
-////
-
-#include "material.h"
-#include "pawns.h"
-#include "position.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.
-
-struct EvalInfo {
-
- // Middle game and endgame evaluations:
- Value mgValue, egValue;
-
- // Pointers to material and pawn hash table entries:
- MaterialInfo *mi;
- PawnInfo *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]; }
-
- // kingZone[color] is the zone around the enemy 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,
- // f7, g7, h7, f6, g6 and h6.
- Bitboard kingZone[2];
-
- // 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];
-
- // 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
- // weights of the individual piece types are given by the variables
- // QueenAttackWeight, RookAttackWeight, BishopAttackWeight and
- // KnightAttackWeight in evaluate.cpp
- int kingAttackersWeight[2];
-
- // 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.
- Value mgMobility, egMobility;
-
- // Extra futility margin. This is added to the standard futility margin
- // in the quiescence search.
- Value futilityMargin;
-};
-
-
-////
-//// Prototypes
-////
-
-extern Value evaluate(const Position &pos, EvalInfo &ei, int threadID);
-extern Value quick_evaluate(const Position &pos);
-extern void init_eval(int threads);
-extern void quit_eval();
-extern void read_weights(Color sideToMove);
-
-
-#endif // !defined(EVALUATE_H_INCLUDED)
+#include
+
+#include "types.h"
+
+class Position;
+
+namespace Eval {
+
+ std::string trace(const Position& pos);
+ Value evaluate(const Position& pos);
+
+ extern bool useNNUE;
+ extern std::string eval_file_loaded;
+
+ // 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-62ef826d1a6d.nnue"
+
+ namespace NNUE {
+
+ Value evaluate(const Position& pos);
+ bool load_eval(std::string name, std::istream& stream);
+ void init();
+ void verify();
+
+ } // namespace NNUE
+
+} // namespace Eval
+
+#endif // #ifndef EVALUATE_H_INCLUDED