X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=cb77fe3efcbb46f9994d35c0cb7075e479acf8df;hp=77821a3ad3dde342e5981638dab3862cf6680110;hb=1a8e3f0b2e9e2a5b8a01b645ce1fc5b12e0aec55;hpb=b1929960f9b73cb8fcc86fdbdf7a8d2d1de4fc53 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 77821a3a..cb77fe3e 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -44,20 +44,20 @@ namespace { // all squares attacked by the given color. Bitboard attackedBy[2][8]; - // kingZone[color] is the zone around the enemy king which is considered + // kingRing[color] is the zone around the king which is considered // by the king safety evaluation. This consists of the squares directly // adjacent to the king, and the three (or two, for a king on an edge file) // squares two ranks in front of the king. For instance, if black's king - // is on g8, kingZone[WHITE] is a bitboard containing the squares f8, h8, + // is on g8, kingRing[BLACK] is a bitboard containing the squares f8, h8, // f7, g7, h7, f6, g6 and h6. - Bitboard kingZone[2]; + Bitboard kingRing[2]; // kingAttackersCount[color] is the number of pieces of the given color - // which attack a square in the kingZone of the enemy king. + // which attack a square in the kingRing of the enemy king. int kingAttackersCount[2]; // kingAttackersWeight[color] is the sum of the "weight" of the pieces of the - // given color which attack a square in the kingZone of the enemy king. The + // given color which attack a square in the kingRing of the enemy king. The // weights of the individual piece types are given by the variables // QueenAttackWeight, RookAttackWeight, BishopAttackWeight and // KnightAttackWeight in evaluate.cpp @@ -142,9 +142,9 @@ namespace { { S(0, 0), S(15, 39), S(15, 39), S(15, 39), S(15, 39), S( 0, 0) } // QUEEN }; - // ThreatedByPawnPenalty[PieceType] contains a penalty according to which + // ThreatenedByPawnPenalty[PieceType] contains a penalty according to which // piece type is attacked by an enemy pawn. - const Score ThreatedByPawnPenalty[] = { + const Score ThreatenedByPawnPenalty[] = { S(0, 0), S(0, 0), S(56, 70), S(56, 70), S(76, 99), S(86, 118) }; @@ -275,7 +275,6 @@ Value do_evaluate(const Position& pos, Value& margin) { Value margins[2]; Score score, mobilityWhite, mobilityBlack; - assert(pos.is_ok()); assert(pos.thread() >= 0 && pos.thread() < MAX_THREADS); assert(!pos.in_check()); @@ -437,12 +436,12 @@ namespace { if ( pos.piece_count(Us, QUEEN) && pos.non_pawn_material(Us) >= QueenValueMidgame + RookValueMidgame) { - ei.kingZone[Us] = (b | (Us == WHITE ? b >> 8 : b << 8)); + ei.kingRing[Them] = (b | (Us == WHITE ? b >> 8 : b << 8)); b &= ei.attackedBy[Us][PAWN]; ei.kingAttackersCount[Us] = b ? count_1s(b) / 2 : 0; ei.kingAdjacentZoneAttacksCount[Us] = ei.kingAttackersWeight[Us] = 0; } else - ei.kingZone[Us] = ei.kingAttackersCount[Us] = 0; + ei.kingRing[Them] = ei.kingAttackersCount[Us] = 0; } @@ -463,7 +462,7 @@ namespace { if (bonus && bit_is_set(ei.attackedBy[Us][PAWN], s)) { if ( pos.pieces(KNIGHT, Them) == EmptyBoardBB - && (SquaresByColorBB[square_color(s)] & pos.pieces(BISHOP, Them)) == EmptyBoardBB) + && (SquaresByColorBB[color_of(s)] & pos.pieces(BISHOP, Them)) == EmptyBoardBB) bonus += bonus + bonus / 2; else bonus += bonus / 2; @@ -486,11 +485,11 @@ namespace { const BitCountType Full = HasPopCnt ? CNT_POPCNT : CpuIs64Bit ? CNT64 : CNT32; const BitCountType Max15 = HasPopCnt ? CNT_POPCNT : CpuIs64Bit ? CNT64_MAX15 : CNT32_MAX15; const Color Them = (Us == WHITE ? BLACK : WHITE); - const Square* ptr = pos.piece_list_begin(Us, Piece); + const Square* pl = pos.piece_list(Us, Piece); ei.attackedBy[Us][Piece] = EmptyBoardBB; - while ((s = *ptr++) != SQ_NONE) + while ((s = *pl++) != SQ_NONE) { // Find attacked squares, including x-ray attacks for bishops and rooks if (Piece == KNIGHT || Piece == QUEEN) @@ -506,7 +505,7 @@ namespace { ei.attackedBy[Us][Piece] |= b; // King attacks - if (b & ei.kingZone[Us]) + if (b & ei.kingRing[Them]) { ei.kingAttackersCount[Us]++; ei.kingAttackersWeight[Us] += KingAttackWeights[Piece]; @@ -524,10 +523,11 @@ namespace { // Decrease score if we are attacked by an enemy pawn. Remaining part // of threat evaluation must be done later when we have full attack info. if (bit_is_set(ei.attackedBy[Them][PAWN], s)) - score -= ThreatedByPawnPenalty[Piece]; + score -= ThreatenedByPawnPenalty[Piece]; // Bishop and knight outposts squares - if ((Piece == BISHOP || Piece == KNIGHT) && pos.square_is_weak(s, Us)) + if ( (Piece == BISHOP || Piece == KNIGHT) + && !(pos.pieces(PAWN, Them) & attack_span_mask(Us, s))) score += evaluate_outposts(pos, ei, s); // Queen or rook on 7th rank @@ -546,7 +546,7 @@ namespace { // problem, especially when that pawn is also blocked. if (s == relative_square(Us, SQ_A1) || s == relative_square(Us, SQ_H1)) { - Square d = pawn_push(Us) + (square_file(s) == FILE_A ? DELTA_E : DELTA_W); + Square d = pawn_push(Us) + (file_of(s) == FILE_A ? DELTA_E : DELTA_W); if (pos.piece_on(s + d) == make_piece(Us, PAWN)) { if (!pos.square_is_empty(s + d + pawn_push(Us))) @@ -563,7 +563,7 @@ namespace { if (Piece == ROOK) { // Open and half-open files - f = square_file(s); + f = file_of(s); if (ei.pi->file_is_half_open(Us, f)) { if (ei.pi->file_is_half_open(Them, f)) @@ -579,21 +579,21 @@ namespace { ksq = pos.king_square(Us); - if ( square_file(ksq) >= FILE_E - && square_file(s) > square_file(ksq) - && (relative_rank(Us, ksq) == RANK_1 || square_rank(ksq) == square_rank(s))) + if ( file_of(ksq) >= FILE_E + && file_of(s) > file_of(ksq) + && (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(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))) + if (!ei.pi->has_open_file_to_right(Us, file_of(ksq))) score -= make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2 : (TrappedRookPenalty - mob * 16), 0); } - 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))) + else if ( file_of(ksq) <= FILE_D + && file_of(s) < file_of(ksq) + && (relative_rank(Us, ksq) == RANK_1 || rank_of(ksq) == rank_of(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))) + if (!ei.pi->has_open_file_to_left(Us, file_of(ksq))) score -= make_score(pos.can_castle(Us) ? (TrappedRookPenalty - mob * 16) / 2 : (TrappedRookPenalty - mob * 16), 0); } @@ -619,7 +619,7 @@ namespace { Score score = SCORE_ZERO; // Enemy pieces not defended by a pawn and under our attack - Bitboard weakEnemies = pos.pieces_of_color(Them) + Bitboard weakEnemies = pos.pieces(Them) & ~ei.attackedBy[Them][PAWN] & ei.attackedBy[Us][0]; if (!weakEnemies) @@ -651,7 +651,7 @@ namespace { Score score = mobility = SCORE_ZERO; // Do not include in mobility squares protected by enemy pawns or occupied by our pieces - const Bitboard mobilityArea = ~(ei.attackedBy[Them][PAWN] | pos.pieces_of_color(Us)); + const Bitboard mobilityArea = ~(ei.attackedBy[Them][PAWN] | pos.pieces(Us)); score += evaluate_pieces(pos, ei, mobility, mobilityArea); score += evaluate_pieces(pos, ei, mobility, mobilityArea); @@ -705,7 +705,7 @@ namespace { // Analyse enemy's safe queen contact checks. First find undefended // squares around the king attacked by enemy queen... - b = undefended & ei.attackedBy[Them][QUEEN] & ~pos.pieces_of_color(Them); + b = undefended & ei.attackedBy[Them][QUEEN] & ~pos.pieces(Them); if (b) { // ...then remove squares not supported by another enemy piece @@ -719,7 +719,7 @@ namespace { // Analyse enemy's safe rook contact checks. First find undefended // squares around the king attacked by enemy rooks... - b = undefended & ei.attackedBy[Them][ROOK] & ~pos.pieces_of_color(Them); + b = undefended & ei.attackedBy[Them][ROOK] & ~pos.pieces(Them); // Consider only squares where the enemy rook gives check b &= RookPseudoAttacks[ksq]; @@ -736,7 +736,7 @@ namespace { } // Analyse enemy's safe distance checks for sliders and knights - safe = ~(pos.pieces_of_color(Them) | ei.attackedBy[Us][0]); + safe = ~(pos.pieces(Them) | ei.attackedBy[Us][0]); b1 = pos.attacks_from(ksq) & safe; b2 = pos.attacks_from(ksq) & safe; @@ -816,7 +816,7 @@ namespace { ebonus -= Value(square_distance(pos.king_square(Us), blockSq) * 3 * rr); // If blockSq is not the queening square then consider also a second push - if (square_rank(blockSq) != (Us == WHITE ? RANK_8 : RANK_1)) + if (rank_of(blockSq) != (Us == WHITE ? RANK_8 : RANK_1)) ebonus -= Value(square_distance(pos.king_square(Us), blockSq + pawn_push(Us)) * rr); // If the pawn is free to advance, increase bonus @@ -832,7 +832,7 @@ namespace { && (squares_in_front_of(Them, s) & pos.pieces(ROOK, QUEEN, Them) & pos.attacks_from(s))) unsafeSquares = squaresToQueen; else - unsafeSquares = squaresToQueen & (ei.attackedBy[Them][0] | pos.pieces_of_color(Them)); + unsafeSquares = squaresToQueen & (ei.attackedBy[Them][0] | pos.pieces(Them)); // If there aren't enemy attacks or pieces along the path to queen give // huge bonus. Even bigger if we protect the pawn's path. @@ -847,7 +847,7 @@ namespace { // At last, add a small bonus when there are no *friendly* pieces // in the pawn's path. - if (!(squaresToQueen & pos.pieces_of_color(Us))) + if (!(squaresToQueen & pos.pieces(Us))) ebonus += Value(rr); } } // rr != 0 @@ -866,7 +866,7 @@ namespace { // we try the following: Increase the value for rook pawns if the // other side has no pieces apart from a knight, and decrease the // value if the other side has a rook or queen. - if (square_file(s) == FILE_A || square_file(s) == FILE_H) + if (file_of(s) == FILE_A || file_of(s) == FILE_H) { if (pos.non_pawn_material(Them) <= KnightValueMidgame) ebonus += ebonus / 4; @@ -902,7 +902,7 @@ namespace { for (c = WHITE; c <= BLACK; c++) { // Skip if other side has non-pawn pieces - if (pos.non_pawn_material(opposite_color(c))) + if (pos.non_pawn_material(flip(c))) continue; b = ei.pi->passed_pawns(c); @@ -910,12 +910,12 @@ namespace { while (b) { s = pop_1st_bit(&b); - queeningSquare = relative_square(c, make_square(square_file(s), RANK_8)); + queeningSquare = relative_square(c, make_square(file_of(s), RANK_8)); queeningPath = squares_in_front_of(c, s); // Compute plies to queening and check direct advancement movesToGo = rank_distance(s, queeningSquare) - int(relative_rank(c, s) == RANK_2); - oppMovesToGo = square_distance(pos.king_square(opposite_color(c)), queeningSquare) - int(c != pos.side_to_move()); + oppMovesToGo = square_distance(pos.king_square(flip(c)), queeningSquare) - int(c != pos.side_to_move()); pathDefended = ((ei.attackedBy[c][0] & queeningPath) == queeningPath); if (movesToGo >= oppMovesToGo && !pathDefended) @@ -924,10 +924,10 @@ namespace { // Opponent king cannot block because path is defended and position // is not in check. So only friendly pieces can be blockers. assert(!pos.in_check()); - assert(queeningPath & pos.occupied_squares() == queeningPath & pos.pieces_of_color(c)); + assert((queeningPath & pos.occupied_squares()) == (queeningPath & pos.pieces(c))); // Add moves needed to free the path from friendly pieces and retest condition - movesToGo += count_1s(queeningPath & pos.pieces_of_color(c)); + movesToGo += count_1s(queeningPath & pos.pieces(c)); if (movesToGo >= oppMovesToGo && !pathDefended) continue; @@ -943,7 +943,7 @@ namespace { return SCORE_ZERO; winnerSide = (pliesToQueen[WHITE] < pliesToQueen[BLACK] ? WHITE : BLACK); - loserSide = opposite_color(winnerSide); + loserSide = flip(winnerSide); // Step 3. Can the losing side possibly create a new passed pawn and thus prevent the loss? b = candidates = pos.pieces(PAWN, loserSide); @@ -953,7 +953,7 @@ namespace { s = pop_1st_bit(&b); // Compute plies from queening - queeningSquare = relative_square(loserSide, make_square(square_file(s), RANK_8)); + queeningSquare = relative_square(loserSide, make_square(file_of(s), RANK_8)); movesToGo = rank_distance(s, queeningSquare) - int(relative_rank(loserSide, s) == RANK_2); pliesToGo = 2 * movesToGo - int(loserSide == pos.side_to_move()); @@ -977,7 +977,7 @@ namespace { minKingDist = kingptg = 256; // Compute plies from queening - queeningSquare = relative_square(loserSide, make_square(square_file(s), RANK_8)); + queeningSquare = relative_square(loserSide, make_square(file_of(s), RANK_8)); movesToGo = rank_distance(s, queeningSquare) - int(relative_rank(loserSide, s) == RANK_2); pliesToGo = 2 * movesToGo - int(loserSide == pos.side_to_move());