From 04275a95cf54ba7eb008d1ad72540c0e56675335 Mon Sep 17 00:00:00 2001 From: Fabian Fichter Date: Fri, 5 Jul 2019 13:34:31 +0200 Subject: [PATCH] Tweak evaluation for drop games crazyhouse STC LLR: 2.96 (-2.94,2.94) [0.00,10.00] Total: 2276 W: 1175 L: 1042 D: 59 http://35.161.250.236:6543/tests/view/5d1d02f46e23db34f4206c70 crazyhouse LTC LLR: 2.96 (-2.94,2.94) [0.00,10.00] Total: 4642 W: 2320 L: 2154 D: 168 http://35.161.250.236:6543/tests/view/5d1d967c6e23db34f4206c73 --- src/evaluate.cpp | 3 ++- src/psqt.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 1b9d1ca..207646d 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -141,7 +141,7 @@ namespace { }; // KingProximity contains a penalty according to distance from king - constexpr Score KingProximity = S(2, 2); + constexpr Score KingProximity = S(1, 3); // Assorted bonuses and penalties constexpr Score BishopPawns = S( 3, 7); @@ -552,6 +552,7 @@ namespace { + 185 * popcount(kingRing[Us] & weak) * (1 + pos.captures_to_hand() + !!pos.max_check_count()) - 100 * bool(attackedBy[Us][KNIGHT] & attackedBy[Us][KING]) - 35 * bool(attackedBy[Us][BISHOP] & attackedBy[Us][KING]) + - 10 * bool(attackedBy2[Us] & attackedBy[Us][KING]) * pos.captures_to_hand() + 150 * popcount(pos.blockers_for_king(Us) | unsafeChecks) - 873 * !(pos.count(Them) || pos.captures_to_hand()) / (1 + !!pos.max_check_count()) - 6 * mg_value(score) / 8 diff --git a/src/psqt.cpp b/src/psqt.cpp index f34d891..19ba05d 100644 --- a/src/psqt.cpp +++ b/src/psqt.cpp @@ -152,7 +152,7 @@ void init(const Variant* v) { psq[~pc][rank_of(s) <= v->maxRank ? relative_square(BLACK, s, v->maxRank) : s] = -psq[pc][s]; } // pieces in pocket - psq[ pc][SQ_NONE] = score + make_score(20, 20); + psq[ pc][SQ_NONE] = score + make_score(45, 10); psq[~pc][SQ_NONE] = -psq[pc][SQ_NONE]; } } -- 1.7.0.4