From fd6e178a1dee24a804a7c0615ff0faa19129d5c2 Mon Sep 17 00:00:00 2001 From: Fabian Fichter Date: Tue, 6 Nov 2018 21:33:09 +0100 Subject: [PATCH] Tweak evaluation for breakthrough breakthrough ELO: 200.24 +-78.6 (95%) LOS: 100.0% Total: 100 W: 73 L: 21 D: 6 --- src/evaluate.cpp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 38abcfa..4ece5f2 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -822,7 +822,7 @@ namespace { // Capture the flag if (pos.capture_the_flag(Us)) { - bool can_block = pos.capture_the_flag_piece() == KING; + bool isKingCTF = pos.capture_the_flag_piece() == KING; Bitboard ctfPieces = pos.pieces(Us, pos.capture_the_flag_piece()); while (ctfPieces) { @@ -832,9 +832,9 @@ namespace { { Square s2 = pop_lsb(&target_squares); int dist = distance(s1, s2) - + (can_block ? popcount(pos.attackers_to(s2) & pos.pieces(Them)) : 0) + + (isKingCTF ? popcount(pos.attackers_to(s2) & pos.pieces(Them)) : 0) + !!(pos.pieces(Us) & s2); - score += make_score(2500, 2500) / (1 + dist * (can_block && pos.checking_permitted() ? dist : 1)); + score += make_score(2500, 2500) / (1 + dist * (!isKingCTF || pos.checking_permitted() ? dist : 1)); } } } -- 1.7.0.4