X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fendgame.h;h=ceb93efad91b057a4e2ab60d483a4cd3a6e3a4a2;hb=c2511243b40964e5ed5f35447baf5663a72da72a;hp=e4ee9bc8472b13120c7b60bb26b8b9d5ace3bfc1;hpb=cc8e915ed5fa95fc9cde500e7aac3c4dfe7d2daa;p=stockfish
diff --git a/src/endgame.h b/src/endgame.h
index e4ee9bc8..ceb93efa 100644
--- a/src/endgame.h
+++ b/src/endgame.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 Marco Costalba
+ Copyright (C) 2008-2010 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,22 +17,11 @@
along with this program. If not, see .
*/
-
#if !defined(ENDGAME_H_INCLUDED)
#define ENDGAME_H_INCLUDED
-////
-//// Includes
-////
-
#include "position.h"
-#include "scale.h"
-#include "value.h"
-
-
-////
-//// Types
-////
+#include "types.h"
enum EndgameType {
@@ -45,11 +34,12 @@ enum EndgameType {
KRKN, // KR vs KN
KQKR, // KQ vs KR
KBBKN, // KBB vs KN
+ KNNK, // KNN vs K
KmmKm, // K and two minors vs K and one or two minors
// Scaling functions
- KBPK, // KBP vs K
- KQKRP, // KQ vs KRP
+ KBPsK, // KB+pawns vs K
+ KQKRPs, // KQ vs KR+pawns
KRPKR, // KRP vs KR
KRPPKRP, // KRPP vs KRP
KPsK, // King and pawns vs king
@@ -65,9 +55,10 @@ enum EndgameType {
template
class EndgameFunctionBase {
public:
- EndgameFunctionBase(Color c) : strongerSide(c) { weakerSide = opposite_color(strongerSide); }
+ EndgameFunctionBase(Color c) : strongerSide(c), weakerSide(opposite_color(c)) {}
virtual ~EndgameFunctionBase() {}
- virtual T apply(const Position&) = 0;
+ virtual T apply(const Position&) const = 0;
+ Color color() const { return strongerSide; }
protected:
Color strongerSide, weakerSide;
@@ -81,47 +72,16 @@ typedef EndgameFunctionBase EndgameScalingFunctionBase;
template
struct EvaluationFunction : public EndgameEvaluationFunctionBase {
+ typedef EndgameEvaluationFunctionBase Base;
explicit EvaluationFunction(Color c): EndgameEvaluationFunctionBase(c) {}
- Value apply(const Position&);
+ Value apply(const Position&) const;
};
template
struct ScalingFunction : public EndgameScalingFunctionBase {
+ typedef EndgameScalingFunctionBase Base;
explicit ScalingFunction(Color c) : EndgameScalingFunctionBase(c) {}
- ScaleFactor apply(const Position&);
+ ScaleFactor apply(const Position&) const;
};
-
-////
-//// Constants and variables
-////
-
-extern EvaluationFunction EvaluateKXK, EvaluateKKX; // Generic "mate lone king" eval
-extern EvaluationFunction EvaluateKBNK, EvaluateKKBN; // KBN vs K
-extern EvaluationFunction EvaluateKPK, EvaluateKKP; // KP vs K
-extern EvaluationFunction EvaluateKRKP, EvaluateKPKR; // KR vs KP
-extern EvaluationFunction EvaluateKRKB, EvaluateKBKR; // KR vs KB
-extern EvaluationFunction EvaluateKRKN, EvaluateKNKR; // KR vs KN
-extern EvaluationFunction EvaluateKQKR, EvaluateKRKQ; // KQ vs KR
-extern EvaluationFunction EvaluateKBBKN, EvaluateKNKBB; // KBB vs KN
-extern EvaluationFunction EvaluateKmmKm; // K and two minors vs K and one or two minors:
-
-extern ScalingFunction ScaleKBPK, ScaleKKBP; // KBP vs K
-extern ScalingFunction ScaleKQKRP, ScaleKRPKQ; // KQ vs KRP
-extern ScalingFunction ScaleKRPKR, ScaleKRKRP; // KRP vs KR
-extern ScalingFunction ScaleKRPPKRP, ScaleKRPKRPP; // KRPP vs KRP
-extern ScalingFunction ScaleKPsK, ScaleKKPs; // King and pawns vs king
-extern ScalingFunction ScaleKBPKB, ScaleKBKBP; // KBP vs KB
-extern ScalingFunction ScaleKBPPKB, ScaleKBKBPP; // KBPP vs KB
-extern ScalingFunction ScaleKBPKN, ScaleKNKBP; // KBP vs KN
-extern ScalingFunction ScaleKNPK, ScaleKKNP; // KNP vs K
-extern ScalingFunction ScaleKPKPw, ScaleKPKPb; // KP vs KP
-
-////
-//// Prototypes
-////
-
-extern void init_bitbases();
-
-
#endif // !defined(ENDGAME_H_INCLUDED)