diff --git a/src/eval_constants.hpp b/src/eval_constants.hpp index 27f38a14..44b5cf2a 100644 --- a/src/eval_constants.hpp +++ b/src/eval_constants.hpp @@ -5,171 +5,171 @@ namespace Clockwork { // clang-format off -inline const PParam PAWN_MAT = S(170, 151); -inline const PParam KNIGHT_MAT = S(692, 434); -inline const PParam BISHOP_MAT = S(752, 448); -inline const PParam ROOK_MAT = S(611, 480); -inline const PParam QUEEN_MAT = S(1424, 724); -inline const PParam TEMPO_VAL = S(64, 13); +inline const PParam PAWN_MAT = S(169, 148); +inline const PParam KNIGHT_MAT = S(693, 425); +inline const PParam BISHOP_MAT = S(735, 433); +inline const PParam ROOK_MAT = S(600, 463); +inline const PParam QUEEN_MAT = S(1410, 694); +inline const PParam TEMPO_VAL = S(63, 13); -inline const PParam BISHOP_PAIR_VAL = S(78, 160); -inline const PParam ROOK_OPEN_VAL = S(108, -22); -inline const PParam ROOK_SEMIOPEN_VAL = S(45, 15); +inline const PParam BISHOP_PAIR_VAL = S(76, 157); +inline const PParam ROOK_OPEN_VAL = S(109, -22); +inline const PParam ROOK_SEMIOPEN_VAL = S(45, 17); -inline const PParam DOUBLED_PAWN_VAL = S(-13, -60); -inline const PParam ISOLATED_PAWN_VAL = S(-23, -18); +inline const PParam DOUBLED_PAWN_VAL = S(-13, -57); +inline const PParam ISOLATED_PAWN_VAL = S(-22, -18); -inline const PParam POTENTIAL_CHECKER_VAL = S(-59, -7); -inline const PParam OUTPOST_KNIGHT_VAL = S(43, 46); -inline const PParam OUTPOST_BISHOP_VAL = S(53, 29); +inline const PParam POTENTIAL_CHECKER_VAL = S(-60, -7); +inline const PParam OUTPOST_KNIGHT_VAL = S(44, 49); +inline const PParam OUTPOST_BISHOP_VAL = S(57, 26); -inline const PParam PAWN_PUSH_THREAT_KNIGHT = S(45, 5); -inline const PParam PAWN_PUSH_THREAT_BISHOP = S(55, -23); -inline const PParam PAWN_PUSH_THREAT_ROOK = S(35, 39); -inline const PParam PAWN_PUSH_THREAT_QUEEN = S(67, -48); +inline const PParam PAWN_PUSH_THREAT_KNIGHT = S(44, 6); +inline const PParam PAWN_PUSH_THREAT_BISHOP = S(56, -20); +inline const PParam PAWN_PUSH_THREAT_ROOK = S(34, 43); +inline const PParam PAWN_PUSH_THREAT_QUEEN = S(69, -47); inline const std::array PAWN_PHALANX = { - S(21, -3), S(47, 17), S(65, 48), S(159, 127), S(474, 159), S(661, 608), + S(19, -4), S(45, 17), S(64, 46), S(155, 124), S(438, 152), S(603, 501), }; inline const std::array DEFENDED_PAWN = { - S(62, 21), S(51, 17), S(62, 44), S(154, 96), S(554, -37), + S(62, 19), S(50, 17), S(62, 43), S(149, 98), S(511, -24), }; inline const std::array PASSED_PAWN = { - S(-86, -96), S(-79, -78), S(-44, 4), S(22, 86), S(112, 210), S(317, 282), + S(-89, -93), S(-82, -77), S(-45, 6), S(22, 90), S(120, 205), S(317, 276), }; inline const std::array DEFENDED_PASSED_PUSH = { - S(33, -35), S(33, -7), S(26, 19), S(21, 70), S(89, 139), S(190, 234), + S(34, -37), S(37, -10), S(28, 17), S(18, 68), S(82, 137), S(180, 224), }; inline const std::array BLOCKED_PASSED_PAWN = { - S(19, -34), S(3, 6), S(-3, -18), S(-10, -39), S(-27, -81), S(-276, -105), + S(20, -33), S(5, 8), S(-3, -14), S(-10, -37), S(-30, -78), S(-279, -102), }; inline const std::array FRIENDLY_KING_PASSED_PAWN_DISTANCE = { - S(0, 0), S(17, 113), S(-6, 92), S(-8, 40), S(-6, 10), S(4, 7), S(41, 5), S(13, -3), + S(0, 0), S(15, 113), S(-8, 92), S(-10, 39), S(-6, 9), S(4, 5), S(43, 3), S(14, -7), }; inline const std::array ENEMY_KING_PASSED_PAWN_DISTANCE = { - S(0, 0), S(-336, -5), S(-31, 21), S(-10, 46), S(25, 75), S(42, 90), S(57, 94), S(32, 90), + S(0, 0), S(-358, -6), S(-33, 17), S(-12, 45), S(25, 75), S(43, 89), S(58, 92), S(36, 83), }; inline const std::array KNIGHT_MOBILITY = { - S(85, -36), S(174, 132), S(220, 203), S(253, 237), S(298, 248), S(326, 282), S(361, 277), S(397, 282), S(444, 221), + S(82, -62), S(163, 104), S(205, 190), S(237, 223), S(281, 236), S(309, 269), S(342, 265), S(378, 272), S(424, 211), }; inline const std::array BISHOP_MOBILITY = { - S(105, -72), S(161, 121), S(227, 179), S(260, 222), S(287, 253), S(306, 273), S(316, 289), S(333, 294), S(344, 306), S(364, 296), S(380, 290), S(430, 251), S(436, 250), S(490, 208), + S(111, -62), S(160, 119), S(222, 173), S(252, 216), S(280, 245), S(299, 265), S(309, 281), S(325, 288), S(335, 300), S(357, 289), S(373, 284), S(420, 249), S(429, 250), S(479, 210), }; inline const std::array ROOK_MOBILITY = { - S(344, 162), S(287, 327), S(315, 348), S(335, 354), S(348, 366), S(355, 376), S(363, 384), S(373, 383), S(382, 389), S(394, 389), S(408, 386), S(418, 385), S(427, 383), S(441, 368), S(546, 279), + S(358, 146), S(285, 320), S(313, 340), S(332, 346), S(344, 358), S(351, 368), S(359, 376), S(369, 375), S(377, 381), S(390, 379), S(404, 377), S(415, 376), S(423, 373), S(435, 360), S(540, 269), }; inline const std::array QUEEN_MOBILITY = { - S(646, 210), S(753, 307), S(785, 404), S(807, 519), S(822, 576), S(835, 618), S(842, 653), S(851, 661), S(855, 685), S(861, 694), S(866, 703), S(872, 705), S(880, 699), S(884, 703), S(887, 698), S(889, 696), S(890, 692), S(895, 687), S(902, 673), S(919, 655), S(935, 629), S(963, 596), S(1001, 556), S(1094, 460), S(1142, 408), S(1202, 370), S(1229, 340), S(1179, 350), + S(593, 310), S(754, 270), S(782, 385), S(802, 504), S(820, 552), S(830, 599), S(837, 629), S(845, 640), S(850, 663), S(855, 674), S(861, 680), S(867, 683), S(875, 680), S(877, 683), S(883, 676), S(881, 677), S(882, 674), S(890, 664), S(897, 653), S(914, 636), S(936, 605), S(961, 577), S(1011, 526), S(1105, 431), S(1159, 376), S(1234, 334), S(1317, 280), S(1096, 367), }; inline const std::array KING_MOBILITY = { - S(523, -206), S(123, -136), S(39, -46), S(24, -10), S(2, -2), S(-22, 5), S(-25, 16), S(-40, 25), S(-39, -7), + S(490, -194), S(112, -130), S(36, -47), S(22, -8), S(-1, 1), S(-22, 7), S(-26, 18), S(-44, 32), S(-43, 2), }; inline const std::array PT_INNER_RING_ATTACKS = { - S(11, -12), S(16, -16), S(14, -13), S(6, -9), S(3, 230), + S(12, -13), S(17, -17), S(14, -13), S(7, -9), S(3, 232), }; inline const std::array PT_OUTER_RING_ATTACKS = { - S(3, -2), S(7, -10), S(6, -8), S(6, -5), S(7, 469), + S(4, -2), S(7, -10), S(6, -8), S(6, -5), S(7, 454), }; -inline const PParam PAWN_THREAT_KNIGHT = S(236, 65); -inline const PParam PAWN_THREAT_BISHOP = S(215, 114); -inline const PParam PAWN_THREAT_ROOK = S(218, 84); -inline const PParam PAWN_THREAT_QUEEN = S(182, -47); +inline const PParam PAWN_THREAT_KNIGHT = S(233, 67); +inline const PParam PAWN_THREAT_BISHOP = S(213, 111); +inline const PParam PAWN_THREAT_ROOK = S(216, 91); +inline const PParam PAWN_THREAT_QUEEN = S(182, -53); -inline const PParam KNIGHT_THREAT_BISHOP = S(124, 73); -inline const PParam KNIGHT_THREAT_ROOK = S(257, 16); -inline const PParam KNIGHT_THREAT_QUEEN = S(169, -42); +inline const PParam KNIGHT_THREAT_BISHOP = S(124, 75); +inline const PParam KNIGHT_THREAT_ROOK = S(256, 19); +inline const PParam KNIGHT_THREAT_QUEEN = S(168, -36); -inline const PParam BISHOP_THREAT_KNIGHT = S(117, 41); -inline const PParam BISHOP_THREAT_ROOK = S(247, 72); -inline const PParam BISHOP_THREAT_QUEEN = S(201, 52); +inline const PParam BISHOP_THREAT_KNIGHT = S(115, 43); +inline const PParam BISHOP_THREAT_ROOK = S(241, 76); +inline const PParam BISHOP_THREAT_QUEEN = S(204, 40); inline const std::array BISHOP_PAWNS = { - S(3, -22), S(-4, -9), S(-6, -19), S(-11, -26), S(-17, -32), S(-24, -34), S(-27, -42), S(-34, -40), S(-45, -36), + S(5, -26), S(-3, -11), S(-6, -21), S(-11, -28), S(-17, -33), S(-24, -34), S(-28, -44), S(-35, -39), S(-46, -38), }; -inline const PParam ROOK_LINEUP = S(13, 74); +inline const PParam ROOK_LINEUP = S(14, 71); inline const std::array PAWN_PSQT = { - S(319, 290), S(178, 373), S(315, 343), S(331, 214), S(360, 162), S(279, 238), S(213, 267), S(317, 227), // - S(135, 186), S(179, 215), S(210, 137), S(201, 81), S(179, 69), S(151, 116), S(126, 154), S(81, 177), // - S(101, 151), S(90, 150), S(133, 81), S(132, 65), S(119, 68), S(88, 99), S(41, 140), S(35, 162), // - S(69, 114), S(59, 132), S(96, 82), S(93, 74), S(71, 79), S(55, 104), S(-4, 143), S(-2, 135), // - S(64, 92), S(101, 95), S(91, 123), S(86, 107), S(57, 108), S(33, 115), S(0, 128), S(-5, 120), // - S(79, 94), S(167, 100), S(163, 147), S(117, 132), S(85, 125), S(60, 126), S(29, 133), S(12, 135), // + S(326, 280), S(177, 363), S(318, 340), S(329, 214), S(366, 161), S(263, 239), S(209, 266), S(320, 224), // + S(136, 182), S(170, 209), S(211, 132), S(192, 79), S(167, 70), S(145, 113), S(122, 155), S(76, 181), // + S(99, 149), S(87, 147), S(125, 79), S(125, 62), S(111, 65), S(83, 98), S(37, 139), S(31, 162), // + S(67, 113), S(58, 131), S(93, 79), S(90, 70), S(68, 77), S(52, 103), S(-8, 143), S(-6, 136), // + S(63, 92), S(103, 94), S(92, 119), S(83, 105), S(54, 105), S(31, 113), S(-4, 129), S(-10, 122), // + S(77, 94), S(172, 97), S(161, 148), S(111, 130), S(80, 124), S(58, 122), S(27, 133), S(9, 136), // }; inline const std::array KNIGHT_PSQT = { - S(-284, 34), S(-184, 216), S(-278, 288), S(90, 179), S(33, 176), S(-99, 169), S(-277, 212), S(-345, 104), // - S(99, 159), S(161, 158), S(240, 121), S(239, 138), S(224, 156), S(156, 148), S(120, 169), S(83, 145), // - S(194, 129), S(230, 159), S(247, 182), S(242, 179), S(216, 185), S(151, 202), S(165, 149), S(122, 148), // - S(262, 150), S(273, 163), S(272, 187), S(265, 210), S(268, 210), S(218, 202), S(210, 169), S(201, 145), // - S(247, 150), S(277, 141), S(258, 181), S(253, 198), S(230, 202), S(225, 188), S(218, 146), S(187, 146), // - S(179, 131), S(208, 130), S(200, 162), S(213, 185), S(211, 182), S(170, 168), S(161, 133), S(129, 111), // - S(193, 120), S(217, 122), S(188, 127), S(192, 146), S(181, 145), S(149, 112), S(148, 120), S(114, 60), // - S(124, 100), S(170, 154), S(190, 117), S(206, 110), S(190, 125), S(151, 105), S(137, 131), S(86, 75), // + S(-302, 34), S(-161, 193), S(-287, 259), S(116, 159), S(56, 155), S(-93, 161), S(-216, 186), S(-340, 104), // + S(87, 149), S(140, 154), S(228, 113), S(221, 134), S(208, 150), S(144, 139), S(104, 162), S(76, 143), // + S(183, 125), S(207, 163), S(235, 173), S(228, 169), S(203, 177), S(139, 195), S(153, 137), S(118, 134), // + S(255, 141), S(266, 155), S(262, 177), S(254, 202), S(257, 202), S(208, 192), S(198, 166), S(194, 137), // + S(237, 145), S(270, 132), S(248, 174), S(245, 190), S(221, 193), S(218, 178), S(214, 132), S(175, 144), // + S(175, 122), S(203, 123), S(195, 156), S(207, 177), S(204, 175), S(164, 161), S(153, 131), S(121, 106), // + S(190, 118), S(209, 119), S(178, 121), S(182, 140), S(173, 139), S(142, 102), S(135, 118), S(110, 60), // + S(115, 94), S(164, 153), S(185, 103), S(200, 98), S(183, 116), S(147, 94), S(131, 125), S(85, 65), // }; inline const std::array BISHOP_PSQT = { - S(7, 272), S(-10, 263), S(-266, 309), S(-166, 286), S(-156, 304), S(-217, 317), S(-74, 310), S(23, 278), // - S(143, 186), S(96, 250), S(117, 222), S(54, 254), S(58, 256), S(101, 241), S(132, 227), S(113, 209), // - S(219, 198), S(232, 215), S(232, 228), S(207, 219), S(179, 216), S(184, 220), S(205, 211), S(184, 188), // - S(196, 187), S(223, 204), S(227, 221), S(229, 248), S(261, 230), S(186, 219), S(191, 193), S(152, 192), // - S(214, 154), S(234, 182), S(240, 203), S(248, 221), S(228, 231), S(205, 219), S(169, 200), S(162, 165), // - S(240, 158), S(275, 169), S(289, 187), S(237, 215), S(229, 199), S(224, 205), S(230, 181), S(174, 186), // - S(215, 124), S(305, 140), S(266, 152), S(234, 175), S(214, 178), S(216, 154), S(213, 156), S(209, 141), // - S(232, 140), S(222, 165), S(228, 186), S(241, 149), S(236, 152), S(234, 195), S(228, 172), S(211, 164), // + S(17, 273), S(12, 257), S(-270, 315), S(-157, 280), S(-172, 306), S(-193, 311), S(-62, 302), S(38, 269), // + S(138, 189), S(85, 254), S(115, 221), S(49, 252), S(64, 252), S(97, 240), S(137, 230), S(117, 207), // + S(223, 198), S(229, 222), S(222, 228), S(207, 216), S(175, 213), S(181, 219), S(198, 211), S(193, 189), // + S(191, 192), S(226, 203), S(227, 220), S(230, 246), S(265, 225), S(190, 213), S(197, 186), S(156, 189), // + S(216, 153), S(235, 182), S(242, 202), S(252, 219), S(229, 232), S(210, 217), S(177, 197), S(167, 164), // + S(244, 158), S(279, 167), S(294, 188), S(239, 215), S(233, 195), S(229, 205), S(235, 180), S(172, 188), // + S(212, 122), S(311, 141), S(270, 154), S(235, 174), S(216, 180), S(219, 153), S(218, 157), S(212, 151), // + S(239, 141), S(228, 155), S(228, 187), S(245, 142), S(234, 150), S(235, 196), S(231, 175), S(217, 166), // }; inline const std::array ROOK_PSQT = { - S(490, 321), S(533, 324), S(484, 343), S(488, 331), S(486, 321), S(455, 327), S(454, 339), S(441, 349), // - S(380, 383), S(473, 362), S(541, 338), S(482, 352), S(472, 355), S(450, 359), S(379, 389), S(359, 397), // - S(353, 372), S(477, 336), S(514, 324), S(492, 320), S(455, 334), S(410, 357), S(411, 357), S(335, 397), // - S(343, 351), S(429, 346), S(458, 333), S(440, 332), S(431, 338), S(390, 357), S(379, 356), S(307, 380), // - S(307, 310), S(377, 315), S(369, 331), S(348, 333), S(333, 344), S(324, 358), S(296, 351), S(273, 350), // - S(286, 272), S(354, 280), S(346, 302), S(332, 299), S(327, 299), S(303, 322), S(294, 306), S(256, 316), // - S(193, 288), S(319, 239), S(332, 261), S(328, 273), S(318, 275), S(306, 283), S(289, 268), S(258, 284), // - S(243, 285), S(270, 296), S(331, 268), S(347, 260), S(334, 270), S(316, 286), S(303, 283), S(280, 302), // + S(488, 304), S(521, 312), S(486, 326), S(485, 316), S(483, 304), S(460, 306), S(454, 321), S(433, 333), // + S(367, 372), S(461, 353), S(540, 322), S(480, 334), S(461, 345), S(439, 350), S(368, 379), S(348, 387), // + S(339, 366), S(464, 329), S(507, 312), S(482, 305), S(436, 329), S(395, 347), S(396, 347), S(326, 385), // + S(336, 340), S(424, 334), S(454, 318), S(428, 324), S(422, 329), S(384, 347), S(379, 340), S(301, 370), // + S(304, 301), S(377, 302), S(367, 320), S(346, 320), S(326, 339), S(318, 348), S(287, 342), S(265, 343), // + S(287, 259), S(357, 271), S(346, 291), S(331, 289), S(320, 296), S(299, 312), S(290, 296), S(251, 308), // + S(175, 281), S(313, 234), S(328, 251), S(322, 269), S(308, 272), S(301, 275), S(282, 262), S(254, 278), // + S(239, 274), S(265, 287), S(328, 260), S(342, 253), S(330, 262), S(311, 277), S(299, 275), S(276, 295), // }; inline const std::array QUEEN_PSQT = { - S(657, 512), S(707, 480), S(674, 531), S(624, 616), S(634, 584), S(628, 568), S(657, 495), S(584, 559), // - S(653, 570), S(621, 653), S(603, 690), S(460, 782), S(468, 770), S(536, 713), S(574, 612), S(585, 587), // - S(627, 608), S(679, 625), S(617, 707), S(566, 738), S(540, 728), S(569, 683), S(621, 586), S(620, 537), // - S(660, 541), S(674, 604), S(613, 672), S(599, 718), S(585, 721), S(584, 653), S(638, 562), S(624, 531), // - S(665, 522), S(668, 559), S(639, 622), S(607, 674), S(605, 667), S(607, 622), S(619, 554), S(641, 484), // - S(647, 461), S(683, 502), S(683, 561), S(651, 561), S(644, 557), S(645, 570), S(652, 500), S(630, 475), // - S(629, 357), S(665, 353), S(673, 414), S(688, 449), S(674, 477), S(665, 448), S(634, 482), S(639, 462), // - S(603, 379), S(638, 227), S(658, 238), S(679, 335), S(681, 393), S(677, 350), S(665, 374), S(623, 425), // + S(639, 486), S(691, 451), S(653, 515), S(612, 589), S(606, 567), S(615, 542), S(634, 476), S(560, 545), // + S(643, 535), S(609, 624), S(595, 657), S(439, 762), S(447, 753), S(522, 692), S(560, 585), S(570, 563), // + S(614, 579), S(665, 594), S(607, 676), S(541, 720), S(519, 710), S(559, 655), S(608, 558), S(615, 499), // + S(648, 513), S(666, 574), S(601, 646), S(586, 688), S(574, 696), S(577, 623), S(629, 540), S(605, 524), // + S(664, 482), S(660, 538), S(631, 598), S(598, 647), S(596, 648), S(597, 601), S(608, 536), S(631, 461), // + S(639, 437), S(678, 481), S(676, 539), S(642, 542), S(634, 542), S(633, 556), S(643, 481), S(619, 455), // + S(614, 339), S(654, 345), S(663, 402), S(679, 432), S(664, 466), S(655, 434), S(620, 469), S(629, 449), // + S(596, 347), S(623, 209), S(649, 229), S(668, 327), S(669, 386), S(666, 338), S(654, 362), S(617, 408), // }; inline const std::array KING_PSQT = { - S(-261, -267), S(217, 80), S(141, 52), S(-161, 30), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // - S(276, -107), S(353, 82), S(184, 101), S(84, 9), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // - S(202, 28), S(417, 52), S(284, 67), S(136, 5), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // - S(-11, 30), S(313, 28), S(136, 51), S(50, 24), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // - S(-96, 20), S(206, 5), S(135, 15), S(26, 17), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // - S(-61, 21), S(195, -6), S(99, 11), S(70, -17), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // - S(-1, -8), S(91, 18), S(2, 30), S(-46, -0), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // - S(-124, -35), S(-10, -16), S(-112, 1), S(-120, -65), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(-249, -268), S(236, 93), S(163, 61), S(-164, 45), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(268, -99), S(403, 64), S(187, 97), S(83, 3), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(209, 31), S(447, 38), S(299, 63), S(129, -3), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(8, 27), S(313, 28), S(140, 54), S(52, 23), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(-98, 21), S(211, 4), S(136, 20), S(16, 21), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(-46, 18), S(210, -7), S(121, 11), S(78, -16), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(-3, -2), S(92, 24), S(11, 35), S(-41, 1), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(-124, -31), S(-14, -10), S(-113, 6), S(-119, -65), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // }; inline const std::array, 4> KING_SHELTER = {{ - {{ S(14, -27), S(-4, 5), S(-9, 12), S(-2, -1), S(-2, -2), S(-8, 13), S(-2, 10), }}, - {{ S(4, -9), S(-26, 29), S(-23, 23), S(-13, 3), S(-12, 6), S(-22, 30), S(-25, 41), }}, - {{ S(-15, 0), S(-27, 25), S(-26, 7), S(-23, -7), S(-22, -6), S(-26, 9), S(-26, 24), }}, - {{ S(-0, -17), S(-19, -23), S(-11, -24), S(-6, -27), S(-7, -25), S(-12, -20), S(-15, -18), }}, + {{ S(10, -27), S(-9, 7), S(-13, 12), S(-5, -0), S(-5, -2), S(-12, 13), S(-7, 11), }}, + {{ S(1, -5), S(-28, 30), S(-25, 26), S(-15, 8), S(-14, 9), S(-24, 32), S(-27, 43), }}, + {{ S(-15, -3), S(-26, 22), S(-25, 4), S(-22, -11), S(-21, -10), S(-25, 5), S(-25, 20), }}, + {{ S(-3, -14), S(-22, -21), S(-14, -22), S(-9, -25), S(-10, -23), S(-15, -18), S(-18, -19), }}, }}; inline const std::array BLOCKED_SHELTER_STORM = { - S(0, 0), S(0, 0), S(10, 19), S(-16, 35), S(-14, 24), S(-7, 12), S(-10, -1), + S(0, 0), S(0, 0), S(9, 20), S(-15, 37), S(-12, 24), S(-6, 13), S(-6, -2), }; inline const std::array, 4> SHELTER_STORM = {{ - {{ S(-3, 13), S(-13, 18), S(-11, 17), S(-10, 12), S(-11, 8), S(-10, 8), S(-13, 15), }}, - {{ S(-2, 11), S(-11, 16), S(-18, 23), S(-13, 11), S(-13, 8), S(-16, 18), S(-10, 15), }}, - {{ S(-7, 12), S(-13, 5), S(-13, 13), S(-9, 11), S(-8, 9), S(-13, 11), S(-12, 7), }}, - {{ S(-9, 13), S(-16, 13), S(-16, 12), S(-10, 15), S(-8, 15), S(-15, 11), S(-17, 11), }}, + {{ S(-2, 14), S(-13, 20), S(-11, 18), S(-9, 14), S(-10, 9), S(-9, 9), S(-13, 18), }}, + {{ S(-0, 9), S(-9, 16), S(-16, 21), S(-12, 11), S(-11, 7), S(-15, 17), S(-9, 14), }}, + {{ S(-7, 12), S(-12, 6), S(-14, 15), S(-8, 12), S(-8, 11), S(-13, 13), S(-12, 8), }}, + {{ S(-8, 12), S(-14, 13), S(-15, 11), S(-9, 16), S(-7, 16), S(-14, 11), S(-16, 12), }}, }}; inline TunableSigmoid<32> KING_SAFETY_ACTIVATION( - 1088, 421, -29, 46 + 1112, 423, -28, 44 ); -// Epoch duration: 9.05276s +// Epoch duration: 9.97031s // clang-format on } // namespace Clockwork diff --git a/src/evaltune_main.cpp b/src/evaltune_main.cpp index 7d39fa51..2dc7c87e 100644 --- a/src/evaltune_main.cpp +++ b/src/evaltune_main.cpp @@ -37,9 +37,8 @@ int main() { std::vector results; const std::vector fenFiles = { - "data/dfrcv1.txt", "data/dfrcv0.txt", "data/v3.txt", "data/v4_5knpm.txt", "data/v4_8knpm.txt", "data/v4_16knpm.txt", - "data/v4.1_5knpm.txt", "data/v4.1_8knpm.txt", "data/combined.txt", + "data/v4.1_5knpm.txt", "data/v4.1_8knpm.txt", "data/dfrcv2.txt", }; const u32 thread_count = std::max(1, std::thread::hardware_concurrency() / 2);