Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
Copyright (C) 2008-2015 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2015-2016 Marco Costalba, Joona Kiiski, Gary Linscott, 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
// type on a given square a (middlegame, endgame) score pair is assigned. Table
// is defined for files A..D and white side: it is symmetric for black side and
// second half of the files.
-const Score Bonus[][int(SQUARE_NB) / 2] = {
+const Score Bonus[][RANK_NB][int(FILE_NB) / 2] = {
{ },
{ // Pawn
- S( 0, 0), S( 0, 0), S( 0, 0), S( 0, 0),
- S(-22, 4), S( 3,-6), S( 7, 8), S( 3,-1),
- S(-25,-3), S( -7,-4), S(18, 4), S(24, 5),
- S(-27, 1), S(-15, 2), S(15,-8), S(30,-2),
- S(-14, 7), S( 0,12), S(-2, 4), S(18,-3),
- S(-12, 8), S(-13,-5), S(-6, 1), S(-4, 7),
- S(-17, 1), S( 10,-9), S(-4, 1), S(-6,16),
- S( 0, 0), S( 0, 0), S( 0, 0), S( 0, 0)
+ { S( 0, 0), S( 0, 0), S( 0, 0), S( 0, 0) },
+ { S(-19, 5), S( 1,-4), S( 7, 8), S( 3,-2) },
+ { S(-26,-6), S( -7,-5), S( 19, 5), S(24, 4) },
+ { S(-25, 1), S(-14, 3), S( 20,-8), S(35,-3) },
+ { S(-14, 6), S( 0, 9), S( 3, 7), S(21,-6) },
+ { S(-14, 6), S(-13,-5), S( -6, 2), S(-2, 4) },
+ { S(-12, 1), S( 15,-9), S( -8, 1), S(-4,18) },
+ { S( 0, 0), S( 0, 0), S( 0, 0), S( 0, 0) }
},
{ // Knight
- S(-144,-98), S(-109,-83), S(-85,-51), S(-73,-16),
- S( -88,-68), S( -43,-53), S(-19,-21), S( -7, 14),
- S( -69,-53), S( -24,-38), S( 0, -6), S( 12, 29),
- S( -28,-42), S( 17,-27), S( 41, 5), S( 53, 40),
- S( -30,-42), S( 15,-27), S( 39, 5), S( 51, 40),
- S( -10,-53), S( 35,-38), S( 59, -6), S( 71, 29),
- S( -64,-68), S( -19,-53), S( 5,-21), S( 17, 14),
- S(-200,-98), S( -65,-83), S(-41,-51), S(-29,-16)
+ { S(-143, -97), S(-96,-82), S(-80,-46), S(-73,-14) },
+ { S( -83, -69), S(-43,-55), S(-21,-17), S(-10, 9) },
+ { S( -71, -50), S(-22,-39), S( 0, -8), S( 9, 28) },
+ { S( -25, -41), S( 18,-25), S( 43, 7), S( 47, 38) },
+ { S( -26, -46), S( 16,-25), S( 38, 2), S( 50, 41) },
+ { S( -11, -55), S( 37,-38), S( 56, -8), S( 71, 27) },
+ { S( -62, -64), S(-17,-50), S( 5,-24), S( 14, 13) },
+ { S(-195,-110), S(-66,-90), S(-42,-50), S(-29,-13) }
},
{ // Bishop
- S(-54,-65), S(-27,-42), S(-34,-44), S(-43,-26),
- S(-29,-43), S( 8,-20), S( 1,-22), S( -8, -4),
- S(-20,-33), S( 17,-10), S( 10,-12), S( 1, 6),
- S(-19,-35), S( 18,-12), S( 11,-14), S( 2, 4),
- S(-22,-35), S( 15,-12), S( 8,-14), S( -1, 4),
- S(-28,-33), S( 9,-10), S( 2,-12), S( -7, 6),
- S(-32,-43), S( 5,-20), S( -2,-22), S(-11, -4),
- S(-49,-65), S(-22,-42), S(-29,-44), S(-38,-26)
+ { S(-54,-68), S(-23,-40), S(-35,-46), S(-44,-28) },
+ { S(-30,-43), S( 10,-17), S( 2,-23), S( -9, -5) },
+ { S(-19,-32), S( 17, -9), S( 11,-13), S( 1, 8) },
+ { S(-21,-36), S( 18,-13), S( 11,-15), S( 0, 7) },
+ { S(-21,-36), S( 14,-14), S( 6,-17), S( -1, 3) },
+ { S(-27,-35), S( 6,-13), S( 2,-10), S( -8, 1) },
+ { S(-33,-44), S( 7,-21), S( -4,-22), S(-12, -4) },
+ { S(-45,-65), S(-21,-42), S(-29,-46), S(-39,-27) }
},
{ // Rook
- S(-22, 3), S(-17, 3), S(-12, 3), S(-8, 3),
- S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3),
- S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3),
- S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3),
- S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3),
- S(-22, 3), S( -7, 3), S( -2, 3), S( 2, 3),
- S(-11, 3), S( 4, 3), S( 9, 3), S(13, 3),
- S(-22, 3), S(-17, 3), S(-12, 3), S(-8, 3)
+ { S(-25, 0), S(-16, 0), S(-16, 0), S(-9, 0) },
+ { S(-21, 0), S( -8, 0), S( -3, 0), S( 0, 0) },
+ { S(-21, 0), S( -9, 0), S( -4, 0), S( 2, 0) },
+ { S(-22, 0), S( -6, 0), S( -1, 0), S( 2, 0) },
+ { S(-22, 0), S( -7, 0), S( 0, 0), S( 1, 0) },
+ { S(-21, 0), S( -7, 0), S( 0, 0), S( 2, 0) },
+ { S(-12, 0), S( 4, 0), S( 8, 0), S(12, 0) },
+ { S(-23, 0), S(-15, 0), S(-11, 0), S(-5, 0) }
},
{ // Queen
- S(-2,-80), S(-2,-54), S(-2,-42), S(-2,-30),
- S(-2,-54), S( 8,-30), S( 8,-18), S( 8, -6),
- S(-2,-42), S( 8,-18), S( 8, -6), S( 8, 6),
- S(-2,-30), S( 8, -6), S( 8, 6), S( 8, 18),
- S(-2,-30), S( 8, -6), S( 8, 6), S( 8, 18),
- S(-2,-42), S( 8,-18), S( 8, -6), S( 8, 6),
- S(-2,-54), S( 8,-30), S( 8,-18), S( 8, -6),
- S(-2,-80), S(-2,-54), S(-2,-42), S(-2,-30)
+ { S( 0,-70), S(-3,-57), S(-4,-41), S(-1,-29) },
+ { S(-4,-58), S( 6,-30), S( 9,-21), S( 8, -4) },
+ { S(-2,-39), S( 6,-17), S( 9, -7), S( 9, 5) },
+ { S(-1,-29), S( 8, -5), S(10, 9), S( 7, 17) },
+ { S(-3,-27), S( 9, -5), S( 8, 10), S( 7, 23) },
+ { S(-2,-40), S( 6,-16), S( 8,-11), S(10, 3) },
+ { S(-2,-54), S( 7,-30), S( 7,-21), S( 6, -7) },
+ { S(-1,-75), S(-4,-54), S(-1,-44), S( 0,-30) }
},
{ // King
- S(298, 27), S(332, 81), S(273,108), S(225,116),
- S(287, 74), S(321,128), S(262,155), S(214,163),
- S(224,111), S(258,165), S(199,192), S(151,200),
- S(196,135), S(230,189), S(171,216), S(123,224),
- S(173,135), S(207,189), S(148,216), S(100,224),
- S(146,111), S(180,165), S(121,192), S( 73,200),
- S(119, 74), S(153,128), S( 94,155), S( 46,163),
- S( 98, 27), S(132, 81), S( 73,108), S( 25,116)
+ { S(291, 28), S(344, 76), S(294,103), S(219,112) },
+ { S(289, 70), S(329,119), S(263,170), S(205,159) },
+ { S(226,109), S(271,164), S(202,195), S(136,191) },
+ { S(204,131), S(212,194), S(175,194), S(137,204) },
+ { S(177,132), S(205,187), S(143,224), S( 94,227) },
+ { S(147,118), S(188,178), S(113,199), S( 70,197) },
+ { S(116, 72), S(158,121), S( 93,142), S( 48,161) },
+ { S( 94, 30), S(120, 76), S( 78,101), S( 31,111) }
}
};
for (Square s = SQ_A1; s <= SQ_H8; ++s)
{
- // Flip to the left half of the board and subtract 4 for each rank
- int ss = (file_of(s) < FILE_E ? s : s ^ 7) - 4 * rank_of(s);
- psq[BLACK][pt][~s] = -(psq[WHITE][pt][s] = v + Bonus[pt][ss]);
+ int edgeDistance = file_of(s) < FILE_E ? file_of(s) : FILE_H - file_of(s);
+ psq[BLACK][pt][~s] = -(psq[WHITE][pt][s] = v + Bonus[pt][rank_of(s)][edgeDistance]);
}
}
}
projects / stockfish / blobdiff