Include the other param results

Alayan-stk-2 · Sep 10, 2019 · ccc9f24 · ccc9f24
1 parent 8d0a6d4
commit ccc9f24
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/src/evaluate.cpp b/src/evaluate.cpp
@@ -108,45 +108,45 @@ namespace {
 
   // RookOnFile[semiopen/open] contains bonuses for each rook when there is
   // no (friendly) pawn on the rook file.
-  constexpr Score RookOnFile[] = { S(18, 7), S(44, 20) };
+  constexpr Score RookOnFile[] = { S(5, 5), S(31, 46) };
 
   // ThreatByMinor/ByRook[attacked PieceType] contains bonuses according to
   // which piece type attacks which one. Attacks on lesser pieces which are
   // pawn-defended are not considered.
   constexpr Score ThreatByMinor[PIECE_TYPE_NB] = {
-    S(0, 0), S(0, 31), S(39, 42), S(57, 44), S(68, 112), S(62, 120)
+    S(0, 0), S(9, 18), S(29, 99), S(68, 52), S(98, 77), S(86, 107)
   };
 
   constexpr Score ThreatByRook[PIECE_TYPE_NB] = {
-    S(0, 0), S(0, 24), S(38, 71), S(38, 61), S(0, 38), S(51, 38)
+    S(0, 0), S(4, 21), S(34, 66), S(51, 125), S(9, 72), S(13, 41)
   };
 
   // PassedRank[Rank] contains a bonus according to the rank of a passed pawn
   constexpr Score PassedRank[RANK_NB] = {
-    S(0, 0), S(10, 28), S(17, 33), S(15, 41), S(62, 72), S(168, 177), S(276, 260)
+    S(0, 0), S(16, 27), S( 9, 22), S(14, 45), S(49, 73), S(181, 170), S(341, 300)
   };
 
   // Assorted bonuses and penalties
   constexpr Score BishopPawns        = S(  3,  7);
   constexpr Score CorneredBishop     = S( 50, 50);
   constexpr Score FlankAttacks       = S(  8,  0);
-  constexpr Score Hanging            = S( 69, 36);
+  constexpr Score Hanging            = S( 58, 71);
   constexpr Score KingProtector      = S(  7,  8);
-  constexpr Score KnightOnQueen      = S( 16, 12);
+  constexpr Score KnightOnQueen      = S( 20, 26);
   constexpr Score LongDiagonalBishop = S( 45,  0);
   constexpr Score MinorBehindPawn    = S( 18,  3);
   constexpr Score Outpost            = S( 18,  6);
   constexpr Score PassedFile         = S( 11,  8);
-  constexpr Score PawnlessFlank      = S( 17, 95);
+  constexpr Score PawnlessFlank      = S(  7,135);
   constexpr Score RestrictedPiece    = S(  7,  7);
-  constexpr Score RookOnPawn         = S( 10, 32);
-  constexpr Score SliderOnQueen      = S( 59, 18);
-  constexpr Score ThreatByKing       = S( 24, 89);
-  constexpr Score ThreatByPawnPush   = S( 48, 39);
+  constexpr Score RookOnPawn         = S(  6, 12);
+  constexpr Score SliderOnQueen      = S( 83, 51);
+  constexpr Score ThreatByKing       = S( 30, 66);
+  constexpr Score ThreatByPawnPush   = S( 35, 78);
   constexpr Score ThreatByRank       = S( 13,  0);
-  constexpr Score ThreatBySafePawn   = S(173, 94);
-  constexpr Score TrappedRook        = S( 47,  4);
-  constexpr Score WeakQueen          = S( 49, 15);
+  constexpr Score ThreatBySafePawn   = S(172, 60);
+  constexpr Score TrappedRook        = S( 45,  2);
+  constexpr Score WeakQueen          = S( 71, 13);
 
 #undef S