X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=153e6eaeb987e5e77ba2f8dadd135b7413711ad9;hp=681042c7c658dd43fbb386ee8a2a98b653a0f80e;hb=ddccb5355cabb7d1a9bf2c0fe3c51b3da0234260;hpb=a6e292034a60597d8d0a3dc00e9c1eb94b1112ac

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index 681042c7..153e6eae 100644
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -1,7 +1,7 @@
 /*
   Stockfish, a UCI chess playing engine derived from Glaurung 2.1
   Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
-  Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad
+  Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -91,7 +91,7 @@ namespace {
   // Evaluation weights, indexed by evaluation term
   enum { Mobility, PawnStructure, PassedPawns, Space, KingSafety };
   const struct Weight { int mg, eg; } Weights[] = {
-    {289, 344}, {233, 201}, {221, 273}, {46, 0}, {321, 0}
+    {289, 344}, {233, 201}, {221, 273}, {46, 0}, {322, 0}
   };
 
   #define V(v) Value(v)
@@ -186,14 +186,14 @@ namespace {
   // index to KingDanger[].
   //
   // KingAttackWeights[PieceType] contains king attack weights by piece type
-  const int KingAttackWeights[] = { 0, 0, 6, 2, 5, 5 };
+  const int KingAttackWeights[] = { 0, 0, 7, 5, 4, 1 };
 
   // Bonuses for enemy's safe checks
-  const int QueenContactCheck = 92;
-  const int RookContactCheck  = 68;
+  const int QueenContactCheck = 89;
+  const int RookContactCheck  = 71;
   const int QueenCheck        = 50;
-  const int RookCheck         = 36;
-  const int BishopCheck       = 7;
+  const int RookCheck         = 37;
+  const int BishopCheck       = 6;
   const int KnightCheck       = 14;
 
   // KingDanger[attackUnits] contains the actual king danger weighted
@@ -411,11 +411,11 @@ namespace {
         // number and types of the enemy's attacking pieces, the number of
         // attacked and undefended squares around our king and the quality of
         // the pawn shelter (current 'score' value).
-        attackUnits =  std::min(77, ei.kingAttackersCount[Them] * ei.kingAttackersWeight[Them])
-                     + 10 * ei.kingAdjacentZoneAttacksCount[Them]
-                     + 19 * popcount<Max15>(undefended)
-                     +  9 * (ei.pinnedPieces[Us] != 0)
-                     - mg_value(score) * 63 / 512
+        attackUnits =  std::min(74, ei.kingAttackersCount[Them] * ei.kingAttackersWeight[Them])
+                     + 8 * ei.kingAdjacentZoneAttacksCount[Them]
+                     + 25 * popcount<Max15>(undefended)
+                     +  11 * (ei.pinnedPieces[Us] != 0)
+                     - mg_value(score) * 31 / 256
                      - !pos.count<QUEEN>(Them) * 60;
 
         // Analyse the enemy's safe queen contact checks. Firstly, find the
@@ -891,13 +891,13 @@ namespace Eval {
 
   void init() {
 
-    const double MaxSlope = 7.5;
+    const double MaxSlope = 8.7;
     const double Peak = 1280;
     double t = 0.0;
 
     for (int i = 1; i < 400; ++i)
     {
-        t = std::min(Peak, std::min(0.025 * i * i, t + MaxSlope));
+        t = std::min(Peak, std::min(0.027 * i * i, t + MaxSlope));
         KingDanger[i] = apply_weight(make_score(int(t), 0), Weights[KingSafety]);
     }
   }