X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=6b064322a8ec548369213b9084bbe5abd34043ae;hp=30e4c59a040ea1761ebbfa9d6526f5e7f4ee94bc;hb=a4b98a052e2cadfb15984f0937c8131e18c663b2;hpb=e5da0e4b79b405da5bdc42f6fb4c2ba49afba00a diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 30e4c59a..6b064322 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -109,19 +109,19 @@ namespace { // friendly pieces. const Score MobilityBonus[][32] = { {}, {}, - { S(-65,-50), S(-42,-30), S(-9,-10), S( 3, 0), S(15, 10), S(27, 20), // Knights - S( 37, 28), S( 42, 31), S(44, 33) }, - { S(-52,-47), S(-28,-23), S( 6, 1), S(20, 15), S(34, 29), S(48, 43), // Bishops - S( 60, 55), S( 68, 63), S(74, 68), S(77, 72), S(80, 75), S(82, 77), - S( 84, 79), S( 86, 81) }, - { S(-47,-53), S(-31,-26), S(-5, 0), S( 1, 16), S( 7, 32), S(13, 48), // Rooks - S( 18, 64), S( 22, 80), S(26, 96), S(29,109), S(31,115), S(33,119), - S( 35,122), S( 36,123), S(37,124) }, - { S(-42,-40), S(-28,-23), S(-5, -7), S( 0, 0), S( 6, 10), S(11, 19), // Queens - S( 13, 29), S( 18, 38), S(20, 40), S(21, 41), S(22, 41), S(22, 41), - S( 22, 41), S( 23, 41), S(24, 41), S(25, 41), S(25, 41), S(25, 41), - S( 25, 41), S( 25, 41), S(25, 41), S(25, 41), S(25, 41), S(25, 41), - S( 25, 41), S( 25, 41), S(25, 41), S(25, 41) } + { S(-67,-48), S(-41,-27), S(-4, -7), S( 7, 4), S(14, 16), S(21, 29), // Knights + S( 27, 39), S( 31, 43), S(34, 44) }, + { S(-48,-48), S(-21,-21), S(16, -2), S(30, 13), S(44, 25), S(57, 34), // Bishops + S( 69, 47), S( 78, 53), S(78, 56), S(83, 58), S(88, 64), S(90, 68), + S( 90, 74), S( 91, 76) }, + { S(-47,-56), S(-28,-27), S(-9, 1), S( 0, 22), S( 2, 33), S( 7, 47), // Rooks + S( 9, 62), S( 14, 78), S(21, 89), S(23,105), S(25,113), S(26,114), + S( 27,115), S( 29,118), S(32,122) }, + { S(-46,-37), S(-33,-18), S(-9,-10), S(-3, -7), S( 7, 1), S( 9, 5), // Queens + S( 12, 10), S( 20, 19), S(23, 22), S(24, 29), S(30, 30), S(32, 34), + S( 37, 35), S( 47, 38), S(47, 41), S(47, 42), S(52, 42), S(55, 42), + S( 58, 43), S( 60, 49), S(60, 52), S(61, 56), S(65, 57), S(68, 57), + S( 68, 59), S( 71, 61), S(72, 63), S(76, 63) } }; // Outpost[Bishop/Knight][Square] contains bonuses for knights and bishops @@ -130,17 +130,17 @@ namespace { {// A B C D E F G H V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // Knights V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), - V(0), V(0), V(4), V(8), V(8), V(4), V(0), V(0), - V(0), V(4),V(17),V(26),V(26),V(17), V(4), V(0), - V(0), V(8),V(26),V(35),V(35),V(26), V(8), V(0), - V(0), V(4),V(17),V(17),V(17),V(17), V(4), V(0) }, + V(0), V(0), V(3), V(9), V(9), V(3), V(0), V(0), + V(0), V(4),V(18),V(25),V(25),V(18), V(4), V(0), + V(4), V(9),V(29),V(38),V(38),V(29), V(9), V(4), + V(2), V(9),V(19),V(15),V(15),V(19), V(9), V(2) }, { V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), // Bishops V(0), V(0), V(0), V(0), V(0), V(0), V(0), V(0), - V(0), V(0), V(5), V(5), V(5), V(5), V(0), V(0), - V(0), V(5),V(10),V(10),V(10),V(10), V(5), V(0), - V(0),V(10),V(21),V(21),V(21),V(21),V(10), V(0), - V(0), V(5), V(8), V(8), V(8), V(8), V(5), V(0) } + V(2), V(4), V(3), V(8), V(8), V(3), V(4), V(2), + V(1), V(9), V(9),V(13),V(13), V(9), V(9), V(1), + V(2), V(8),V(21),V(24),V(24),V(21), V(8), V(2), + V(0), V(4), V(6), V(6), V(6), V(6), V(4), V(0) } }; // Threat[defended/weak][minor/major attacking][attacked PieceType] contains