X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fendgame.cpp;h=1e766e28637c4bac9493978c711cd8a751819b28;hp=f82beef608e2a1772d0ce472847c62754edcead6;hb=f9d3b48ad0ed62732bb07d4811f4fd17cf088cfe;hpb=683595fee15a1d8ceeb1bbd577d96ed9c0f8aaaa diff --git a/src/endgame.cpp b/src/endgame.cpp index f82beef6..1e766e28 100644 --- a/src/endgame.cpp +++ b/src/endgame.cpp @@ -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 @@ -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 //// @@ -363,7 +329,7 @@ Value EvaluationFunction::apply(const Position& pos) { assert(pos.non_pawn_material(strongerSide) == 2*BishopValueMidgame); assert(pos.piece_count(weakerSide, KNIGHT) == 1); assert(pos.non_pawn_material(weakerSide) == KnightValueMidgame); - assert(pos.pawns() == EmptyBoardBB); + assert(pos.pieces(PAWN) == EmptyBoardBB); Value result = BishopValueEndgame; Square wksq = pos.king_square(strongerSide); @@ -377,16 +343,23 @@ Value EvaluationFunction::apply(const Position& pos) { result += Value(square_distance(bksq, nsq) * 32); // Bonus for restricting the knight's mobility - result += Value((8 - count_1s_max_15(pos.piece_attacks(nsq))) * 8); + result += Value((8 - count_1s_max_15(pos.attacks_from(nsq))) * 8); return (strongerSide == pos.side_to_move() ? result : -result); } + +/// K and two minors vs K and one or two minors or K and two knights against +/// king alone are always draw. template<> Value EvaluationFunction::apply(const Position&) { return Value(0); } +template<> +Value EvaluationFunction::apply(const Position&) { + return Value(0); +} /// KBPKScalingFunction scales endgames where the stronger side has king, /// bishop and one or more pawns. It checks for draws with rook pawns and a @@ -394,7 +367,7 @@ Value EvaluationFunction::apply(const Position&) { /// returned. If not, the return value is SCALE_FACTOR_NONE, i.e. no scaling /// will be used. template<> -ScaleFactor ScalingFunction::apply(const Position& pos) { +ScaleFactor ScalingFunction::apply(const Position& pos) { assert(pos.non_pawn_material(strongerSide) == BishopValueMidgame); assert(pos.piece_count(strongerSide, BISHOP) == 1); @@ -403,7 +376,7 @@ ScaleFactor ScalingFunction::apply(const Position& pos) { // No assertions about the material of weakerSide, because we want draws to // be detected even when the weaker side has some pawns. - Bitboard pawns = pos.pawns(strongerSide); + Bitboard pawns = pos.pieces(PAWN, strongerSide); File pawnFile = square_file(pos.piece_list(strongerSide, PAWN, 0)); // All pawns are on a single rook file ? @@ -420,7 +393,6 @@ ScaleFactor ScalingFunction::apply(const Position& pos) { // The bishop has the wrong color, and the defending king is on the // file of the pawn(s) or the neighboring file. Find the rank of the // frontmost pawn. - Rank rank; if (strongerSide == WHITE) { @@ -449,7 +421,7 @@ ScaleFactor ScalingFunction::apply(const Position& pos) { /// It tests for fortress draws with a rook on the third rank defended by /// a pawn. template<> -ScaleFactor ScalingFunction::apply(const Position& pos) { +ScaleFactor ScalingFunction::apply(const Position& pos) { assert(pos.non_pawn_material(strongerSide) == QueenValueMidgame); assert(pos.piece_count(strongerSide, QUEEN) == 1); @@ -460,12 +432,12 @@ ScaleFactor ScalingFunction::apply(const Position& pos) { Square kingSq = pos.king_square(weakerSide); if ( relative_rank(weakerSide, kingSq) <= RANK_2 && relative_rank(weakerSide, pos.king_square(strongerSide)) >= RANK_4 - && (pos.rooks(weakerSide) & relative_rank_bb(weakerSide, RANK_3)) - && (pos.pawns(weakerSide) & relative_rank_bb(weakerSide, RANK_2)) - && (pos.piece_attacks(kingSq) & pos.pawns(weakerSide))) + && (pos.pieces(ROOK, weakerSide) & relative_rank_bb(weakerSide, RANK_3)) + && (pos.pieces(PAWN, weakerSide) & relative_rank_bb(weakerSide, RANK_2)) + && (pos.attacks_from(kingSq) & pos.pieces(PAWN, weakerSide))) { Square rsq = pos.piece_list(weakerSide, ROOK, 0); - if (pos.pawn_attacks(strongerSide, rsq) & pos.pawns(weakerSide)) + if (pos.attacks_from(rsq, strongerSide) & pos.pieces(PAWN, weakerSide)) return ScaleFactor(0); } return SCALE_FACTOR_NONE; @@ -644,7 +616,7 @@ ScaleFactor ScalingFunction::apply(const Position &pos) { assert(pos.non_pawn_material(weakerSide) == Value(0)); assert(pos.piece_count(weakerSide, PAWN) == 0); - Bitboard pawns = pos.pawns(strongerSide); + Bitboard pawns = pos.pieces(PAWN, strongerSide); // Are all pawns on the 'a' file? if ((pawns & ~FileABB) == EmptyBoardBB) @@ -722,9 +694,9 @@ ScaleFactor ScalingFunction::apply(const Position &pos) { else { Bitboard ray = ray_bb(pawnSq, (strongerSide == WHITE)? SIGNED_DIR_N : SIGNED_DIR_S); - if (ray & pos.kings(weakerSide)) + if (ray & pos.pieces(KING, weakerSide)) return ScaleFactor(0); - if( (pos.piece_attacks(weakerBishopSq) & ray) + if( (pos.attacks_from(weakerBishopSq) & ray) && square_distance(weakerBishopSq, pawnSq) >= 3) return ScaleFactor(0); } @@ -789,13 +761,13 @@ ScaleFactor ScalingFunction::apply(const Position& pos) { if ( ksq == blockSq1 && square_color(ksq) != square_color(wbsq) && ( bbsq == blockSq2 - || (pos.piece_attacks(blockSq2) & pos.bishops(weakerSide)) + || (pos.attacks_from(blockSq2) & pos.pieces(BISHOP, weakerSide)) || rank_distance(r1, r2) >= 2)) return ScaleFactor(0); else if ( ksq == blockSq2 && square_color(ksq) != square_color(wbsq) && ( bbsq == blockSq1 - || (pos.piece_attacks(blockSq1) & pos.bishops(weakerSide)))) + || (pos.attacks_from(blockSq1) & pos.pieces(BISHOP, weakerSide)))) return ScaleFactor(0); else return SCALE_FACTOR_NONE;