X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fendgame.h;h=146111b95791511a361a9af8ff96e24aca81fe46;hb=f3b296c2e2061951d366edfbd5287f336e865553;hp=271490b186436395947fdf173c3c48cb5dad9a83;hpb=297c12e595ebc33e11be73ee4b188326418acb4f;p=stockfish
diff --git a/src/endgame.h b/src/endgame.h
index 271490b1..146111b9 100644
--- a/src/endgame.h
+++ b/src/endgame.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-2009 Marco Costalba
+ 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,86 +16,111 @@
along with this program. If not, see .
*/
-
-#if !defined(ENDGAME_H_INCLUDED)
+#ifndef ENDGAME_H_INCLUDED
#define ENDGAME_H_INCLUDED
-////
-//// Includes
-////
+#include
+#include
+#include
+#include
+#include
#include "position.h"
-#include "scale.h"
-#include "value.h"
-
-
-////
-//// Types
-////
-
-enum EndgameType {
-
- // Evaluation functions
- KXK, // Generic "mate lone king" eval
- KBNK, // KBN vs K
- KPK, // KP vs K
- KRKP, // KR vs KP
- KRKB, // KR vs KB
- KRKN, // KR vs KN
- KQKR, // KQ vs KR
- KBBKN, // KBB vs KN
- KmmKm, // K and two minors vs K and one or two minors
-
- // Scaling functions
- KBPK, // KBP vs K
- KQKRP, // KQ vs KRP
- KRPKR, // KRP vs KR
- KRPPKRP, // KRPP vs KRP
- KPsK, // King and pawns vs king
- KBPKB, // KBP vs KB
- KBPPKB, // KBPP vs KB
- KBPKN, // KBP vs KN
- KNPK, // KNP vs K
- KPKP // KP vs KP
+#include "types.h"
+
+namespace Stockfish {
+
+/// EndgameCode lists all supported endgame functions by corresponding codes
+
+enum EndgameCode {
+
+ EVALUATION_FUNCTIONS,
+ KNNK, // KNN vs K
+ KNNKP, // KNN vs KP
+ KXK, // Generic "mate lone king" eval
+ KBNK, // KBN vs K
+ KPK, // KP vs K
+ KRKP, // KR vs KP
+ KRKB, // KR vs KB
+ KRKN, // KR vs KN
+ KQKP, // KQ vs KP
+ KQKR, // KQ vs KR
+
+ SCALING_FUNCTIONS,
+ KBPsK, // KB and pawns vs K
+ KQKRPs, // KQ vs KR and pawns
+ KRPKR, // KRP vs KR
+ KRPKB, // KRP vs KB
+ KRPPKRP, // KRPP vs KRP
+ KPsK, // K and pawns vs K
+ KBPKB, // KBP vs KB
+ KBPPKB, // KBPP vs KB
+ KBPKN, // KBP vs KN
+ KPKP // KP vs KP
};
-/// Template abstract base class for all special endgame functions
-template
-class EndgameFunctionBase {
-public:
- EndgameFunctionBase(Color c) : strongerSide(c), weakerSide(opposite_color(c)) {}
- virtual ~EndgameFunctionBase() {}
- virtual T apply(const Position&) = 0;
-
-protected:
- Color strongerSide, weakerSide;
-};
+/// Endgame functions can be of two types depending on whether they return a
+/// Value or a ScaleFactor.
+
+template using
+eg_type = typename std::conditional<(E < SCALING_FUNCTIONS), Value, ScaleFactor>::type;
-typedef EndgameFunctionBase EndgameEvaluationFunctionBase;
-typedef EndgameFunctionBase EndgameScalingFunctionBase;
+/// Base and derived functors for endgame evaluation and scaling functions
-/// Templates subclass for various concrete endgames
+template
+struct EndgameBase {
+
+ explicit EndgameBase(Color c) : strongSide(c), weakSide(~c) {}
+ virtual ~EndgameBase() = default;
+ virtual T operator()(const Position&) const = 0;
-template
-struct EvaluationFunction : public EndgameEvaluationFunctionBase {
- explicit EvaluationFunction(Color c): EndgameEvaluationFunctionBase(c) {}
- Value apply(const Position&);
+ const Color strongSide, weakSide;
};
-template
-struct ScalingFunction : public EndgameScalingFunctionBase {
- explicit ScalingFunction(Color c) : EndgameScalingFunctionBase(c) {}
- ScaleFactor apply(const Position&);
+
+template>
+struct Endgame : public EndgameBase {
+
+ explicit Endgame(Color c) : EndgameBase(c) {}
+ T operator()(const Position&) const override;
};
-////
-//// Prototypes
-////
+/// The Endgames namespace handles the pointers to endgame evaluation and scaling
+/// base objects in two std::map. We use polymorphism to invoke the actual
+/// endgame function by calling its virtual operator().
+
+namespace Endgames {
+
+ template using Ptr = std::unique_ptr>;
+ template using Map = std::unordered_map>;
+
+ extern std::pair