X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=359222811593e621fdd16d9b2320961eeaf13182;hp=3be9939b7c8d0c89d9ca1225e14c4d912fc4f497;hb=3376c68f4bb83dc9fd874eb9d710dab09609ae54;hpb=90585a8a366c8ddf04bf5b5a11b480701d6d825a diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 3be9939b..35922281 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.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-2009 Marco Costalba 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,6 +25,7 @@ #include #include +#include "bitcount.h" #include "evaluate.h" #include "material.h" #include "pawns.h" @@ -39,34 +40,33 @@ namespace { - const int Sign[2] = {1, -1}; + const int Sign[2] = { 1, -1 }; - // Evaluation grain size, must be a power of 2. + // Evaluation grain size, must be a power of 2 const int GrainSize = 4; - // Evaluation weights - int WeightMobilityMidgame = 0x100; - int WeightMobilityEndgame = 0x100; - int WeightPawnStructureMidgame = 0x100; - int WeightPawnStructureEndgame = 0x100; - int WeightPassedPawnsMidgame = 0x100; - int WeightPassedPawnsEndgame = 0x100; - int WeightKingSafety[2] = { 0x100, 0x100 }; + // Evaluation weights, initialized from UCI options + int WeightMobilityMidgame, WeightMobilityEndgame; + int WeightPawnStructureMidgame, WeightPawnStructureEndgame; + int WeightPassedPawnsMidgame, WeightPassedPawnsEndgame; + int WeightKingSafety[2]; int WeightSpace; - // Internal evaluation weights. These are applied on top of the evaluation - // weights read from UCI parameters. The purpose is to be able to change + // Internal evaluation weights. These are applied on top of the evaluation + // weights read from UCI parameters. The purpose is to be able to change // the evaluation weights while keeping the default values of the UCI // parameters at 100, which looks prettier. - const int WeightMobilityMidgameInternal = 0x100; - const int WeightMobilityEndgameInternal = 0x100; - const int WeightPawnStructureMidgameInternal = 0x100; - const int WeightPawnStructureEndgameInternal = 0x100; - const int WeightPassedPawnsMidgameInternal = 0x100; - const int WeightPassedPawnsEndgameInternal = 0x100; - const int WeightKingSafetyInternal = 0x110; - const int WeightKingOppSafetyInternal = 0x110; - const int WeightSpaceInternal = 0x30; + // + // Values modified by Joona Kiiski + const int WeightMobilityMidgameInternal = 0x0FA; + const int WeightMobilityEndgameInternal = 0x10A; + const int WeightPawnStructureMidgameInternal = 0x0EC; + const int WeightPawnStructureEndgameInternal = 0x0CD; + const int WeightPassedPawnsMidgameInternal = 0x108; + const int WeightPassedPawnsEndgameInternal = 0x109; + const int WeightKingSafetyInternal = 0x0F7; + const int WeightKingOppSafetyInternal = 0x101; + const int WeightSpaceInternal = 0x02F; // Visually better to define tables constants typedef Value V; @@ -84,7 +84,7 @@ namespace { }; // Bishop mobility bonus in middle game and endgame, indexed by the number - // of attacked squares not occupied by friendly pieces. X-ray attacks through + // of attacked squares not occupied by friendly pieces. X-ray attacks through // queens are also included. const Value MidgameBishopMobilityBonus[] = { // 0 1 2 3 4 5 6 7 @@ -101,7 +101,7 @@ namespace { }; // Rook mobility bonus in middle game and endgame, indexed by the number - // of attacked squares not occupied by friendly pieces. X-ray attacks through + // of attacked squares not occupied by friendly pieces. X-ray attacks through // queens and rooks are also included. const Value MidgameRookMobilityBonus[] = { // 0 1 2 3 4 5 6 7 @@ -167,46 +167,46 @@ namespace { V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0) // 8 }; - // Bonus for unstoppable passed pawns: + // Bonus for unstoppable passed pawns const Value UnstoppablePawnValue = Value(0x500); - // Rooks and queens on the 7th rank: - const Value MidgameRookOn7thBonus = Value(50); - const Value EndgameRookOn7thBonus = Value(100); - const Value MidgameQueenOn7thBonus = Value(25); - const Value EndgameQueenOn7thBonus = Value(50); + // Rooks and queens on the 7th rank + const Value MidgameRookOn7thBonus = Value(47); + const Value EndgameRookOn7thBonus = Value(98); + const Value MidgameQueenOn7thBonus = Value(27); + const Value EndgameQueenOn7thBonus = Value(54); - // Rooks on open files: - const Value RookOpenFileBonus = Value(40); - const Value RookHalfOpenFileBonus = Value(20); + // Rooks on open files + const Value RookOpenFileBonus = Value(43); + const Value RookHalfOpenFileBonus = Value(19); // Penalty for rooks trapped inside a friendly king which has lost the - // right to castle: + // right to castle. const Value TrappedRookPenalty = Value(180); // Penalty for a bishop on a7/h7 (a2/h2 for black) which is trapped by - // enemy pawns: + // enemy pawns. const Value TrappedBishopA7H7Penalty = Value(300); - // Bitboard masks for detecting trapped bishops on a7/h7 (a2/h2 for black): + // Bitboard masks for detecting trapped bishops on a7/h7 (a2/h2 for black) const Bitboard MaskA7H7[2] = { ((1ULL << SQ_A7) | (1ULL << SQ_H7)), ((1ULL << SQ_A2) | (1ULL << SQ_H2)) }; // Penalty for a bishop on a1/h1 (a8/h8 for black) which is trapped by - // a friendly pawn on b2/g2 (b7/g7 for black). This can obviously only + // a friendly pawn on b2/g2 (b7/g7 for black). This can obviously only // happen in Chess960 games. const Value TrappedBishopA1H1Penalty = Value(100); - // Bitboard masks for detecting trapped bishops on a1/h1 (a8/h8 for black): + // Bitboard masks for detecting trapped bishops on a1/h1 (a8/h8 for black) const Bitboard MaskA1H1[2] = { ((1ULL << SQ_A1) | (1ULL << SQ_H1)), ((1ULL << SQ_A8) | (1ULL << SQ_H8)) }; // The SpaceMask[color] contains area of the board which is consdered by - // the space evaluation. In the middle game, each side is given a bonus + // the space evaluation. In the middle game, each side is given a bonus // based on how many squares inside this area are safe and available for // friendly minor pieces. const Bitboard SpaceMask[2] = { @@ -218,30 +218,26 @@ namespace { (1ULL< + void evaluate_pieces(const Position& p, Color us, EvalInfo& ei); + + template<> + void evaluate_pieces(const Position& p, Color us, EvalInfo &ei); void evaluate_passed_pawns(const Position &pos, EvalInfo &ei); void evaluate_trapped_bishop_a7h7(const Position &pos, Square s, Color us, @@ -288,8 +284,6 @@ namespace { inline Value apply_weight(Value v, int w); Value scale_by_game_phase(Value mv, Value ev, Phase ph, const ScaleFactor sf[]); - int count_1s_8bit(Bitboard b); - int compute_weight(int uciWeight, int internalWeight); int weight_option(const std::string& opt, int weight); void init_safety(); @@ -346,58 +340,28 @@ Value evaluate(const Position &pos, EvalInfo &ei, int threadID) { // Initialize pawn attack bitboards for both sides ei.attackedBy[WHITE][PAWN] = ((pos.pawns(WHITE) << 9) & ~FileABB) | ((pos.pawns(WHITE) << 7) & ~FileHBB); ei.attackedBy[BLACK][PAWN] = ((pos.pawns(BLACK) >> 7) & ~FileABB) | ((pos.pawns(BLACK) >> 9) & ~FileHBB); - ei.kingAttackersCount[WHITE] = count_1s_max_15(ei.attackedBy[WHITE][PAWN] & ei.attackedBy[BLACK][KING])/2; - ei.kingAttackersCount[BLACK] = count_1s_max_15(ei.attackedBy[BLACK][PAWN] & ei.attackedBy[WHITE][KING])/2; + ei.kingAttackersCount[WHITE] = count_1s_max_15(ei.attackedBy[WHITE][PAWN] & ei.attackedBy[BLACK][KING])/2; + ei.kingAttackersCount[BLACK] = count_1s_max_15(ei.attackedBy[BLACK][PAWN] & ei.attackedBy[WHITE][KING])/2; // Evaluate pieces for (Color c = WHITE; c <= BLACK; c++) { - // Knights - for (int i = 0; i < pos.piece_count(c, KNIGHT); i++) - evaluate_knight(pos, pos.piece_list(c, KNIGHT, i), c, ei); - - // Bishops - for (int i = 0; i < pos.piece_count(c, BISHOP); i++) - evaluate_bishop(pos, pos.piece_list(c, BISHOP, i), c, ei); - - // Rooks - for (int i = 0; i < pos.piece_count(c, ROOK); i++) - evaluate_rook(pos, pos.piece_list(c, ROOK, i), c, ei); - - // Queens - for(int i = 0; i < pos.piece_count(c, QUEEN); i++) - evaluate_queen(pos, pos.piece_list(c, QUEEN, i), c, ei); - - // Special pattern: trapped bishops on a7/h7/a2/h2 - Bitboard b = pos.bishops(c) & MaskA7H7[c]; - while (b) - { - Square s = pop_1st_bit(&b); - evaluate_trapped_bishop_a7h7(pos, s, c, ei); - } - - // Special pattern: trapped bishops on a1/h1/a8/h8 in Chess960: - if (Chess960) - { - b = pos.bishops(c) & MaskA1H1[c]; - while (b) - { - Square s = pop_1st_bit(&b); - evaluate_trapped_bishop_a1h1(pos, s, c, ei); - } - } - - // Sum up all attacked squares - ei.attackedBy[c][0] = ei.attackedBy[c][PAWN] | ei.attackedBy[c][KNIGHT] - | ei.attackedBy[c][BISHOP] | ei.attackedBy[c][ROOK] - | ei.attackedBy[c][QUEEN] | ei.attackedBy[c][KING]; + evaluate_pieces(pos, c, ei); + evaluate_pieces(pos, c, ei); + evaluate_pieces(pos, c, ei); + evaluate_pieces(pos, c, ei); + + // Sum up all attacked squares + ei.attackedBy[c][0] = ei.attackedBy[c][PAWN] | ei.attackedBy[c][KNIGHT] + | ei.attackedBy[c][BISHOP] | ei.attackedBy[c][ROOK] + | ei.attackedBy[c][QUEEN] | ei.attackedBy[c][KING]; } // Kings. Kings are evaluated after all other pieces for both sides, // because we need complete attack information for all pieces when computing // the king safety evaluation. for (Color c = WHITE; c <= BLACK; c++) - evaluate_king(pos, pos.king_square(c), c, ei); + evaluate_pieces(pos, c, ei); // Evaluate passed pawns. We evaluate passed pawns for both sides at once, // because we need to know which side promotes first in positions where @@ -483,7 +447,7 @@ Value quick_evaluate(const Position &pos) { assert(pos.is_ok()); static const - ScaleFactor sf[2] = {SCALE_FACTOR_NORMAL, SCALE_FACTOR_NORMAL}; + ScaleFactor sf[2] = {SCALE_FACTOR_NORMAL, SCALE_FACTOR_NORMAL}; Value mgv = pos.mg_value(); Value egv = pos.eg_value(); @@ -517,7 +481,10 @@ void init_eval(int threads) { } for (Bitboard b = 0ULL; b < 256ULL; b++) - BitCount8Bit[b] = count_1s(b); + { + assert(count_1s(b) == int(uint8_t(count_1s(b)))); + BitCount8Bit[b] = (uint8_t)count_1s(b); + } } @@ -529,6 +496,8 @@ void quit_eval() { { delete PawnTable[i]; delete MaterialTable[i]; + PawnTable[i] = NULL; + MaterialTable[i] = NULL; } } @@ -559,167 +528,158 @@ namespace { // evaluate_common() computes terms common to all pieces attack - int evaluate_common(const Position&p, const Bitboard& b, Color us, EvalInfo& ei, - int AttackWeight, const Value* mgBonus, const Value* egBonus, - Square s = SQ_NONE, const Value* OutpostBonus = NULL) { + template + int evaluate_common(const Position& p, const Bitboard& b, Color us, EvalInfo& ei, Square s = SQ_NONE) { + + static const int AttackWeight[] = { 0, 0, KnightAttackWeight, BishopAttackWeight, RookAttackWeight, QueenAttackWeight }; + static const Value* MgBonus[] = { 0, 0, MidgameKnightMobilityBonus, MidgameBishopMobilityBonus, MidgameRookMobilityBonus, MidgameQueenMobilityBonus }; + static const Value* EgBonus[] = { 0, 0, EndgameKnightMobilityBonus, EndgameBishopMobilityBonus, EndgameRookMobilityBonus, EndgameQueenMobilityBonus }; + static const Value* OutpostBonus[] = { 0, 0, KnightOutpostBonus, BishopOutpostBonus, 0, 0 }; Color them = opposite_color(us); + // Update attack info + ei.attackedBy[us][Piece] |= b; + // King attack if (b & ei.kingZone[us]) { ei.kingAttackersCount[us]++; - ei.kingAttackersWeight[us] += AttackWeight; + ei.kingAttackersWeight[us] += AttackWeight[Piece]; Bitboard bb = (b & ei.attackedBy[them][KING]); if (bb) - ei.kingAdjacentZoneAttacksCount[us] += count_1s_max_15(bb); + ei.kingAdjacentZoneAttacksCount[us] += count_1s_max_15(bb); } // Remove squares protected by enemy pawns Bitboard bb = (b & ~ei.attackedBy[them][PAWN]); // Mobility - int mob = count_1s_max_15(bb & ~p.pieces_of_color(us)); - ei.mgMobility += Sign[us] * mgBonus[mob]; - ei.egMobility += Sign[us] * egBonus[mob]; - - // Bishop and Knight outposts - if (!OutpostBonus || !p.square_is_weak(s, them)) - return mob; + int mob = (Piece != QUEEN ? count_1s_max_15(bb & ~p.pieces_of_color(us)) + : count_1s(bb & ~p.pieces_of_color(us))); - // Initial bonus based on square - Value v, bonus; - v = bonus = OutpostBonus[relative_square(us, s)]; + ei.mgMobility += Sign[us] * MgBonus[Piece][mob]; + ei.egMobility += Sign[us] * EgBonus[Piece][mob]; - // Increase bonus if supported by pawn, especially if the opponent has - // no minor piece which can exchange the outpost piece - if (v && (p.pawn_attacks(them, s) & p.pawns(us))) + // Bishop and Knight outposts + if ( (Piece == BISHOP || Piece == KNIGHT) // compile time condition + && p.square_is_weak(s, them)) { - bonus += v / 2; - if ( p.piece_count(them, KNIGHT) == 0 - && (SquaresByColorBB[square_color(s)] & p.bishops(them)) == EmptyBoardBB) - bonus += v; + // Initial bonus based on square + Value v, bonus; + v = bonus = OutpostBonus[Piece][relative_square(us, s)]; + + // Increase bonus if supported by pawn, especially if the opponent has + // no minor piece which can exchange the outpost piece + if (v && (p.pawn_attacks(them, s) & p.pawns(us))) + { + bonus += v / 2; + if ( p.piece_count(them, KNIGHT) == 0 + && (SquaresByColorBB[square_color(s)] & p.bishops(them)) == EmptyBoardBB) + bonus += v; + } + ei.mgValue += Sign[us] * bonus; + ei.egValue += Sign[us] * bonus; } - ei.mgValue += Sign[us] * bonus; - ei.egValue += Sign[us] * bonus; return mob; } - // evaluate_knight() assigns bonuses and penalties to a knight of a given - // color on a given square. - - void evaluate_knight(const Position &p, Square s, Color us, EvalInfo &ei) { - - Bitboard b = p.piece_attacks(s); - ei.attackedBy[us][KNIGHT] |= b; - - // King attack, mobility and outposts - evaluate_common(p, b, us, ei, KnightAttackWeight, MidgameKnightMobilityBonus, - EndgameKnightMobilityBonus, s, KnightOutpostBonus); - } - - - // evaluate_bishop() assigns bonuses and penalties to a bishop of a given - // color on a given square. - - void evaluate_bishop(const Position &p, Square s, Color us, EvalInfo &ei) { - - Bitboard b = bishop_attacks_bb(s, p.occupied_squares() & ~p.queens(us)); - ei.attackedBy[us][BISHOP] |= b; - - // King attack, mobility and outposts - evaluate_common(p, b, us, ei, BishopAttackWeight, MidgameBishopMobilityBonus, - EndgameBishopMobilityBonus, s, BishopOutpostBonus); - } - - - // evaluate_rook() assigns bonuses and penalties to a rook of a given - // color on a given square. - - void evaluate_rook(const Position &p, Square s, Color us, EvalInfo &ei) { + // evaluate_pieces<>() assigns bonuses and penalties to the pieces of a given + // color. - Bitboard b = rook_attacks_bb(s, p.occupied_squares() & ~p.rooks_and_queens(us)); - ei.attackedBy[us][ROOK] |= b; + template + void evaluate_pieces(const Position& pos, Color us, EvalInfo& ei) { - // King attack and mobility - int mob = evaluate_common(p, b, us, ei, RookAttackWeight, MidgameRookMobilityBonus, - EndgameRookMobilityBonus); + Bitboard b; + Square s, ksq; + Color them; + int mob; + File f; - // Rook on 7th rank - Color them = opposite_color(us); - - if ( relative_rank(us, s) == RANK_7 - && relative_rank(us, p.king_square(them)) == RANK_8) + for (int i = 0, e = pos.piece_count(us, Piece); i < e; i++) { - ei.mgValue += Sign[us] * MidgameRookOn7thBonus; - ei.egValue += Sign[us] * EndgameRookOn7thBonus; - } + s = pos.piece_list(us, Piece, i); - // Open and half-open files - File f = square_file(s); - if (ei.pi->file_is_half_open(us, f)) - { - if (ei.pi->file_is_half_open(them, f)) - { - ei.mgValue += Sign[us] * RookOpenFileBonus; - ei.egValue += Sign[us] * RookOpenFileBonus; - } - else - { - ei.mgValue += Sign[us] * RookHalfOpenFileBonus; - ei.egValue += Sign[us] * RookHalfOpenFileBonus; - } - } - - // Penalize rooks which are trapped inside a king. Penalize more if - // king has lost right to castle - if (mob > 6 || ei.pi->file_is_half_open(us, f)) - return; + if (Piece == KNIGHT || Piece == QUEEN) + b = pos.piece_attacks(s); + else if (Piece == BISHOP) + b = bishop_attacks_bb(s, pos.occupied_squares() & ~pos.queens(us)); + else if (Piece == ROOK) + b = rook_attacks_bb(s, pos.occupied_squares() & ~pos.rooks_and_queens(us)); - Square ksq = p.king_square(us); + // Attacks, mobility and outposts + mob = evaluate_common(pos, b, us, ei, s); - if ( square_file(ksq) >= FILE_E - && square_file(s) > square_file(ksq) - && (relative_rank(us, ksq) == RANK_1 || square_rank(ksq) == square_rank(s))) - { - // Is there a half-open file between the king and the edge of the board? - if (!ei.pi->has_open_file_to_right(us, square_file(ksq))) - ei.mgValue -= p.can_castle(us)? Sign[us] * ((TrappedRookPenalty - mob * 16) / 2) - : Sign[us] * (TrappedRookPenalty - mob * 16); - } - else if ( square_file(ksq) <= FILE_D - && square_file(s) < square_file(ksq) - && (relative_rank(us, ksq) == RANK_1 || square_rank(ksq) == square_rank(s))) - { - // Is there a half-open file between the king and the edge of the board? - if (!ei.pi->has_open_file_to_left(us, square_file(ksq))) - ei.mgValue -= p.can_castle(us)? Sign[us] * ((TrappedRookPenalty - mob * 16) / 2) - : Sign[us] * (TrappedRookPenalty - mob * 16); - } - } + // Special patterns: trapped bishops on a7/h7/a2/h2 + // and trapped bishops on a1/h1/a8/h8 in Chess960. + if (Piece == BISHOP) + { + if (bit_is_set(MaskA7H7[us], s)) + evaluate_trapped_bishop_a7h7(pos, s, us, ei); + if (Chess960 && bit_is_set(MaskA1H1[us], s)) + evaluate_trapped_bishop_a1h1(pos, s, us, ei); + } - // evaluate_queen() assigns bonuses and penalties to a queen of a given - // color on a given square. + if (Piece == ROOK || Piece == QUEEN) + { + // Queen or rook on 7th rank + them = opposite_color(us); - void evaluate_queen(const Position &p, Square s, Color us, EvalInfo &ei) { + if ( relative_rank(us, s) == RANK_7 + && relative_rank(us, pos.king_square(them)) == RANK_8) + { + ei.mgValue += Sign[us] * (Piece == ROOK ? MidgameRookOn7thBonus : MidgameQueenOn7thBonus); + ei.egValue += Sign[us] * (Piece == ROOK ? EndgameRookOn7thBonus : EndgameQueenOn7thBonus); + } + } - Bitboard b = p.piece_attacks(s); - ei.attackedBy[us][QUEEN] |= b; + // Special extra evaluation for rooks + if (Piece == ROOK) + { + // Open and half-open files + f = square_file(s); + if (ei.pi->file_is_half_open(us, f)) + { + if (ei.pi->file_is_half_open(them, f)) + { + ei.mgValue += Sign[us] * RookOpenFileBonus; + ei.egValue += Sign[us] * RookOpenFileBonus; + } + else + { + ei.mgValue += Sign[us] * RookHalfOpenFileBonus; + ei.egValue += Sign[us] * RookHalfOpenFileBonus; + } + } - // King attack and mobility - evaluate_common(p, b, us, ei, QueenAttackWeight, MidgameQueenMobilityBonus, - EndgameQueenMobilityBonus); + // Penalize rooks which are trapped inside a king. Penalize more if + // king has lost right to castle. + if (mob > 6 || ei.pi->file_is_half_open(us, f)) + continue; - // Queen on 7th rank - Color them = opposite_color(us); + ksq = pos.king_square(us); - if ( relative_rank(us, s) == RANK_7 - && relative_rank(us, p.king_square(them)) == RANK_8) - { - ei.mgValue += Sign[us] * MidgameQueenOn7thBonus; - ei.egValue += Sign[us] * EndgameQueenOn7thBonus; + if ( square_file(ksq) >= FILE_E + && square_file(s) > square_file(ksq) + && (relative_rank(us, ksq) == RANK_1 || square_rank(ksq) == square_rank(s))) + { + // Is there a half-open file between the king and the edge of the board? + if (!ei.pi->has_open_file_to_right(us, square_file(ksq))) + ei.mgValue -= pos.can_castle(us)? Sign[us] * ((TrappedRookPenalty - mob * 16) / 2) + : Sign[us] * (TrappedRookPenalty - mob * 16); + } + else if ( square_file(ksq) <= FILE_D + && square_file(s) < square_file(ksq) + && (relative_rank(us, ksq) == RANK_1 || square_rank(ksq) == square_rank(s))) + { + // Is there a half-open file between the king and the edge of the board? + if (!ei.pi->has_open_file_to_left(us, square_file(ksq))) + ei.mgValue -= pos.can_castle(us)? Sign[us] * ((TrappedRookPenalty - mob * 16) / 2) + : Sign[us] * (TrappedRookPenalty - mob * 16); + } + } } } @@ -728,21 +688,31 @@ namespace { return b >> (num << 3); } - // evaluate_king() assigns bonuses and penalties to a king of a given - // color on a given square. + // evaluate_pieces() assigns bonuses and penalties to a king of a given + // color. - void evaluate_king(const Position &p, Square s, Color us, EvalInfo &ei) { + template<> + void evaluate_pieces(const Position& p, Color us, EvalInfo& ei) { int shelter = 0, sign = Sign[us]; + Square s = p.king_square(us); // King shelter if (relative_rank(us, s) <= RANK_4) { - Bitboard pawns = p.pawns(us) & this_and_neighboring_files_bb(s); - Rank r = square_rank(s); - for (int i = 1; i < 4; i++) - shelter += count_1s_8bit(shiftRowsDown(pawns, r+i*sign)) * (128>>i); - + // Shelter cache lookup + shelter = ei.pi->kingShelter(us, s); + if (shelter == -1) + { + shelter = 0; + Bitboard pawns = p.pawns(us) & this_and_neighboring_files_bb(s); + Rank r = square_rank(s); + for (int i = 1; i < 4; i++) + shelter += BitCount8Bit[shiftRowsDown(pawns, r+i*sign) & 0xFF] * (128 >> i); + + // Cache shelter value in pawn info + ei.pi->setKingShelter(us, s, shelter); + } ei.mgValue += sign * Value(shelter); } @@ -775,7 +745,7 @@ namespace { // quality of the pawn shelter. int attackUnits = Min((ei.kingAttackersCount[them] * ei.kingAttackersWeight[them]) / 2, 25) - + (ei.kingAdjacentZoneAttacksCount[them] + count_1s_max_15(undefended)) * 3 + + (ei.kingAdjacentZoneAttacksCount[them] + count_1s_max_15(undefended)) * 3 + InitKingDanger[relative_square(us, s)] - (shelter >> 5); // Analyse safe queen contact checks @@ -791,7 +761,7 @@ namespace { { // The bitboard b now contains the squares available for safe queen // contact checks. - int count = count_1s_max_15(b); + int count = count_1s_max_15(b); attackUnits += QueenContactCheckBonus * count * (sente ? 2 : 1); // Is there a mate threat? @@ -813,8 +783,8 @@ namespace { if ( bit_is_set(p.piece_attacks(from), to) && !bit_is_set(p.pinned_pieces(them), from) && !(rook_attacks_bb(to, occ & ClearMaskBB[from]) & p.rooks_and_queens(us)) - && !(rook_attacks_bb(to, occ & ClearMaskBB[from]) & p.rooks_and_queens(us))) - + && !(bishop_attacks_bb(to, occ & ClearMaskBB[from]) & p.bishops_and_queens(us))) + ei.mateThreat[them] = make_move(from, to); } } @@ -831,12 +801,12 @@ namespace { // Queen checks b2 = b & ei.attacked_by(them, QUEEN); if( b2) - attackUnits += QueenCheckBonus * count_1s_max_15(b2); + attackUnits += QueenCheckBonus * count_1s_max_15(b2); // Rook checks b2 = b & ei.attacked_by(them, ROOK); if (b2) - attackUnits += RookCheckBonus * count_1s_max_15(b2); + attackUnits += RookCheckBonus * count_1s_max_15(b2); } if (QueenCheckBonus > 0 || BishopCheckBonus > 0) { @@ -845,12 +815,12 @@ namespace { // Queen checks b2 = b & ei.attacked_by(them, QUEEN); if (b2) - attackUnits += QueenCheckBonus * count_1s_max_15(b2); + attackUnits += QueenCheckBonus * count_1s_max_15(b2); // Bishop checks b2 = b & ei.attacked_by(them, BISHOP); if (b2) - attackUnits += BishopCheckBonus * count_1s_max_15(b2); + attackUnits += BishopCheckBonus * count_1s_max_15(b2); } if (KnightCheckBonus > 0) { @@ -859,7 +829,7 @@ namespace { // Knight checks b2 = b & ei.attacked_by(them, KNIGHT); if (b2) - attackUnits += KnightCheckBonus * count_1s_max_15(b2); + attackUnits += KnightCheckBonus * count_1s_max_15(b2); } // Analyse discovered checks (only for non-pawns right now, consider @@ -868,7 +838,7 @@ namespace { { b = p.discovered_check_candidates(them) & ~p.pawns(); if (b) - attackUnits += DiscoveredCheckBonus * count_1s_max_15(b) * (sente? 2 : 1); + attackUnits += DiscoveredCheckBonus * count_1s_max_15(b) * (sente? 2 : 1); } // Has a mate threat been found? We don't do anything here if the @@ -920,7 +890,7 @@ namespace { { Square s = pop_1st_bit(&b); - assert(pos.piece_on(s) == pawn_of_color(us)); + assert(pos.piece_on(s) == piece_of_color_and_type(us, PAWN)); assert(pos.pawn_is_passed(us, s)); int r = int(relative_rank(us, s) - RANK_2); @@ -932,50 +902,53 @@ namespace { Value ebonus = Value(10 + r * r * 10); // Adjust bonus based on king proximity - ebonus -= Value(square_distance(ourKingSq, blockSq) * 3 * tr); - ebonus -= Value(square_distance(ourKingSq, blockSq + pawn_push(us)) * 1 * tr); - ebonus += Value(square_distance(theirKingSq, blockSq) * 6 * tr); - - // If the pawn is free to advance, increase bonus - if (pos.square_is_empty(blockSq)) + if (tr != 0) { - b2 = squares_in_front_of(us, s); - b3 = b2 & ei.attacked_by(them); - b4 = b2 & ei.attacked_by(us); + ebonus -= Value(square_distance(ourKingSq, blockSq) * 3 * tr); + ebonus -= Value(square_distance(ourKingSq, blockSq + pawn_push(us)) * 1 * tr); + ebonus += Value(square_distance(theirKingSq, blockSq) * 6 * tr); - // If there is an enemy rook or queen attacking the pawn from behind, - // add all X-ray attacks by the rook or queen. - if ( bit_is_set(ei.attacked_by(them,ROOK) | ei.attacked_by(them,QUEEN),s) - && (squares_behind(us, s) & pos.rooks_and_queens(them))) - b3 = b2; - - if ((b2 & pos.pieces_of_color(them)) == EmptyBoardBB) + // If the pawn is free to advance, increase bonus + if (pos.square_is_empty(blockSq)) { - // There are no enemy pieces in the pawn's path! Are any of the - // squares in the pawn's path attacked by the enemy? - if (b3 == EmptyBoardBB) - // No enemy attacks, huge bonus! - ebonus += Value(tr * (b2 == b4 ? 17 : 15)); + b2 = squares_in_front_of(us, s); + b3 = b2 & ei.attacked_by(them); + b4 = b2 & ei.attacked_by(us); + + // If there is an enemy rook or queen attacking the pawn from behind, + // add all X-ray attacks by the rook or queen. + if ( bit_is_set(ei.attacked_by(them,ROOK) | ei.attacked_by(them,QUEEN),s) + && (squares_behind(us, s) & pos.rooks_and_queens(them))) + b3 = b2; + + if ((b2 & pos.pieces_of_color(them)) == EmptyBoardBB) + { + // There are no enemy pieces in the pawn's path! Are any of the + // squares in the pawn's path attacked by the enemy? + if (b3 == EmptyBoardBB) + // No enemy attacks, huge bonus! + ebonus += Value(tr * (b2 == b4 ? 17 : 15)); + else + // OK, there are enemy attacks. Are those squares which are + // attacked by the enemy also attacked by us? If yes, big bonus + // (but smaller than when there are no enemy attacks), if no, + // somewhat smaller bonus. + ebonus += Value(tr * ((b3 & b4) == b3 ? 13 : 8)); + } else - // OK, there are enemy attacks. Are those squares which are - // attacked by the enemy also attacked by us? If yes, big bonus - // (but smaller than when there are no enemy attacks), if no, - // somewhat smaller bonus. - ebonus += Value(tr * ((b3 & b4) == b3 ? 13 : 8)); - } - else - { - // There are some enemy pieces in the pawn's path. While this is - // sad, we still assign a moderate bonus if all squares in the path - // which are either occupied by or attacked by enemy pieces are - // also attacked by us. - if (((b3 | (b2 & pos.pieces_of_color(them))) & ~b4) == EmptyBoardBB) - ebonus += Value(tr * 6); + { + // There are some enemy pieces in the pawn's path. While this is + // sad, we still assign a moderate bonus if all squares in the path + // which are either occupied by or attacked by enemy pieces are + // also attacked by us. + if (((b3 | (b2 & pos.pieces_of_color(them))) & ~b4) == EmptyBoardBB) + ebonus += Value(tr * 6); + } + // At last, add a small bonus when there are no *friendly* pieces + // in the pawn's path. + if ((b2 & pos.pieces_of_color(us)) == EmptyBoardBB) + ebonus += Value(tr); } - // At last, add a small bonus when there are no *friendly* pieces - // in the pawn's path. - if ((b2 & pos.pieces_of_color(us)) == EmptyBoardBB) - ebonus += Value(tr); } // If the pawn is supported by a friendly pawn, increase bonus @@ -1000,7 +973,7 @@ namespace { if (d < 0) { int mtg = RANK_8 - relative_rank(us, s); - int blockerCount = count_1s_max_15(squares_in_front_of(us,s) & pos.occupied_squares()); + int blockerCount = count_1s_max_15(squares_in_front_of(us,s) & pos.occupied_squares()); mtg += blockerCount; d += blockerCount; if (d < 0) @@ -1018,8 +991,8 @@ namespace { // value if the other side has a rook or queen. if (square_file(s) == FILE_A || square_file(s) == FILE_H) { - if( pos.non_pawn_material(them) == KnightValueMidgame // FIXME should be <= ??? - && pos.piece_count(them, KNIGHT) == 1) + if( pos.non_pawn_material(them) <= KnightValueMidgame + && pos.piece_count(them, KNIGHT) <= 1) ebonus += ebonus / 4; else if(pos.rooks_and_queens(them)) ebonus -= ebonus / 4; @@ -1068,12 +1041,12 @@ namespace { void evaluate_trapped_bishop_a7h7(const Position &pos, Square s, Color us, EvalInfo &ei) { assert(square_is_ok(s)); - assert(pos.piece_on(s) == bishop_of_color(us)); + assert(pos.piece_on(s) == piece_of_color_and_type(us, BISHOP)); Square b6 = relative_square(us, (square_file(s) == FILE_A) ? SQ_B6 : SQ_G6); Square b8 = relative_square(us, (square_file(s) == FILE_A) ? SQ_B8 : SQ_G8); - if ( pos.piece_on(b6) == pawn_of_color(opposite_color(us)) + if ( pos.piece_on(b6) == piece_of_color_and_type(opposite_color(us), PAWN) && pos.see(s, b6) < 0 && pos.see(s, b8) < 0) { @@ -1090,12 +1063,12 @@ namespace { void evaluate_trapped_bishop_a1h1(const Position &pos, Square s, Color us, EvalInfo &ei) { - Piece pawn = pawn_of_color(us); + Piece pawn = piece_of_color_and_type(us, PAWN); Square b2, b3, c3; assert(Chess960); assert(square_is_ok(s)); - assert(pos.piece_on(s) == bishop_of_color(us)); + assert(pos.piece_on(s) == piece_of_color_and_type(us, BISHOP)); if (square_file(s) == FILE_A) { @@ -1161,8 +1134,8 @@ namespace { behindFriendlyPawns |= (behindFriendlyPawns << 16); } - int space = count_1s_max_15(safeSquares) - + count_1s_max_15(behindFriendlyPawns & safeSquares); + int space = count_1s_max_15(safeSquares) + + count_1s_max_15(behindFriendlyPawns & safeSquares); ei.mgValue += Sign[us] * apply_weight(Value(space * ei.mi->space_weight()), WeightSpace); } @@ -1192,15 +1165,6 @@ namespace { } - // count_1s_8bit() counts the number of nonzero bits in the 8 least - // significant bits of a Bitboard. This function is used by the king - // shield evaluation. - - int count_1s_8bit(Bitboard b) { - return int(BitCount8Bit[b & 0xFF]); - } - - // compute_weight() computes the value of an evaluation weight, by combining // an UCI-configurable weight with an internal weight.