diff --git a/src/eval_constants.hpp b/src/eval_constants.hpp index ea0d0bc6..c42a8365 100644 --- a/src/eval_constants.hpp +++ b/src/eval_constants.hpp @@ -5,180 +5,180 @@ namespace Clockwork { // clang-format off -inline const PParam PAWN_MAT = S(163, 161); -inline const PParam KNIGHT_MAT = S(513, 311); -inline const PParam BISHOP_MAT = S(458, 268); -inline const PParam ROOK_MAT = S(548, 408); -inline const PParam QUEEN_MAT = S(1082, 559); -inline const PParam TEMPO_VAL = S(64, 13); +inline const PParam PAWN_MAT = S(164, 157); +inline const PParam KNIGHT_MAT = S(569, 307); +inline const PParam BISHOP_MAT = S(518, 268); +inline const PParam ROOK_MAT = S(546, 381); +inline const PParam QUEEN_MAT = S(1115, 519); +inline const PParam TEMPO_VAL = S(65, 14); -inline const PParam BISHOP_PAIR_VAL = S(76, 162); -inline const PParam ROOK_OPEN_VAL = S(113, -26); -inline const PParam ROOK_SEMIOPEN_VAL = S(40, 19); +inline const PParam BISHOP_PAIR_VAL = S(78, 156); +inline const PParam ROOK_OPEN_VAL = S(112, -26); +inline const PParam ROOK_SEMIOPEN_VAL = S(41, 19); -inline const PParam DOUBLED_PAWN_VAL = S(-19, -85); +inline const PParam DOUBLED_PAWN_VAL = S(-19, -84); -inline const PParam POTENTIAL_CHECKER_VAL = S(-66, -11); -inline const PParam OUTPOST_KNIGHT_VAL = S(50, 40); -inline const PParam OUTPOST_BISHOP_VAL = S(60, 26); +inline const PParam POTENTIAL_CHECKER_VAL = S(-68, -11); +inline const PParam OUTPOST_KNIGHT_VAL = S(49, 43); +inline const PParam OUTPOST_BISHOP_VAL = S(59, 28); -inline const PParam PAWN_PUSH_THREAT_KNIGHT = S(48, 4); -inline const PParam PAWN_PUSH_THREAT_BISHOP = S(56, -24); -inline const PParam PAWN_PUSH_THREAT_ROOK = S(37, 35); -inline const PParam PAWN_PUSH_THREAT_QUEEN = S(67, -47); +inline const PParam PAWN_PUSH_THREAT_KNIGHT = S(51, 4); +inline const PParam PAWN_PUSH_THREAT_BISHOP = S(60, -25); +inline const PParam PAWN_PUSH_THREAT_ROOK = S(37, 37); +inline const PParam PAWN_PUSH_THREAT_QUEEN = S(68, -48); inline const std::array PAWN_PHALANX = { - S(20, 11), S(55, 36), S(71, 69), S(171, 158), S(480, 229), S(644, 683), + S(19, 13), S(56, 34), S(73, 66), S(161, 155), S(484, 185), S(659, 637), }; inline const std::array DEFENDED_PAWN = { - S(65, 41), S(58, 34), S(75, 64), S(178, 114), S(592, -12), + S(68, 40), S(58, 35), S(73, 65), S(165, 118), S(583, -19), }; inline const std::array PASSED_PAWN = { - S(-80, -97), S(-79, -78), S(-55, 2), S(24, 74), S(112, 207), S(303, 277), + S(-87, -99), S(-84, -77), S(-57, 3), S(17, 79), S(121, 204), S(315, 275), }; inline const std::array DEFENDED_PASSED_PUSH = { - S(41, -35), S(36, -6), S(30, 18), S(29, 63), S(95, 131), S(204, 217), + S(44, -36), S(36, -6), S(29, 17), S(25, 65), S(94, 133), S(178, 229), }; inline const std::array BLOCKED_PASSED_PAWN = { - S(11, -34), S(1, 6), S(-1, -22), S(-5, -42), S(-17, -89), S(-272, -105), + S(15, -34), S(2, 3), S(3, -21), S(-4, -41), S(-21, -88), S(-286, -100), }; inline const std::array FRIENDLY_KING_PASSED_PAWN_DISTANCE = { - S(0, 0), S(16, 110), S(-9, 89), S(-8, 35), S(-6, 8), S(4, 7), S(47, 2), S(8, -6), + S(0, 0), S(11, 113), S(-7, 89), S(-7, 35), S(-3, 6), S(3, 4), S(41, -0), S(15, -11), }; inline const std::array ENEMY_KING_PASSED_PAWN_DISTANCE = { - S(0, 0), S(-291, -11), S(-26, 21), S(-7, 49), S(35, 62), S(36, 81), S(44, 86), S(20, 80), + S(0, 0), S(-313, -11), S(-28, 18), S(-9, 50), S(33, 64), S(39, 83), S(48, 89), S(23, 83), }; inline const std::array KNIGHT_MOBILITY = { - S(12, -68), S(110, 87), S(165, 158), S(200, 188), S(249, 197), S(277, 229), S(314, 221), S(351, 222), S(398, 161), + S(15, -114), S(105, 56), S(151, 130), S(184, 165), S(231, 175), S(261, 208), S(297, 202), S(335, 205), S(383, 144), }; inline const std::array BISHOP_MOBILITY = { - S(-13, -124), S(55, 37), S(116, 79), S(144, 126), S(174, 155), S(192, 174), S(201, 191), S(220, 195), S(231, 207), S(251, 195), S(274, 185), S(333, 141), S(339, 139), S(407, 96), + S(1, -182), S(58, 13), S(122, 72), S(155, 115), S(181, 147), S(200, 168), S(209, 184), S(226, 190), S(237, 202), S(259, 191), S(278, 183), S(331, 144), S(343, 141), S(407, 95), }; inline const std::array ROOK_MOBILITY = { - S(274, 97), S(194, 261), S(222, 278), S(242, 282), S(257, 291), S(262, 303), S(270, 311), S(280, 309), S(289, 314), S(300, 316), S(315, 314), S(327, 312), S(335, 311), S(356, 290), S(464, 194), + S(273, 75), S(204, 248), S(231, 267), S(252, 272), S(266, 284), S(272, 295), S(280, 304), S(290, 303), S(298, 309), S(310, 309), S(325, 307), S(336, 305), S(346, 303), S(362, 287), S(458, 198), }; inline const std::array QUEEN_MOBILITY = { - S(464, 98), S(525, 231), S(575, 264), S(603, 360), S(614, 419), S(630, 450), S(634, 493), S(642, 499), S(645, 523), S(651, 532), S(655, 545), S(661, 549), S(672, 537), S(677, 539), S(681, 536), S(685, 531), S(690, 524), S(689, 524), S(701, 503), S(720, 485), S(735, 465), S(751, 431), S(779, 412), S(900, 299), S(948, 248), S(944, 239), S(864, 285), S(970, 211), + S(446, 24), S(555, 118), S(588, 213), S(610, 329), S(625, 386), S(637, 430), S(644, 466), S(653, 474), S(657, 500), S(663, 510), S(668, 519), S(675, 521), S(684, 515), S(688, 518), S(693, 512), S(696, 508), S(699, 504), S(703, 499), S(711, 485), S(726, 470), S(742, 446), S(769, 414), S(803, 379), S(895, 288), S(950, 236), S(1001, 204), S(1021, 178), S(977, 191), }; inline const std::array KING_MOBILITY = { - S(551, -262), S(147, -121), S(58, -45), S(39, -9), S(14, -8), S(-17, 6), S(-39, 30), S(-66, 44), S(-82, 20), + S(592, -221), S(143, -113), S(56, -38), S(41, -10), S(17, -9), S(-17, 4), S(-39, 25), S(-72, 42), S(-97, 21), }; inline const std::array KNIGHT_KING_RING = { - S(240, 230), S(356, 185), S(455, 125), + S(229, 227), S(373, 169), S(500, 91), }; inline const std::array BISHOP_KING_RING = { - S(479, 371), S(293, 234), S(160, 69), + S(428, 349), S(264, 220), S(153, 63), }; inline const std::array ROOK_KING_RING = { - S(322, 319), S(444, 316), S(483, 325), S(592, 372), S(752, 331), + S(322, 315), S(453, 307), S(503, 307), S(626, 345), S(797, 295), }; inline const std::array QUEEN_KING_RING = { - S(881, 745), S(595, 609), S(333, 462), S(141, 259), S(83, -7), S(24, -298), + S(913, 724), S(610, 592), S(337, 440), S(127, 235), S(55, -38), S(-10, -328), }; inline const std::array PT_INNER_RING_ATTACKS = { - S(-85, 41), S(27, -18), S(-226, -129), S(63, 36), S(-242, -154), + S(-91, 42), S(51, -34), S(-207, -121), S(74, 27), S(-257, -154), }; inline const std::array PT_OUTER_RING_ATTACKS = { - S(-25, 19), S(-20, 19), S(-19, 15), S(-17, 10), S(-21, -13), + S(-26, 20), S(-21, 18), S(-20, 16), S(-16, 9), S(-22, -12), }; -inline const PParam PAWN_THREAT_KNIGHT = S(244, 61); -inline const PParam PAWN_THREAT_BISHOP = S(219, 115); -inline const PParam PAWN_THREAT_ROOK = S(205, 99); -inline const PParam PAWN_THREAT_QUEEN = S(185, -41); +inline const PParam PAWN_THREAT_KNIGHT = S(243, 66); +inline const PParam PAWN_THREAT_BISHOP = S(218, 117); +inline const PParam PAWN_THREAT_ROOK = S(215, 86); +inline const PParam PAWN_THREAT_QUEEN = S(190, -47); -inline const PParam KNIGHT_THREAT_BISHOP = S(118, 73); -inline const PParam KNIGHT_THREAT_ROOK = S(257, 15); -inline const PParam KNIGHT_THREAT_QUEEN = S(156, -17); +inline const PParam KNIGHT_THREAT_BISHOP = S(124, 73); +inline const PParam KNIGHT_THREAT_ROOK = S(256, 18); +inline const PParam KNIGHT_THREAT_QUEEN = S(168, -38); -inline const PParam BISHOP_THREAT_KNIGHT = S(116, 37); -inline const PParam BISHOP_THREAT_ROOK = S(240, 71); -inline const PParam BISHOP_THREAT_QUEEN = S(200, 55); +inline const PParam BISHOP_THREAT_KNIGHT = S(121, 38); +inline const PParam BISHOP_THREAT_ROOK = S(248, 72); +inline const PParam BISHOP_THREAT_QUEEN = S(206, 47); inline const std::array BISHOP_PAWNS = { - S(4, -20), S(-3, -8), S(-4, -18), S(-10, -24), S(-16, -31), S(-22, -34), S(-25, -45), S(-30, -46), S(-38, -51), + S(4, -22), S(-3, -9), S(-5, -18), S(-11, -25), S(-17, -31), S(-23, -35), S(-26, -44), S(-32, -44), S(-45, -41), }; -inline const PParam ROOK_LINEUP = S(14, 67); +inline const PParam ROOK_LINEUP = S(16, 65); inline const std::array PAWN_PSQT = { - S(289, 300), S(158, 370), S(266, 324), S(302, 224), S(355, 161), S(268, 239), S(215, 269), S(328, 220), // - S(112, 187), S(159, 236), S(173, 182), S(160, 101), S(147, 76), S(123, 115), S(106, 157), S(72, 171), // - S(84, 156), S(89, 171), S(96, 140), S(99, 92), S(91, 79), S(61, 106), S(45, 137), S(27, 158), // - S(62, 114), S(81, 144), S(78, 126), S(79, 85), S(60, 78), S(49, 100), S(12, 140), S(-3, 126), // - S(52, 89), S(104, 102), S(82, 151), S(79, 107), S(56, 101), S(28, 105), S(14, 116), S(-6, 108), // - S(87, 87), S(178, 91), S(101, 129), S(108, 126), S(83, 115), S(68, 100), S(49, 124), S(13, 123), // + S(329, 291), S(197, 364), S(284, 327), S(321, 222), S(353, 168), S(282, 227), S(219, 266), S(315, 219), // + S(118, 188), S(164, 232), S(183, 183), S(160, 102), S(146, 83), S(131, 113), S(117, 154), S(67, 172), // + S(97, 154), S(103, 166), S(106, 140), S(108, 85), S(101, 74), S(73, 105), S(49, 139), S(28, 158), // + S(69, 113), S(87, 142), S(82, 129), S(83, 81), S(65, 76), S(55, 101), S(16, 139), S(-2, 129), // + S(57, 89), S(109, 104), S(86, 149), S(83, 101), S(57, 99), S(33, 103), S(19, 118), S(-6, 111), // + S(93, 88), S(182, 90), S(101, 132), S(119, 119), S(90, 115), S(73, 98), S(52, 124), S(14, 125), // }; inline const std::array KNIGHT_PSQT = { - S(-287, -42), S(-215, 183), S(-451, 434), S(95, 147), S(21, 153), S(-111, 133), S(-373, 196), S(-347, 42), // - S(115, 119), S(164, 120), S(248, 80), S(226, 113), S(218, 126), S(148, 122), S(128, 131), S(99, 104), // - S(187, 88), S(204, 131), S(257, 148), S(217, 165), S(189, 175), S(129, 184), S(135, 126), S(112, 117), // - S(241, 132), S(226, 150), S(232, 174), S(203, 207), S(222, 196), S(190, 182), S(191, 139), S(187, 115), // - S(231, 119), S(270, 108), S(244, 152), S(230, 174), S(215, 172), S(215, 161), S(215, 111), S(177, 112), // - S(175, 93), S(208, 90), S(188, 125), S(208, 151), S(210, 145), S(158, 134), S(158, 99), S(124, 81), // - S(188, 83), S(211, 68), S(182, 88), S(179, 110), S(168, 114), S(147, 70), S(152, 82), S(109, 21), // - S(127, 64), S(165, 121), S(189, 74), S(210, 60), S(190, 82), S(141, 64), S(134, 96), S(79, 39), // + S(-325, -12), S(-217, 174), S(-314, 245), S(54, 138), S(-5, 133), S(-137, 130), S(-316, 172), S(-381, 64), // + S(76, 113), S(143, 110), S(220, 75), S(208, 101), S(191, 118), S(134, 105), S(97, 124), S(60, 100), // + S(164, 85), S(190, 119), S(227, 139), S(201, 146), S(168, 158), S(123, 161), S(132, 109), S(92, 107), // + S(216, 114), S(217, 136), S(220, 157), S(200, 185), S(214, 180), S(170, 168), S(173, 131), S(159, 108), // + S(222, 105), S(251, 97), S(232, 137), S(223, 156), S(204, 158), S(200, 143), S(192, 102), S(162, 102), // + S(156, 86), S(187, 81), S(177, 116), S(191, 139), S(191, 135), S(148, 123), S(141, 87), S(107, 67), // + S(168, 71), S(188, 70), S(160, 79), S(167, 99), S(157, 99), S(126, 67), S(123, 76), S(88, 18), // + S(99, 58), S(146, 110), S(166, 67), S(181, 64), S(165, 80), S(127, 61), S(113, 88), S(61, 35), // }; inline const std::array BISHOP_PSQT = { - S(-32, 184), S(-64, 166), S(-367, 244), S(-228, 211), S(-194, 220), S(-290, 251), S(-107, 220), S(-26, 194), // - S(86, 109), S(28, 173), S(61, 131), S(-10, 182), S(-20, 185), S(34, 163), S(63, 145), S(45, 134), // - S(138, 129), S(175, 122), S(165, 156), S(129, 147), S(95, 148), S(95, 156), S(136, 135), S(114, 114), // - S(125, 107), S(143, 127), S(166, 136), S(143, 176), S(172, 163), S(105, 149), S(116, 122), S(81, 116), // - S(142, 82), S(153, 110), S(159, 129), S(168, 150), S(154, 158), S(119, 148), S(79, 131), S(87, 97), // - S(160, 84), S(196, 90), S(211, 107), S(158, 145), S(150, 129), S(154, 127), S(163, 103), S(101, 109), // - S(144, 34), S(229, 55), S(187, 70), S(156, 97), S(136, 108), S(145, 79), S(145, 86), S(134, 47), // - S(147, 46), S(130, 96), S(142, 119), S(160, 77), S(165, 65), S(157, 124), S(152, 79), S(128, 72), // + S(-60, 187), S(-80, 177), S(-332, 223), S(-232, 200), S(-218, 219), S(-287, 233), S(-146, 226), S(-39, 193), // + S(73, 102), S(34, 160), S(51, 133), S(-12, 169), S(-7, 170), S(34, 154), S(70, 140), S(41, 126), // + S(125, 123), S(153, 131), S(155, 145), S(132, 135), S(101, 135), S(112, 135), S(132, 126), S(106, 107), // + S(118, 104), S(143, 122), S(151, 139), S(145, 169), S(179, 151), S(108, 138), S(116, 109), S(77, 109), // + S(135, 73), S(159, 99), S(164, 122), S(166, 143), S(148, 150), S(124, 138), S(91, 116), S(83, 84), // + S(161, 77), S(200, 83), S(215, 103), S(160, 135), S(152, 118), S(148, 121), S(154, 97), S(94, 103), // + S(136, 38), S(229, 50), S(189, 65), S(159, 88), S(138, 96), S(140, 71), S(138, 72), S(128, 60), // + S(154, 60), S(141, 85), S(154, 101), S(163, 65), S(161, 68), S(158, 115), S(151, 91), S(132, 83), // }; inline const std::array ROOK_PSQT = { - S(414, 241), S(450, 249), S(399, 277), S(408, 260), S(402, 261), S(347, 274), S(368, 274), S(365, 276), // - S(311, 295), S(375, 284), S(458, 261), S(390, 286), S(389, 289), S(346, 296), S(266, 325), S(264, 324), // - S(287, 286), S(418, 251), S(446, 244), S(420, 246), S(379, 258), S(333, 280), S(328, 284), S(251, 317), // - S(263, 275), S(340, 274), S(381, 257), S(349, 258), S(345, 267), S(303, 286), S(283, 288), S(221, 302), // - S(224, 229), S(295, 239), S(277, 255), S(261, 249), S(250, 257), S(238, 283), S(208, 273), S(182, 272), // - S(192, 201), S(257, 199), S(257, 222), S(236, 218), S(239, 212), S(212, 248), S(203, 227), S(160, 242), // - S(108, 215), S(225, 157), S(238, 183), S(240, 189), S(229, 193), S(218, 205), S(196, 189), S(168, 204), // - S(154, 205), S(164, 228), S(235, 190), S(254, 178), S(234, 197), S(224, 211), S(210, 203), S(192, 225), // + S(415, 239), S(454, 240), S(414, 262), S(430, 247), S(423, 240), S(388, 248), S(380, 258), S(369, 267), // + S(294, 301), S(385, 282), S(457, 262), S(397, 281), S(386, 286), S(365, 287), S(296, 313), S(273, 319), // + S(283, 288), S(403, 254), S(445, 247), S(422, 243), S(385, 259), S(340, 281), S(336, 279), S(261, 316), // + S(268, 273), S(352, 270), S(384, 259), S(363, 258), S(358, 262), S(314, 283), S(302, 281), S(231, 303), // + S(233, 233), S(296, 241), S(293, 254), S(269, 256), S(256, 265), S(245, 281), S(215, 275), S(195, 274), // + S(208, 196), S(270, 203), S(267, 223), S(252, 220), S(248, 219), S(223, 245), S(212, 230), S(177, 239), // + S(116, 213), S(232, 159), S(249, 180), S(249, 191), S(238, 195), S(228, 205), S(210, 189), S(179, 207), // + S(166, 208), S(189, 221), S(252, 187), S(267, 179), S(257, 188), S(239, 206), S(225, 204), S(204, 222), // }; inline const std::array QUEEN_PSQT = { - S(459, 411), S(548, 338), S(521, 379), S(436, 486), S(453, 448), S(445, 441), S(484, 371), S(373, 456), // - S(483, 442), S(434, 538), S(427, 554), S(282, 620), S(290, 612), S(354, 571), S(386, 485), S(396, 471), // - S(416, 501), S(516, 484), S(437, 554), S(403, 572), S(355, 578), S(372, 531), S(438, 440), S(413, 413), // - S(495, 401), S(491, 469), S(452, 507), S(422, 561), S(415, 561), S(412, 497), S(464, 404), S(455, 376), // - S(479, 401), S(489, 420), S(462, 468), S(430, 514), S(435, 507), S(431, 470), S(445, 400), S(458, 348), // - S(469, 320), S(501, 353), S(499, 422), S(460, 404), S(459, 394), S(466, 415), S(469, 356), S(454, 331), // - S(449, 196), S(494, 157), S(490, 245), S(498, 295), S(482, 322), S(482, 287), S(450, 337), S(451, 322), // - S(408, 232), S(453, 40), S(456, 71), S(484, 158), S(489, 240), S(491, 185), S(481, 214), S(435, 265), // + S(499, 367), S(550, 336), S(505, 391), S(444, 467), S(450, 437), S(458, 420), S(494, 354), S(421, 419), // + S(487, 427), S(463, 501), S(448, 525), S(297, 608), S(304, 596), S(378, 550), S(414, 461), S(420, 444), // + S(437, 475), S(515, 460), S(449, 535), S(412, 551), S(381, 550), S(397, 512), S(452, 429), S(439, 397), // + S(505, 379), S(514, 436), S(465, 490), S(451, 526), S(443, 527), S(434, 473), S(477, 397), S(460, 377), // + S(499, 369), S(507, 398), S(480, 449), S(445, 496), S(445, 494), S(445, 456), S(454, 401), S(470, 336), // + S(479, 304), S(516, 337), S(514, 396), S(475, 396), S(473, 391), S(475, 407), S(482, 345), S(459, 332), // + S(457, 188), S(493, 168), S(498, 240), S(510, 281), S(496, 312), S(493, 282), S(460, 328), S(461, 320), // + S(424, 211), S(458, 54), S(481, 64), S(503, 155), S(505, 222), S(501, 184), S(489, 217), S(447, 271), // }; inline const std::array KING_PSQT = { - S(-420, -241), S(14, 89), S(163, 8), S(-93, -5), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // - S(164, -105), S(231, 40), S(189, 49), S(109, -18), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // - S(78, 39), S(251, 56), S(231, 44), S(86, 15), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // - S(-187, 60), S(155, 37), S(59, 39), S(14, 31), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // - S(-212, 35), S(82, 11), S(84, -1), S(-40, 40), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // - S(-95, 19), S(156, -15), S(106, -6), S(41, 11), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // - S(9, -17), S(132, -15), S(81, -16), S(-2, 6), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // - S(-126, -33), S(-9, -7), S(-87, -11), S(-97, -50), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(-419, -256), S(56, 95), S(118, 30), S(-189, 41), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(123, -93), S(233, 71), S(177, 59), S(83, 0), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(39, 45), S(271, 49), S(240, 34), S(100, 4), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(-153, 47), S(182, 27), S(83, 26), S(-1, 33), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(-204, 31), S(95, 6), S(84, -5), S(-54, 44), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(-93, 16), S(169, -18), S(119, -10), S(42, 15), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(5, -15), S(136, -11), S(83, -13), S(4, 10), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // + S(-132, -37), S(-13, -6), S(-86, -14), S(-110, -42), S(0, 0), S(0, 0), S(0, 0), S(0, 0), // }; inline const std::array, 4> KING_SHELTER = {{ - {{ S(-57, 29), S(5, -32), S(55, -44), S(30, -25), S(34, -25), S(53, -44), S(10, -41), }}, - {{ S(-63, 30), S(51, -20), S(65, -44), S(11, 3), S(14, -10), S(68, -54), S(49, -30), }}, - {{ S(-49, 25), S(54, -15), S(-8, -28), S(-6, -5), S(-5, -12), S(-11, -37), S(53, -19), }}, - {{ S(-45, 13), S(21, 31), S(11, 7), S(8, 11), S(15, 5), S(20, 0), S(21, 6), }}, + {{ S(-62, 31), S(2, -37), S(49, -42), S(28, -22), S(32, -24), S(52, -45), S(7, -45), }}, + {{ S(-64, 30), S(56, -24), S(66, -48), S(13, 0), S(14, -10), S(68, -60), S(56, -37), }}, + {{ S(-52, 27), S(57, -17), S(-9, -31), S(-11, -6), S(-9, -13), S(-7, -39), S(59, -24), }}, + {{ S(-47, 12), S(16, 27), S(8, 9), S(3, 12), S(12, 4), S(17, -2), S(15, 9), }}, }}; inline const std::array BLOCKED_SHELTER_STORM = { - S(0, 0), S(0, 0), S(-11, -85), S(40, -23), S(18, -14), S(-9, -9), S(16, 18), + S(0, 0), S(0, 0), S(-2, -90), S(45, -24), S(18, -13), S(-12, -4), S(-2, 31), }; inline const std::array, 4> SHELTER_STORM = {{ - {{ S(-25, -6), S(8, -9), S(16, -12), S(6, 1), S(13, 8), S(7, -6), S(7, -8), }}, - {{ S(-34, 5), S(-13, -10), S(11, -8), S(-6, 26), S(4, 19), S(11, -10), S(-13, -14), }}, - {{ S(4, -9), S(28, -37), S(15, -12), S(2, 4), S(8, 8), S(17, -11), S(24, -37), }}, - {{ S(-3, 16), S(14, 11), S(35, 3), S(8, -5), S(6, -4), S(34, 7), S(27, 6), }}, + {{ S(-20, -7), S(6, -7), S(12, -8), S(4, 7), S(11, 15), S(8, -4), S(7, -7), }}, + {{ S(-39, 15), S(-19, 1), S(8, -2), S(-7, 35), S(1, 30), S(8, -3), S(-20, -1), }}, + {{ S(8, -6), S(25, -30), S(18, -11), S(4, 7), S(6, 12), S(19, -7), S(23, -31), }}, + {{ S(-0, 19), S(22, 10), S(33, 7), S(6, 1), S(5, -1), S(32, 11), S(26, 13), }}, }}; -// Epoch duration: 5.20419s +// Epoch duration: 9.05449s // clang-format on } // namespace Clockwork diff --git a/src/evaltune_main.cpp b/src/evaltune_main.cpp index 2771e014..5fc62be0 100644 --- a/src/evaltune_main.cpp +++ b/src/evaltune_main.cpp @@ -37,8 +37,9 @@ 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/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", }; const u32 thread_count = std::max(1, std::thread::hardware_concurrency() / 2);