From ad937d0b2d2a9450686b9f3412c891a68ff19310 Mon Sep 17 00:00:00 2001 From: Marco Costalba Date: Mon, 26 May 2014 21:39:48 +0200 Subject: [PATCH 1/1] Revert "Symmetric king safety" Regression test of 40K games at 60 secs shows this commit to be a 2-3 ELO regression. So revert to original king safety. bench: 8732553 --- src/evaluate.cpp | 21 ++++++++++++--------- src/search.cpp | 12 +++++++----- src/search.h | 1 + src/uci.cpp | 6 +++++- src/ucioption.cpp | 3 ++- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/evaluate.cpp b/src/evaluate.cpp index a945c5c7..64b1bf4c 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -90,8 +90,8 @@ namespace { } // Evaluation weights, initialized from UCI options - enum { Mobility, PawnStructure, PassedPawns, Space, KingSafety }; - struct Weight { int mg, eg; } Weights[5]; + enum { Mobility, PawnStructure, PassedPawns, Space, KingDangerUs, KingDangerThem }; + struct Weight { int mg, eg; } Weights[6]; typedef Value V; #define S(mg, eg) make_score(mg, eg) @@ -103,7 +103,7 @@ namespace { // // Values modified by Joona Kiiski const Score WeightsInternal[] = { - S(289, 344), S(233, 201), S(221, 273), S(46, 0), S(289, 0) + S(289, 344), S(233, 201), S(221, 273), S(46, 0), S(271, 0), S(307, 0) }; // MobilityBonus[PieceType][attacked] contains bonuses for middle and end @@ -202,9 +202,9 @@ namespace { const int BishopCheck = 2; const int KnightCheck = 3; - // KingDanger[attackUnits] contains the actual king danger weighted - // scores, indexed by a calculated integer number. - Score KingDanger[128]; + // KingDanger[Color][attackUnits] contains the actual king danger weighted + // scores, indexed by color and by a calculated integer number. + Score KingDanger[COLOR_NB][128]; // apply_weight() weighs score 'v' by weight 'w' trying to prevent overflow @@ -501,7 +501,7 @@ namespace { // Finally, extract the king danger score from the KingDanger[] // array and subtract the score from evaluation. - score -= KingDanger[attackUnits]; + score -= KingDanger[Us == Search::RootColor][attackUnits]; } if (Trace) @@ -902,7 +902,8 @@ namespace Eval { Weights[PawnStructure] = weight_option("Pawn Structure (Midgame)", "Pawn Structure (Endgame)", WeightsInternal[PawnStructure]); Weights[PassedPawns] = weight_option("Passed Pawns (Midgame)", "Passed Pawns (Endgame)", WeightsInternal[PassedPawns]); Weights[Space] = weight_option("Space", "Space", WeightsInternal[Space]); - Weights[KingSafety] = weight_option("King Safety", "King Safety", WeightsInternal[KingSafety]); + Weights[KingDangerUs] = weight_option("Cowardice", "Cowardice", WeightsInternal[KingDangerUs]); + Weights[KingDangerThem] = weight_option("Aggressiveness", "Aggressiveness", WeightsInternal[KingDangerThem]); const double MaxSlope = 30; const double Peak = 1280; @@ -910,7 +911,9 @@ namespace Eval { for (int t = 0, i = 1; i < 100; ++i) { t = int(std::min(Peak, std::min(0.4 * i * i, t + MaxSlope))); - KingDanger[i] = apply_weight(make_score(t, 0), Weights[KingSafety]); + + KingDanger[1][i] = apply_weight(make_score(t, 0), Weights[KingDangerUs]); + KingDanger[0][i] = apply_weight(make_score(t, 0), Weights[KingDangerThem]); } } diff --git a/src/search.cpp b/src/search.cpp index 06546f99..4ac4c086 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -42,6 +42,7 @@ namespace Search { LimitsType Limits; std::vector RootMoves; Position RootPos; + Color RootColor; Time::point SearchTime; StateStackPtr SetupStates; } @@ -181,11 +182,12 @@ void Search::think() { static PolyglotBook book; // Defined static to initialize the PRNG only once - TimeMgr.init(Limits, RootPos.game_ply(), RootPos.side_to_move()); + RootColor = RootPos.side_to_move(); + TimeMgr.init(Limits, RootPos.game_ply(), RootColor); int cf = Options["Contempt Factor"] * PawnValueEg / 100; // From centipawns - DrawValue[ RootPos.side_to_move()] = VALUE_DRAW - Value(cf); - DrawValue[~RootPos.side_to_move()] = VALUE_DRAW + Value(cf); + DrawValue[ RootColor] = VALUE_DRAW - Value(cf); + DrawValue[~RootColor] = VALUE_DRAW + Value(cf); if (RootMoves.empty()) { @@ -214,8 +216,8 @@ void Search::think() { log << "\nSearching: " << RootPos.fen() << "\ninfinite: " << Limits.infinite << " ponder: " << Limits.ponder - << " time: " << Limits.time[RootPos.side_to_move()] - << " increment: " << Limits.inc[RootPos.side_to_move()] + << " time: " << Limits.time[RootColor] + << " increment: " << Limits.inc[RootColor] << " moves to go: " << Limits.movestogo << "\n" << std::endl; } diff --git a/src/search.h b/src/search.h index 7d7cce0e..a9f21fa2 100644 --- a/src/search.h +++ b/src/search.h @@ -101,6 +101,7 @@ extern volatile SignalsType Signals; extern LimitsType Limits; extern std::vector RootMoves; extern Position RootPos; +extern Color RootColor; extern Time::point SearchTime; extern StateStackPtr SetupStates; diff --git a/src/uci.cpp b/src/uci.cpp index f4d71962..8d625bd9 100644 --- a/src/uci.cpp +++ b/src/uci.cpp @@ -197,6 +197,11 @@ void UCI::loop(int argc, char* argv[]) { << "\n" << Options << "\nuciok" << sync_endl; + else if (token == "eval") + { + Search::RootColor = pos.side_to_move(); // Ensure it is set + sync_cout << Eval::trace(pos) << sync_endl; + } else if (token == "ucinewgame") TT.clear(); else if (token == "go") go(pos, is); else if (token == "position") position(pos, is); @@ -204,7 +209,6 @@ void UCI::loop(int argc, char* argv[]) { else if (token == "flip") pos.flip(); else if (token == "bench") benchmark(pos, is); else if (token == "d") sync_cout << pos.pretty() << sync_endl; - else if (token == "eval") sync_cout << Eval::trace(pos) << sync_endl; else if (token == "isready") sync_cout << "readyok" << sync_endl; else sync_cout << "Unknown command: " << cmd << sync_endl; diff --git a/src/ucioption.cpp b/src/ucioption.cpp index 7bdbc0f8..d5db2c97 100644 --- a/src/ucioption.cpp +++ b/src/ucioption.cpp @@ -67,7 +67,8 @@ void init(OptionsMap& o) { o["Passed Pawns (Midgame)"] << Option(100, 0, 200, on_eval); o["Passed Pawns (Endgame)"] << Option(100, 0, 200, on_eval); o["Space"] << Option(100, 0, 200, on_eval); - o["King Safety"] << Option(100, 0, 200, on_eval); + o["Aggressiveness"] << Option(100, 0, 200, on_eval); + o["Cowardice"] << Option(100, 0, 200, on_eval); o["Min Split Depth"] << Option(0, 0, 12, on_threads); o["Threads"] << Option(1, 1, MAX_THREADS, on_threads); o["Hash"] << Option(32, 1, 16384, on_hash_size); -- 2.39.2