X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.h;h=d701f5a7fdeb93363e38186fef607ce8264bbf82;hp=75e1f9150cc77958014207a4f81b21ecd9e1e6b4;hb=406979ea12ee7828e079871b0f9f3dc8f127a741;hpb=94b9c65e09b5d396bebb29b62d9979139b5fbdfa
diff --git a/src/evaluate.h b/src/evaluate.h
index 75e1f915..d701f5a7 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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ 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,39 @@
along with this program. If not, see .
*/
-
-#if !defined(EVALUATE_H_INCLUDED)
+#ifndef EVALUATE_H_INCLUDED
#define EVALUATE_H_INCLUDED
-////
-//// Includes
-////
-
-#include
-
-#include "material.h"
-#include "pawns.h"
+#include
+#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 {
-
- EvalInfo() { kingDanger[0] = kingDanger[1] = VALUE_ZERO; }
-
- // Middle game and endgame evaluations
- Score value;
-
- // 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];
+namespace Eval {
- // 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];
+ std::string trace(const Position& pos);
+ Value evaluate(const Position& pos);
- // Middle game and endgame mobility scores
- Score mobility;
+ extern bool useNNUE;
+ extern std::string eval_file_loaded;
+ void init_NNUE();
+ void verify_NNUE();
- // Value of the danger for the king of the given color
- Value kingDanger[2];
-};
+ // 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-82215d0fd0df.nnue"
+ namespace NNUE {
-////
-//// Prototypes
-////
+ Value evaluate(const Position& pos);
+ Value compute_eval(const Position& pos);
+ void update_eval(const Position& pos);
+ bool load_eval(std::string streamName, std::istream& stream);
-extern Value evaluate(const Position& pos, EvalInfo& ei);
-extern void init_eval(int threads);
-extern void quit_eval();
-extern void read_weights(Color sideToMove);
+ } // namespace NNUE
+} // namespace Eval
-#endif // !defined(EVALUATE_H_INCLUDED)
+#endif // #ifndef EVALUATE_H_INCLUDED