opelly/Stockfish
1
0
Fork 0
mirror of https://github.com/opelly27/Stockfish.git synced 2026-05-20 09:47:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Symmetric king safety"

Browse Source 
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
This commit is contained in:
Marco Costalba
2014-05-26 21:39:48 +02:00
parent 495a0fa699
commit ad937d0b2d
5 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/evaluate.cpp
+12 -9
View File
@@ -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]);
}
}