From c7332d5610faf6086ce0b0fe795f5ffc92cc39b0 Mon Sep 17 00:00:00 2001 From: Joona Kiiski Date: Sat, 3 Jan 2015 20:34:20 +0000 Subject: [PATCH] Smoother king safety STC: LLR: 4.03 (-2.94,2.94) [-1.50,4.50] Total: 35707 W: 7352 L: 7106 D: 21249 LTC: LLR: 2.95 (-2.94,2.94) [0.00,4.00] Total: 24563 W: 4330 L: 4095 D: 16138 Bench: 8411409 Resolves #190 --- src/evaluate.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 8416162d..6a27108d 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -198,7 +198,7 @@ namespace { // KingDanger[attackUnits] contains the actual king danger weighted // scores, indexed by a calculated integer number. - Score KingDanger[128]; + Score KingDanger[512]; // apply_weight() weighs score 's' by weight 'w' trying to prevent overflow Score apply_weight(Score s, const Weight& w) { @@ -476,7 +476,7 @@ namespace { // Finally, extract the king danger score from the KingDanger[] // array and subtract the score from evaluation. - score -= KingDanger[std::max(std::min(attackUnits / 4, 99), 0)]; + score -= KingDanger[std::max(std::min(attackUnits, 399), 0)]; } if (Trace) @@ -891,13 +891,14 @@ namespace Eval { void init() { - const double MaxSlope = 30; + const double MaxSlope = 7.5; const double Peak = 1280; + double t = 0.0; - for (int t = 0, i = 1; i < 100; ++i) + for (int i = 1; i < 400; ++i) { - t = int(std::min(Peak, std::min(0.4 * i * i, t + MaxSlope))); - KingDanger[i] = apply_weight(make_score(t, 0), Weights[KingSafety]); + t = std::min(Peak, std::min(0.025 * i * i, t + MaxSlope)); + KingDanger[i] = apply_weight(make_score(int(t), 0), Weights[KingSafety]); } } -- 2.39.2