X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fendgame.cpp;h=a8c1e1d01ffb4d4803fbc1a957bd25366a2b85a7;hp=3f3bdcce7646ea5da05cbf68fc7228b62dc87c37;hb=297c12e595ebc33e11be73ee4b188326418acb4f;hpb=5c81602d14539f8259a715477315e28b5de7cb54 diff --git a/src/endgame.cpp b/src/endgame.cpp index 3f3bdcce..a8c1e1d0 100644 --- a/src/endgame.cpp +++ b/src/endgame.cpp @@ -25,44 +25,10 @@ #include #include "bitbase.h" +#include "bitcount.h" #include "endgame.h" -//// -//// Constants and variables -//// - -/// Evaluation functions - -// Generic "mate lone king" eval -EvaluationFunction EvaluateKXK(WHITE), EvaluateKKX(BLACK); - -// K and two minors vs K and one or two minors -EvaluationFunction EvaluateKmmKm(WHITE); - -EvaluationFunction EvaluateKBNK(WHITE), EvaluateKKBN(BLACK); // KBN vs K -EvaluationFunction EvaluateKPK(WHITE), EvaluateKKP(BLACK); // KP vs K -EvaluationFunction EvaluateKRKP(WHITE), EvaluateKPKR(BLACK); // KR vs KP -EvaluationFunction EvaluateKRKB(WHITE), EvaluateKBKR(BLACK); // KR vs KB -EvaluationFunction EvaluateKRKN(WHITE), EvaluateKNKR(BLACK); // KR vs KN -EvaluationFunction EvaluateKQKR(WHITE), EvaluateKRKQ(BLACK); // KQ vs KR -EvaluationFunction EvaluateKBBKN(WHITE), EvaluateKNKBB(BLACK); // KBB vs KN - - -/// Scaling functions - -ScalingFunction ScaleKBPK(WHITE), ScaleKKBP(BLACK); // KBP vs K -ScalingFunction ScaleKQKRP(WHITE), ScaleKRPKQ(BLACK); // KQ vs KRP -ScalingFunction ScaleKRPKR(WHITE), ScaleKRKRP(BLACK); // KRP vs KR -ScalingFunction ScaleKRPPKRP(WHITE), ScaleKRPKRPP(BLACK); // KRPP vs KRP -ScalingFunction ScaleKPsK(WHITE), ScaleKKPs(BLACK); // King and pawns vs king -ScalingFunction ScaleKBPKB(WHITE), ScaleKBKBP(BLACK); // KBP vs KB -ScalingFunction ScaleKBPPKB(WHITE), ScaleKBKBPP(BLACK); // KBPP vs KB -ScalingFunction ScaleKBPKN(WHITE), ScaleKNKBP(BLACK); // KBP vs KN -ScalingFunction ScaleKNPK(WHITE), ScaleKKNP(BLACK); // KNP vs K -ScalingFunction ScaleKPKPw(WHITE), ScaleKPKPb(BLACK); // KPKP - - //// //// Local definitions ////