From cb32e6b00cd1f30137cfcbb574620e3def178b86 Mon Sep 17 00:00:00 2001 From: Dannyj1 <73849717+Dannyj1@users.noreply.github.com> Date: Fri, 10 Feb 2023 13:31:43 +0100 Subject: [PATCH 1/7] Attacks near king eval rework Bench: 10176451 --- src/features.cpp | 18 ++++---- src/features.h | 4 ++ src/search.cpp | 111 ++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 113 insertions(+), 20 deletions(-) diff --git a/src/features.cpp b/src/features.cpp index 2d5e7f86..d9eda043 100644 --- a/src/features.cpp +++ b/src/features.cpp @@ -21,9 +21,9 @@ #include namespace Zagreus { - int evalValues[72] = { 97, 105, 354, 344, 361, 352, 530, 531, 1010, 1005, 6, 6, 3, -1, 5, 5, 2, 6, 0, 12, -50, 0, -25, 0, -29, -6, -16, -5, -4, -1, -2, 3, -3, 2, -8, -5, 6, 8, 16, 1, 12, 3, 0, 3, 7, 7, 20, 20, 15, 15, 6, 3, 5, 5, 7, -1, -27, -26, 23, 6, -4, 0, -1, 0, -20, -20, 2, -6, 3, 3, 25, -2, }; + int evalValues[74] = { 97, 105, 354, 344, 361, 352, 530, 531, 1010, 1005, 6, 6, 3, -1, 5, 5, 2, 6, 0, 12, -50, 0, -25, 0, -29, -6, -16, -5, -4, -1, -2, 3, -3, 2, -8, -5, 6, 8, 16, 1, 12, 3, 0, 3, 7, 7, 20, 20, 15, 15, 6, 3, 5, 5, 7, -1, -27, -26, 23, 6, -4, 0, -1, 0, -20, -20, 2, -6, 3, 3, 25, -2, -1, -1 }; - int baseEvalValues[72] = { + int baseEvalValues[74] = { 100, // MIDGAME_PAWN_MATERIAL 100, // ENDGAME_PAWN_MATERIAL 350, // MIDGAME_KNIGHT_MATERIAL @@ -54,12 +54,12 @@ namespace Zagreus { 0, // ENDGAME_QUEENSIDE_CASTLING_PREVENTED -10, // MIDGAME_KINGSIDE_CASTLING_PREVENTED 0, // ENDGAME_KINGSIDE_CASTLING_PREVENTED - 3, // MIDGAME_BISHOP_ATTACK_NEAR_KING - 3, // ENDGAME_BISHOP_ATTACK_NEAR_KING - 5, // MIDGAME_ROOK_ATTACK_NEAR_KING - 5, // ENDGAME_ROOK_ATTACK_NEAR_KING - 10, // MIDGAME_QUEEN_ATTACK_NEAR_KING - 10, // ENDGAME_QUEEN_ATTACK_NEAR_KING + -3, // MIDGAME_BISHOP_ATTACK_NEAR_KING + -3, // ENDGAME_BISHOP_ATTACK_NEAR_KING + -5, // MIDGAME_ROOK_ATTACK_NEAR_KING + -5, // ENDGAME_ROOK_ATTACK_NEAR_KING + -10, // MIDGAME_QUEEN_ATTACK_NEAR_KING + -10, // ENDGAME_QUEEN_ATTACK_NEAR_KING 10, // MIDGAME_PAWN_CONNECTIVITY 10, // ENDGAME_PAWN_CONNECTIVITY 7, // MIDGAME_KNIGHT_CONNECTIVITY @@ -96,6 +96,8 @@ namespace Zagreus { 3, // ENDGAME_PAWN_SEMI_OPEN_FILE 20, // MIDGAME_PAWN_SHIELD 0, // ENDGAME_PAWN_SHIELD + -1, // MIDGAME_KNIGHT_ATTACK_NEAR_KING + -1, // ENDGAME_KNIGHT_ATTACK_NEAR_KING }; void printEvalValues() { diff --git a/src/features.h b/src/features.h index 46365662..20abb3b1 100644 --- a/src/features.h +++ b/src/features.h @@ -94,6 +94,8 @@ namespace Zagreus { ENDGAME_PAWN_SEMI_OPEN_FILE, MIDGAME_PAWN_SHIELD, ENDGAME_PAWN_SHIELD, + MIDGAME_KNIGHT_ATTACK_NEAR_KING, + ENDGAME_KNIGHT_ATTACK_NEAR_KING }; static std::vector evalFeatureNames = { @@ -169,6 +171,8 @@ namespace Zagreus { "ENDGAME_PAWN_SEMI_OPEN_FILE", "MIDGAME_PAWN_SHIELD", "ENDGAME_PAWN_SHIELD", + "MIDGAME_KNIGHT_ATTACK_NEAR_KING", + "ENDGAME_KNIGHT_ATTACK_NEAR_KING", }; void printEvalValues(); diff --git a/src/search.cpp b/src/search.cpp index 79fc136f..f6718c0a 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -725,12 +725,31 @@ namespace Zagreus { } } - evalContext.whiteMidgameScore += popcnt(evalContext.blackBishopAttacks & kingAttacks) * getEvalValue(MIDGAME_BISHOP_ATTACK_NEAR_KING); - evalContext.whiteEndgameScore += popcnt(evalContext.blackBishopAttacks & kingAttacks) * getEvalValue(ENDGAME_BISHOP_ATTACK_NEAR_KING); - evalContext.whiteMidgameScore += popcnt(evalContext.blackRookAttacks & kingAttacks) * getEvalValue(MIDGAME_ROOK_ATTACK_NEAR_KING); - evalContext.whiteEndgameScore += popcnt(evalContext.blackRookAttacks & kingAttacks) * getEvalValue(ENDGAME_ROOK_ATTACK_NEAR_KING); - evalContext.whiteMidgameScore += popcnt(evalContext.blackQueenAttacks & kingAttacks) * getEvalValue(MIDGAME_QUEEN_ATTACK_NEAR_KING); - evalContext.whiteEndgameScore += popcnt(evalContext.blackQueenAttacks & kingAttacks) * getEvalValue(ENDGAME_QUEEN_ATTACK_NEAR_KING); + while (kingAttacks) { + int8_t index = bitscanForward(kingAttacks); + PieceType pieceOnSquare = bitboard.getPieceOnSquare(index); + + switch (pieceOnSquare) { + case PieceType::WHITE_KNIGHT: + evalContext.whiteMidgameScore += getEvalValue(MIDGAME_KNIGHT_ATTACK_NEAR_KING); + evalContext.whiteEndgameScore += getEvalValue(ENDGAME_KNIGHT_ATTACK_NEAR_KING); + break; + case PieceType::WHITE_BISHOP: + evalContext.whiteMidgameScore += getEvalValue(MIDGAME_BISHOP_ATTACK_NEAR_KING); + evalContext.whiteEndgameScore += getEvalValue(ENDGAME_BISHOP_ATTACK_NEAR_KING); + break; + case PieceType::WHITE_ROOK: + evalContext.whiteMidgameScore += getEvalValue(MIDGAME_ROOK_ATTACK_NEAR_KING); + evalContext.whiteEndgameScore += getEvalValue(ENDGAME_ROOK_ATTACK_NEAR_KING); + break; + case PieceType::WHITE_QUEEN: + evalContext.whiteMidgameScore += getEvalValue(MIDGAME_QUEEN_ATTACK_NEAR_KING); + evalContext.whiteEndgameScore += getEvalValue(ENDGAME_QUEEN_ATTACK_NEAR_KING); + break; + } + + kingAttacks &= ~(1ULL << index); + } } uint64_t blackQueenCastlingAttackPattern = 0x7000000000000000; @@ -783,12 +802,31 @@ namespace Zagreus { } } - evalContext.blackMidgameScore += popcnt(evalContext.whiteBishopAttacks & kingAttacks) * getEvalValue(MIDGAME_BISHOP_ATTACK_NEAR_KING); - evalContext.blackEndgameScore += popcnt(evalContext.whiteBishopAttacks & kingAttacks) * getEvalValue(ENDGAME_BISHOP_ATTACK_NEAR_KING); - evalContext.blackMidgameScore += popcnt(evalContext.whiteRookAttacks & kingAttacks) * getEvalValue(MIDGAME_ROOK_ATTACK_NEAR_KING); - evalContext.blackEndgameScore += popcnt(evalContext.whiteRookAttacks & kingAttacks) * getEvalValue(ENDGAME_ROOK_ATTACK_NEAR_KING); - evalContext.blackMidgameScore += popcnt(evalContext.whiteQueenAttacks & kingAttacks) * getEvalValue(MIDGAME_QUEEN_ATTACK_NEAR_KING); - evalContext.blackEndgameScore += popcnt(evalContext.whiteQueenAttacks & kingAttacks) * getEvalValue(ENDGAME_QUEEN_ATTACK_NEAR_KING); + while (kingAttacks) { + int8_t index = bitscanForward(kingAttacks); + PieceType pieceOnSquare = bitboard.getPieceOnSquare(index); + + switch (pieceOnSquare) { + case PieceType::BLACK_KNIGHT: + evalContext.blackMidgameScore += getEvalValue(MIDGAME_KNIGHT_ATTACK_NEAR_KING); + evalContext.blackEndgameScore += getEvalValue(ENDGAME_KNIGHT_ATTACK_NEAR_KING); + break; + case PieceType::BLACK_BISHOP: + evalContext.blackMidgameScore += getEvalValue(MIDGAME_BISHOP_ATTACK_NEAR_KING); + evalContext.blackEndgameScore += getEvalValue(ENDGAME_BISHOP_ATTACK_NEAR_KING); + break; + case PieceType::BLACK_ROOK: + evalContext.blackMidgameScore += getEvalValue(MIDGAME_ROOK_ATTACK_NEAR_KING); + evalContext.blackEndgameScore += getEvalValue(ENDGAME_ROOK_ATTACK_NEAR_KING); + break; + case PieceType::BLACK_QUEEN: + evalContext.blackMidgameScore += getEvalValue(MIDGAME_QUEEN_ATTACK_NEAR_KING); + evalContext.blackEndgameScore += getEvalValue(ENDGAME_QUEEN_ATTACK_NEAR_KING); + break; + } + + kingAttacks &= ~(1ULL << index); + } } void getWhiteConnectivityScore(EvalContext &evalContext, Bitboard &bitboard) { @@ -1066,6 +1104,7 @@ namespace Zagreus { uint64_t blackRookAttacks = 0; uint64_t blackQueenAttacks = 0; uint64_t attacksFrom[64] = { 0ULL }; + uint64_t attacksTo[64] = { 0ULL }; while (whiteKnightBB) { uint64_t index = bitscanForward(whiteKnightBB); @@ -1074,6 +1113,12 @@ namespace Zagreus { whiteKnightAttacks |= attacks; attacksFrom[index] = attacks; + while (attacks) { + uint64_t attackIndex = bitscanForward(attacks); + attacksTo[attackIndex] |= (1ULL << index); + attacks &= ~(1ULL << attackIndex); + } + whiteKnightBB &= ~(1ULL << index); } @@ -1084,6 +1129,12 @@ namespace Zagreus { blackKnightAttacks |= attacks; attacksFrom[index] = attacks; + while (attacks) { + uint64_t attackIndex = bitscanForward(attacks); + attacksTo[attackIndex] |= (1ULL << index); + attacks &= ~(1ULL << attackIndex); + } + blackKnightBB &= ~(1ULL << index); } @@ -1094,6 +1145,12 @@ namespace Zagreus { whiteBishopAttacks |= attacks; attacksFrom[index] = attacks; + while (attacks) { + uint64_t attackIndex = bitscanForward(attacks); + attacksTo[attackIndex] |= (1ULL << index); + attacks &= ~(1ULL << attackIndex); + } + whiteBishopBB &= ~(1ULL << index); } @@ -1104,6 +1161,12 @@ namespace Zagreus { whiteRookAttacks |= attacks; attacksFrom[index] = attacks; + while (attacks) { + uint64_t attackIndex = bitscanForward(attacks); + attacksTo[attackIndex] |= (1ULL << index); + attacks &= ~(1ULL << attackIndex); + } + whiteRookBB &= ~(1ULL << index); } @@ -1114,6 +1177,12 @@ namespace Zagreus { whiteQueenAttacks |= attacks; attacksFrom[index] = attacks; + while (attacks) { + uint64_t attackIndex = bitscanForward(attacks); + attacksTo[attackIndex] |= (1ULL << index); + attacks &= ~(1ULL << attackIndex); + } + whiteQueenBB &= ~(1ULL << index); } @@ -1124,6 +1193,12 @@ namespace Zagreus { blackBishopAttacks |= attacks; attacksFrom[index] = attacks; + while (attacks) { + uint64_t attackIndex = bitscanForward(attacks); + attacksTo[attackIndex] |= (1ULL << index); + attacks &= ~(1ULL << attackIndex); + } + blackBishopBB &= ~(1ULL << index); } @@ -1134,6 +1209,12 @@ namespace Zagreus { blackRookAttacks |= attacks; attacksFrom[index] = attacks; + while (attacks) { + uint64_t attackIndex = bitscanForward(attacks); + attacksTo[attackIndex] |= (1ULL << index); + attacks &= ~(1ULL << attackIndex); + } + blackRookBB &= ~(1ULL << index); } @@ -1144,6 +1225,12 @@ namespace Zagreus { blackQueenAttacks |= attacks; attacksFrom[index] = attacks; + while (attacks) { + uint64_t attackIndex = bitscanForward(attacks); + attacksTo[attackIndex] |= (1ULL << index); + attacks &= ~(1ULL << attackIndex); + } + blackQueenBB &= ~(1ULL << index); } From 12da38cc044992861b0e8df713f75d2e10462274 Mon Sep 17 00:00:00 2001 From: Dannyj1 <73849717+Dannyj1@users.noreply.github.com> Date: Fri, 10 Feb 2023 13:43:16 +0100 Subject: [PATCH 2/7] Tuned values Bench: 10236115 --- src/features.cpp | 2 +- src/pst.cpp | 24 ++++++++++++------------ src/tuner.cpp | 3 +-- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/features.cpp b/src/features.cpp index d9eda043..5b976416 100644 --- a/src/features.cpp +++ b/src/features.cpp @@ -21,7 +21,7 @@ #include namespace Zagreus { - int evalValues[74] = { 97, 105, 354, 344, 361, 352, 530, 531, 1010, 1005, 6, 6, 3, -1, 5, 5, 2, 6, 0, 12, -50, 0, -25, 0, -29, -6, -16, -5, -4, -1, -2, 3, -3, 2, -8, -5, 6, 8, 16, 1, 12, 3, 0, 3, 7, 7, 20, 20, 15, 15, 6, 3, 5, 5, 7, -1, -27, -26, 23, 6, -4, 0, -1, 0, -20, -20, 2, -6, 3, 3, 25, -2, -1, -1 }; + int evalValues[74] = { 99, 99, 349, 349, 350, 350, 525, 525, 999, 999, 1, 1, 6, 1, 8, 3, 2, 6, 3, 7, -50, 0, -25, 0, -25, 0, -5, 0, -10, 0, -3, -2, -4, -4, -9, -9, 9, 9, 6, 6, 7, 7, 3, 3, 0, 0, 20, 20, 15, 15, 10, 10, 4, 4, 5, 5, -24, -24, 10, 0, -9, -9, 9, 9, -20, -20, -10, -10, 3, 3, 19, 0, 0, 0, }; int baseEvalValues[74] = { 100, // MIDGAME_PAWN_MATERIAL diff --git a/src/pst.cpp b/src/pst.cpp index 4047cf32..a000ba02 100644 --- a/src/pst.cpp +++ b/src/pst.cpp @@ -21,23 +21,23 @@ #include namespace Zagreus { - int midgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 96, 130, 63, 93, 70, 123, 39, -9, -6, 4, 24, 30, 62, 59, 27, -15, -17, 9, 1, 17, 19, 15, 23, -20, -35, -10, -10, 14, 25, 10, 11, -29, -21, 0, -10, 0, -3, 2, 20, -12, -26, 4, -10, -11, -14, 6, 37, -19, 0, 0, 0, 0, 0, 0, 0, 0 }; - int endgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 180, 175, 161, 132, 147, 132, 165, 189, 100, 100, 79, 65, 53, 53, 87, 92, 30, 23, 12, 1, 0, 5, 22, 26, 6, 7, -9, -9, -12, -9, 4, 4, 5, 2, -11, 6, 3, -4, -1, -6, 8, 5, 7, 14, 14, 0, 0, -4, 0, 0, 0, 0, 0, 0, 0, 0 }; + int midgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 98, 134, 61, 94, 68, 126, 34, -10, -6, 7, 26, 31, 65, 56, 25, -19, -13, 13, 6, 21, 23, 12, 16, -23, -26, -1, -5, 12, 16, 5, 9, -25, -25, -3, -4, -9, 2, 3, 32, -12, -34, 0, -20, -22, -15, 23, 38, -22, 0, 0, 0, 0, 0, 0, 0, 0 }; + int endgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 178, 173, 158, 133, 147, 132, 165, 187, 93, 100, 85, 67, 56, 53, 82, 84, 32, 24, 13, 5, -1, 4, 16, 16, 13, 9, -3, -6, -7, -7, 2, -1, 4, 7, -6, 1, 0, -4, -1, -7, 13, 8, 7, 10, 13, 0, 2, -7, 0, 0, 0, 0, 0, 0, 0, 0 }; - int midgameKnightTable[64] = { -164, -88, -35, -50, 61, -97, -15, -109, -74, -38, 68, 39, 28, 63, 9, -18, -48, 57, 34, 62, 84, 128, 73, 43, -7, 19, 21, 50, 32, 62, 21, 24, -16, 3, 17, 9, 24, 18, 19, -11, -26, -3, 21, 12, 22, 12, 22, -18, -27, -48, -9, 5, 4, 18, -15, -12, -103, -29, -55, -28, -12, -26, -21, -23 }; - int endgameKnightTable[64] = { -57, -36, -15, -30, -31, -27, -63, -101, -26, -10, -24, 0, -8, -23, -21, -50, -26, -22, 8, 8, -1, -9, -20, -40, -13, 4, 22, 18, 24, 11, 12, -17, -17, -4, 16, 28, 16, 14, 2, -16, -22, -6, -5, 16, 13, -7, -23, -22, -42, -19, -7, -2, 0, -18, -23, -43, -29, -52, -24, -16, -19, -15, -56, -63 }; + int midgameKnightTable[64] = { -166, -88, -33, -48, 61, -96, -14, -106, -72, -40, 72, 36, 23, 62, 7, -16, -46, 60, 37, 65, 84, 128, 73, 44, -8, 17, 19, 53, 37, 69, 18, 22, -12, 4, 16, 13, 28, 19, 21, -7, -22, -8, 12, 10, 19, 17, 25, -16, -28, -53, -11, -3, 0, 18, -14, -19, -105, -20, -57, -32, -17, -28, -18, -23 }; + int endgameKnightTable[64] = { -57, -37, -12, -27, -30, -26, -62, -98, -24, -7, -24, -1, -8, -24, -23, -51, -23, -19, 10, 9, 0, -9, -18, -40, -16, 3, 22, 22, 22, 11, 8, -17, -17, -5, 16, 25, 16, 17, 4, -17, -22, -2, 0, 15, 10, -2, -19, -22, -41, -20, -9, -4, -1, -19, -22, -43, -29, -50, -22, -14, -21, -18, -49, -64 }; - int midgameBishopTable[64] = { -29, 3, -79, -37, -25, -43, 2, -7, -29, 14, -16, -11, 30, 55, 19, -44, -9, 37, 46, 42, 34, 54, 34, 2, -4, 6, 18, 47, 32, 35, 1, 0, -3, 13, 5, 24, 26, 9, 15, 1, -4, 19, 13, 12, 6, 23, 22, 11, 4, 24, 16, 5, 7, 25, 40, 0, -31, -2, -14, -18, -6, -3, -37, -18 }; - int endgameBishopTable[64] = { -12, -19, -9, -6, -6, -7, -21, -23, -10, -5, 6, -9, -5, -15, -3, -15, 4, -8, 0, 0, -4, 5, -2, 5, 0, 8, 9, 9, 15, 9, 3, 1, -5, 1, 9, 17, 6, 9, 0, -9, -12, -3, 2, 9, 8, 0, -6, -12, -12, -14, -7, -3, 3, -8, -8, -25, -21, -13, -22, 0, -2, -15, -3, -16 }; + int midgameBishopTable[64] = { -28, 4, -81, -36, -24, -41, 7, -7, -25, 16, -17, -12, 30, 59, 18, -46, -15, 37, 43, 40, 35, 50, 37, -1, -3, 4, 19, 50, 37, 37, 7, -1, -5, 13, 13, 26, 34, 12, 10, 4, 0, 15, 15, 15, 14, 27, 18, 10, 4, 15, 16, 0, 7, 21, 33, 1, -32, -3, -13, -20, -12, -11, -38, -20 }; + int endgameBishopTable[64] = { -13, -20, -10, -7, -6, -8, -16, -23, -7, -3, 7, -11, -2, -12, -3, -13, 2, -7, 0, 0, -1, 6, 0, 4, -2, 8, 12, 9, 14, 10, 3, 2, -5, 3, 13, 19, 7, 10, -2, -8, -11, -2, 8, 10, 13, 3, -6, -14, -13, -17, -6, 0, 4, -8, -14, -26, -22, -8, -22, -4, -8, -15, -4, -16 }; - int midgameRookTable[64] = { 31, 42, 30, 51, 60, 10, 31, 41, 28, 29, 59, 58, 79, 67, 27, 41, -3, 21, 27, 35, 17, 45, 60, 18, -22, -10, 6, 26, 25, 33, -4, -18, -39, -25, -14, -5, 8, -7, 7, -26, -45, -26, -16, -19, 5, 0, -6, -34, -47, -15, -16, -11, 0, 12, -6, -70, -13, -11, 0, 8, 16, 6, -30, -25 }; - int endgameRookTable[64] = { 12, 12, 16, 14, 7, 12, 7, 4, 10, 8, 11, 7, -1, 2, 9, 2, 10, 8, 5, 4, 8, 0, -4, -3, 4, 5, 10, 0, 0, 0, 0, 6, 1, 8, 8, 0, -4, -6, -7, -9, -2, 0, -5, 0, -4, -11, -10, -15, -8, -5, 0, 0, -7, -7, -12, 0, -5, 1, 1, -2, -4, -13, 5, -18 }; + int midgameRookTable[64] = { 32, 42, 32, 51, 63, 9, 31, 43, 27, 32, 58, 62, 80, 67, 26, 44, -4, 19, 26, 36, 17, 45, 61, 16, -23, -10, 7, 26, 24, 35, -7, -19, -35, -25, -11, 0, 9, -6, 6, -22, -44, -24, -15, -16, 3, 0, -4, -32, -44, -15, -19, -8, 0, 11, -5, -70, -18, -12, 1, 17, 16, 7, -36, -25 }; + int endgameRookTable[64] = { 13, 10, 18, 15, 12, 12, 8, 5, 11, 13, 13, 11, -2, 3, 8, 3, 7, 7, 7, 5, 4, -2, -4, -2, 4, 3, 13, 1, 2, 1, 0, 2, 3, 5, 8, 4, -4, -5, -7, -10, -3, 0, -4, 0, -6, -11, -7, -15, -5, -5, 0, 2, -8, -8, -10, -2, -8, 2, 3, 0, -4, -12, 4, -19 }; - int midgameQueenTable[64] = { -26, 0, 28, 13, 58, 43, 41, 44, -22, -37, -4, 0, -16, 58, 25, 50, -8, -17, 12, 6, 30, 54, 44, 57, -19, -28, -18, -17, 0, 18, -5, 5, -15, -21, -13, -7, -9, -6, 3, 0, -17, 0, -10, -8, -4, -6, 11, 2, -29, -6, 7, 0, 4, 22, 0, 2, 0, -15, -9, 0, 0, -20, -32, -44 }; - int endgameQueenTable[64] = { -8, 25, 20, 29, 27, 17, 9, 18, -13, 20, 33, 42, 57, 26, 29, 0, -17, 7, 12, 50, 47, 31, 17, 12, 4, 20, 24, 42, 54, 38, 54, 36, -19, 27, 14, 47, 27, 34, 40, 21, -16, -26, 12, 2, 7, 12, 10, 4, -18, -20, -30, -18, -20, -20, -36, -27, -31, -26, -21, -44, 1, -28, -20, -37 }; + int midgameQueenTable[64] = { -27, 0, 28, 12, 59, 44, 42, 45, -23, -38, -4, 1, -15, 57, 28, 54, -12, -16, 7, 8, 28, 56, 47, 56, -26, -26, -15, -15, 0, 17, -1, 1, -8, -25, -8, -9, -1, -3, 3, -2, -13, 2, -10, -1, -4, 2, 14, 5, -34, -7, 11, 2, 8, 14, -2, 1, 0, -17, -8, 10, -14, -24, -30, -49 }; + int endgameQueenTable[64] = { -8, 22, 22, 27, 27, 19, 9, 20, -16, 20, 32, 41, 58, 25, 30, 0, -19, 6, 9, 49, 46, 35, 19, 8, 3, 22, 24, 45, 57, 40, 57, 36, -17, 28, 19, 47, 31, 34, 39, 23, -15, -26, 15, 6, 9, 17, 10, 5, -21, -22, -29, -15, -15, -23, -35, -31, -32, -27, -21, -42, -4, -31, -19, -40 }; - int midgameKingTable[64] = { -64, 22, 15, -14, -55, -33, 2, 13, 29, 0, -20, -6, -8, -3, -37, -28, -7, 25, 3, -14, -19, 5, 21, -22, -15, -19, -10, -27, -29, -24, -13, -35, -49, -3, -27, -39, -46, -42, -33, -53, -12, -15, -24, -44, -42, -29, -14, -26, 1, 10, -15, -64, -42, -16, 13, 10, -4, 31, 1, -32, -8, -24, 23, 14 }; - int endgameKingTable[64] = { -74, -35, -15, -16, -11, 15, 5, -18, -12, 17, 15, 17, 16, 37, 22, 10, 10, 19, 22, 14, 21, 44, 41, 14, -8, 20, 23, 27, 24, 33, 26, 6, -17, -4, 17, 25, 28, 26, 7, -11, -19, -3, 11, 25, 24, 18, 7, -10, -25, -10, 1, 14, 15, 8, 0, -15, -52, -39, -27, -6, -36, -10, -30, -44 }; + int midgameKingTable[64] = { -64, 22, 15, -15, -56, -34, 1, 12, 28, -1, -19, -6, -8, -4, -38, -29, -8, 23, 2, -15, -19, 6, 22, -21, -17, -19, -11, -26, -29, -24, -14, -36, -49, 0, -26, -38, -46, -44, -33, -51, -13, -13, -21, -45, -44, -30, -15, -27, 1, 6, -8, -64, -43, -15, 8, 7, -14, 36, 12, -53, 7, -28, 23, 13 }; + int endgameKingTable[64] = { -73, -35, -18, -18, -11, 14, 3, -17, -12, 17, 14, 17, 16, 38, 23, 10, 10, 16, 23, 15, 20, 45, 44, 12, -8, 22, 24, 27, 26, 33, 25, 2, -18, -3, 21, 24, 26, 22, 8, -11, -19, -2, 11, 21, 22, 15, 6, -9, -26, -11, 3, 12, 13, 4, -5, -17, -52, -33, -20, -10, -28, -14, -24, -43 }; /* int midgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/src/tuner.cpp b/src/tuner.cpp index 4b0dbb27..2b4519fe 100644 --- a/src/tuner.cpp +++ b/src/tuner.cpp @@ -242,8 +242,7 @@ namespace Zagreus { exportNewEvalValues(bestParameters); std::cout << "Finding the optimal K value..." << std::endl; -// K = findOptimalK(positions, maxEndTime, engine); - K = 1.00999; + K = findOptimalK(positions, maxEndTime, engine); std::cout << "Optimal K value: " << K << std::endl; std::cout << "Starting tuning..." << std::endl; From ac29d0ce58a469a586c4f8aa25f1e919351a404c Mon Sep 17 00:00:00 2001 From: Dannyj1 <73849717+Dannyj1@users.noreply.github.com> Date: Fri, 10 Feb 2023 14:43:07 +0100 Subject: [PATCH 3/7] Actually use the attacks to the king, not whatever I did Bench: 11068349 --- src/pst.cpp | 139 ++++++++++++++++++++++++++++++++++++++++++++----- src/search.cpp | 109 +++++++++++++++++++++----------------- src/tuner.cpp | 8 +-- src/types.h | 9 +--- 4 files changed, 193 insertions(+), 72 deletions(-) diff --git a/src/pst.cpp b/src/pst.cpp index a000ba02..6eaaef70 100644 --- a/src/pst.cpp +++ b/src/pst.cpp @@ -21,23 +21,138 @@ #include namespace Zagreus { - int midgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 98, 134, 61, 94, 68, 126, 34, -10, -6, 7, 26, 31, 65, 56, 25, -19, -13, 13, 6, 21, 23, 12, 16, -23, -26, -1, -5, 12, 16, 5, 9, -25, -25, -3, -4, -9, 2, 3, 32, -12, -34, 0, -20, -22, -15, 23, 38, -22, 0, 0, 0, 0, 0, 0, 0, 0 }; - int endgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 178, 173, 158, 133, 147, 132, 165, 187, 93, 100, 85, 67, 56, 53, 82, 84, 32, 24, 13, 5, -1, 4, 16, 16, 13, 9, -3, -6, -7, -7, 2, -1, 4, 7, -6, 1, 0, -4, -1, -7, 13, 8, 7, 10, 13, 0, 2, -7, 0, 0, 0, 0, 0, 0, 0, 0 }; + int midgamePawnTable[64] = { + 0, 0, 0, 0, 0, 0, 0, 0, + 98, 134, 61, 95, 68, 126, 34, -11, + -6, 7, 26, 31, 65, 56, 25, -20, + -14, 13, 6, 21, 23, 12, 17, -23, + -27, -2, -5, 12, 17, 6, 10, -25, + -26, -4, -4, -10, 3, 3, 33, -12, + -35, -1, -20, -23, -15, 24, 38, -22, + 0, 0, 0, 0, 0, 0, 0, 0, + }; - int midgameKnightTable[64] = { -166, -88, -33, -48, 61, -96, -14, -106, -72, -40, 72, 36, 23, 62, 7, -16, -46, 60, 37, 65, 84, 128, 73, 44, -8, 17, 19, 53, 37, 69, 18, 22, -12, 4, 16, 13, 28, 19, 21, -7, -22, -8, 12, 10, 19, 17, 25, -16, -28, -53, -11, -3, 0, 18, -14, -19, -105, -20, -57, -32, -17, -28, -18, -23 }; - int endgameKnightTable[64] = { -57, -37, -12, -27, -30, -26, -62, -98, -24, -7, -24, -1, -8, -24, -23, -51, -23, -19, 10, 9, 0, -9, -18, -40, -16, 3, 22, 22, 22, 11, 8, -17, -17, -5, 16, 25, 16, 17, 4, -17, -22, -2, 0, 15, 10, -2, -19, -22, -41, -20, -9, -4, -1, -19, -22, -43, -29, -50, -22, -14, -21, -18, -49, -64 }; + int endgamePawnTable[64] = { + 0, 0, 0, 0, 0, 0, 0, 0, + 178, 173, 158, 134, 147, 132, 165, 187, + 94, 100, 85, 67, 56, 53, 82, 84, + 32, 24, 13, 5, -2, 4, 17, 17, + 13, 9, -3, -7, -7, -8, 3, -1, + 4, 7, -6, 1, 0, -5, -1, -8, + 13, 8, 8, 10, 13, 0, 2, -7, + 0, 0, 0, 0, 0, 0, 0, 0, + }; + + int midgameKnightTable[64] = { + -167, -89, -34, -49, 61, -97, -15, -107, + -73, -41, 72, 36, 23, 62, 7, -17, + -47, 60, 37, 65, 84, 129, 73, 44, + -9, 17, 19, 53, 37, 69, 18, 22, + -13, 4, 16, 13, 28, 19, 21, -8, + -23, -9, 12, 10, 19, 17, 25, -16, + -29, -53, -12, -3, -1, 18, -14, -19, + -105, -21, -58, -33, -17, -28, -19, -23, + }; - int midgameBishopTable[64] = { -28, 4, -81, -36, -24, -41, 7, -7, -25, 16, -17, -12, 30, 59, 18, -46, -15, 37, 43, 40, 35, 50, 37, -1, -3, 4, 19, 50, 37, 37, 7, -1, -5, 13, 13, 26, 34, 12, 10, 4, 0, 15, 15, 15, 14, 27, 18, 10, 4, 15, 16, 0, 7, 21, 33, 1, -32, -3, -13, -20, -12, -11, -38, -20 }; - int endgameBishopTable[64] = { -13, -20, -10, -7, -6, -8, -16, -23, -7, -3, 7, -11, -2, -12, -3, -13, 2, -7, 0, 0, -1, 6, 0, 4, -2, 8, 12, 9, 14, 10, 3, 2, -5, 3, 13, 19, 7, 10, -2, -8, -11, -2, 8, 10, 13, 3, -6, -14, -13, -17, -6, 0, 4, -8, -14, -26, -22, -8, -22, -4, -8, -15, -4, -16 }; + int endgameKnightTable[64] = { + -58, -38, -13, -28, -31, -27, -63, -99, + -25, -8, -25, -2, -9, -25, -24, -52, + -24, -20, 10, 9, -1, -9, -19, -41, + -17, 3, 22, 22, 22, 11, 8, -18, + -18, -6, 16, 25, 16, 17, 4, -18, + -23, -3, -1, 15, 10, -3, -20, -22, + -42, -20, -10, -5, -2, -20, -23, -44, + -29, -51, -23, -15, -22, -18, -50, -64, + }; - int midgameRookTable[64] = { 32, 42, 32, 51, 63, 9, 31, 43, 27, 32, 58, 62, 80, 67, 26, 44, -4, 19, 26, 36, 17, 45, 61, 16, -23, -10, 7, 26, 24, 35, -7, -19, -35, -25, -11, 0, 9, -6, 6, -22, -44, -24, -15, -16, 3, 0, -4, -32, -44, -15, -19, -8, 0, 11, -5, -70, -18, -12, 1, 17, 16, 7, -36, -25 }; - int endgameRookTable[64] = { 13, 10, 18, 15, 12, 12, 8, 5, 11, 13, 13, 11, -2, 3, 8, 3, 7, 7, 7, 5, 4, -2, -4, -2, 4, 3, 13, 1, 2, 1, 0, 2, 3, 5, 8, 4, -4, -5, -7, -10, -3, 0, -4, 0, -6, -11, -7, -15, -5, -5, 0, 2, -8, -8, -10, -2, -8, 2, 3, 0, -4, -12, 4, -19 }; + int midgameBishopTable[64] = { + -29, 4, -82, -37, -25, -42, 7, -8, + -26, 16, -18, -13, 30, 59, 18, -47, + -16, 37, 43, 40, 35, 50, 37, -2, + -4, 5, 19, 50, 37, 37, 7, -2, + -6, 13, 13, 26, 34, 12, 10, 4, + 0, 15, 15, 15, 14, 27, 18, 10, + 4, 15, 16, 0, 7, 21, 33, 1, + -33, -3, -14, -21, -13, -12, -39, -21, + }; - int midgameQueenTable[64] = { -27, 0, 28, 12, 59, 44, 42, 45, -23, -38, -4, 1, -15, 57, 28, 54, -12, -16, 7, 8, 28, 56, 47, 56, -26, -26, -15, -15, 0, 17, -1, 1, -8, -25, -8, -9, -1, -3, 3, -2, -13, 2, -10, -1, -4, 2, 14, 5, -34, -7, 11, 2, 8, 14, -2, 1, 0, -17, -8, 10, -14, -24, -30, -49 }; - int endgameQueenTable[64] = { -8, 22, 22, 27, 27, 19, 9, 20, -16, 20, 32, 41, 58, 25, 30, 0, -19, 6, 9, 49, 46, 35, 19, 8, 3, 22, 24, 45, 57, 40, 57, 36, -17, 28, 19, 47, 31, 34, 39, 23, -15, -26, 15, 6, 9, 17, 10, 5, -21, -22, -29, -15, -15, -23, -35, -31, -32, -27, -21, -42, -4, -31, -19, -40 }; + int endgameBishopTable[64] = { + -14, -21, -11, -8, -7, -9, -17, -24, + -8, -4, 7, -12, -3, -13, -4, -14, + 2, -8, 0, -1, -2, 6, 0, 4, + -3, 9, 12, 9, 14, 10, 3, 2, + -6, 3, 13, 19, 7, 10, -3, -9, + -12, -3, 8, 10, 13, 3, -7, -15, + -14, -18, -7, -1, 4, -9, -15, -27, + -23, -9, -23, -5, -9, -16, -5, -17, + }; - int midgameKingTable[64] = { -64, 22, 15, -15, -56, -34, 1, 12, 28, -1, -19, -6, -8, -4, -38, -29, -8, 23, 2, -15, -19, 6, 22, -21, -17, -19, -11, -26, -29, -24, -14, -36, -49, 0, -26, -38, -46, -44, -33, -51, -13, -13, -21, -45, -44, -30, -15, -27, 1, 6, -8, -64, -43, -15, 8, 7, -14, 36, 12, -53, 7, -28, 23, 13 }; - int endgameKingTable[64] = { -73, -35, -18, -18, -11, 14, 3, -17, -12, 17, 14, 17, 16, 38, 23, 10, 10, 16, 23, 15, 20, 45, 44, 12, -8, 22, 24, 27, 26, 33, 25, 2, -18, -3, 21, 24, 26, 22, 8, -11, -19, -2, 11, 21, 22, 15, 6, -9, -26, -11, 3, 12, 13, 4, -5, -17, -52, -33, -20, -10, -28, -14, -24, -43 }; + int midgameRookTable[64] = { + 32, 42, 32, 51, 63, 9, 31, 43, + 27, 32, 58, 62, 80, 67, 26, 44, + -5, 19, 26, 36, 17, 45, 61, 16, + -24, -11, 7, 26, 24, 35, -8, -20, + -36, -26, -12, -1, 9, -7, 6, -23, + -45, -25, -16, -17, 3, 0, -5, -33, + -44, -16, -20, -9, -1, 11, -6, -71, + -19, -13, 1, 17, 16, 7, -37, -26, + }; + + int endgameRookTable[64] = { + 13, 10, 18, 15, 12, 12, 8, 5, + 11, 13, 13, 11, -3, 3, 8, 3, + 7, 7, 7, 5, 4, -3, -5, -3, + 4, 3, 13, 1, 2, 1, -1, 2, + 3, 5, 8, 4, -5, -6, -8, -11, + -4, 0, -5, -1, -7, -12, -8, -16, + -6, -6, 0, 2, -9, -9, -11, -3, + -9, 2, 3, -1, -5, -13, 4, -20, + }; + + + int midgameQueenTable[64] = { + -28, 0, 29, 12, 59, 44, 43, 45, + -24, -39, -5, 1, -16, 57, 28, 54, + -13, -17, 7, 8, 29, 56, 47, 57, + -27, -27, -16, -16, -1, 17, -2, 1, + -9, -26, -9, -10, -2, -4, 3, -3, + -14, 2, -11, -2, -5, 2, 14, 5, + -35, -8, 11, 2, 8, 15, -3, 1, + -1, -18, -9, 10, -15, -25, -31, -50, + }; + + int endgameQueenTable[64] = { + -9, 22, 22, 27, 27, 19, 10, 20, + -17, 20, 32, 41, 58, 25, 30, 0, + -20, 6, 9, 49, 47, 35, 19, 9, + 3, 22, 24, 45, 57, 40, 57, 36, + -18, 28, 19, 47, 31, 34, 39, 23, + -16, -27, 15, 6, 9, 17, 10, 5, + -22, -23, -30, -16, -16, -23, -36, -32, + -33, -28, -22, -43, -5, -32, -20, -41, + }; + + int midgameKingTable[64] = { + -65, 23, 16, -15, -56, -34, 2, 13, + 29, -1, -20, -7, -8, -4, -38, -29, + -9, 24, 2, -16, -20, 6, 22, -22, + -17, -20, -12, -27, -30, -25, -14, -36, + -49, -1, -27, -39, -46, -44, -33, -51, + -14, -14, -22, -46, -44, -30, -15, -27, + 1, 7, -8, -64, -43, -16, 9, 8, + -15, 36, 12, -54, 8, -28, 24, 14, + }; + + int endgameKingTable[64] = { + -74, -35, -18, -18, -11, 15, 4, -17, + -12, 17, 14, 17, 17, 38, 23, 11, + 10, 17, 23, 15, 20, 45, 44, 13, + -8, 22, 24, 27, 26, 33, 26, 3, + -18, -4, 21, 24, 27, 23, 9, -11, + -19, -3, 11, 21, 23, 16, 7, -9, + -27, -11, 4, 13, 14, 4, -5, -17, + -53, -34, -21, -11, -28, -14, -24, -43 + }; /* int midgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/src/search.cpp b/src/search.cpp index f6718c0a..635a852d 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -726,29 +726,37 @@ namespace Zagreus { } while (kingAttacks) { - int8_t index = bitscanForward(kingAttacks); - PieceType pieceOnSquare = bitboard.getPieceOnSquare(index); + int8_t attackIndex = bitscanForward(kingAttacks); + uint64_t attacksTo = evalContext.attacksTo[attackIndex] & bitboard.getColorBoard(); + + while (attacksTo) { + int8_t index = bitscanForward(attacksTo); + + PieceType pieceOnSquare = bitboard.getPieceOnSquare(index); + + switch (pieceOnSquare) { + case PieceType::WHITE_KNIGHT: + evalContext.whiteMidgameScore += getEvalValue(MIDGAME_KNIGHT_ATTACK_NEAR_KING); + evalContext.whiteEndgameScore += getEvalValue(ENDGAME_KNIGHT_ATTACK_NEAR_KING); + break; + case PieceType::WHITE_BISHOP: + evalContext.whiteMidgameScore += getEvalValue(MIDGAME_BISHOP_ATTACK_NEAR_KING); + evalContext.whiteEndgameScore += getEvalValue(ENDGAME_BISHOP_ATTACK_NEAR_KING); + break; + case PieceType::WHITE_ROOK: + evalContext.whiteMidgameScore += getEvalValue(MIDGAME_ROOK_ATTACK_NEAR_KING); + evalContext.whiteEndgameScore += getEvalValue(ENDGAME_ROOK_ATTACK_NEAR_KING); + break; + case PieceType::WHITE_QUEEN: + evalContext.whiteMidgameScore += getEvalValue(MIDGAME_QUEEN_ATTACK_NEAR_KING); + evalContext.whiteEndgameScore += getEvalValue(ENDGAME_QUEEN_ATTACK_NEAR_KING); + break; + } - switch (pieceOnSquare) { - case PieceType::WHITE_KNIGHT: - evalContext.whiteMidgameScore += getEvalValue(MIDGAME_KNIGHT_ATTACK_NEAR_KING); - evalContext.whiteEndgameScore += getEvalValue(ENDGAME_KNIGHT_ATTACK_NEAR_KING); - break; - case PieceType::WHITE_BISHOP: - evalContext.whiteMidgameScore += getEvalValue(MIDGAME_BISHOP_ATTACK_NEAR_KING); - evalContext.whiteEndgameScore += getEvalValue(ENDGAME_BISHOP_ATTACK_NEAR_KING); - break; - case PieceType::WHITE_ROOK: - evalContext.whiteMidgameScore += getEvalValue(MIDGAME_ROOK_ATTACK_NEAR_KING); - evalContext.whiteEndgameScore += getEvalValue(ENDGAME_ROOK_ATTACK_NEAR_KING); - break; - case PieceType::WHITE_QUEEN: - evalContext.whiteMidgameScore += getEvalValue(MIDGAME_QUEEN_ATTACK_NEAR_KING); - evalContext.whiteEndgameScore += getEvalValue(ENDGAME_QUEEN_ATTACK_NEAR_KING); - break; + attacksTo &= ~(1ULL << index); } - kingAttacks &= ~(1ULL << index); + kingAttacks &= ~(1ULL << attackIndex); } } @@ -803,29 +811,37 @@ namespace Zagreus { } while (kingAttacks) { - int8_t index = bitscanForward(kingAttacks); - PieceType pieceOnSquare = bitboard.getPieceOnSquare(index); + int8_t attackIndex = bitscanForward(kingAttacks); + uint64_t attacksTo = evalContext.attacksTo[attackIndex] & bitboard.getColorBoard(); + + while (attacksTo) { + int8_t index = bitscanForward(attacksTo); + + PieceType pieceOnSquare = bitboard.getPieceOnSquare(index); + + switch (pieceOnSquare) { + case BLACK_KNIGHT: + evalContext.blackMidgameScore += getEvalValue(MIDGAME_KNIGHT_ATTACK_NEAR_KING); + evalContext.blackEndgameScore += getEvalValue(ENDGAME_KNIGHT_ATTACK_NEAR_KING); + break; + case PieceType::BLACK_BISHOP: + evalContext.blackMidgameScore += getEvalValue(MIDGAME_BISHOP_ATTACK_NEAR_KING); + evalContext.blackEndgameScore += getEvalValue(ENDGAME_BISHOP_ATTACK_NEAR_KING); + break; + case PieceType::BLACK_ROOK: + evalContext.blackMidgameScore += getEvalValue(MIDGAME_ROOK_ATTACK_NEAR_KING); + evalContext.blackEndgameScore += getEvalValue(ENDGAME_ROOK_ATTACK_NEAR_KING); + break; + case PieceType::BLACK_QUEEN: + evalContext.blackMidgameScore += getEvalValue(MIDGAME_QUEEN_ATTACK_NEAR_KING); + evalContext.blackEndgameScore += getEvalValue(ENDGAME_QUEEN_ATTACK_NEAR_KING); + break; + } - switch (pieceOnSquare) { - case PieceType::BLACK_KNIGHT: - evalContext.blackMidgameScore += getEvalValue(MIDGAME_KNIGHT_ATTACK_NEAR_KING); - evalContext.blackEndgameScore += getEvalValue(ENDGAME_KNIGHT_ATTACK_NEAR_KING); - break; - case PieceType::BLACK_BISHOP: - evalContext.blackMidgameScore += getEvalValue(MIDGAME_BISHOP_ATTACK_NEAR_KING); - evalContext.blackEndgameScore += getEvalValue(ENDGAME_BISHOP_ATTACK_NEAR_KING); - break; - case PieceType::BLACK_ROOK: - evalContext.blackMidgameScore += getEvalValue(MIDGAME_ROOK_ATTACK_NEAR_KING); - evalContext.blackEndgameScore += getEvalValue(ENDGAME_ROOK_ATTACK_NEAR_KING); - break; - case PieceType::BLACK_QUEEN: - evalContext.blackMidgameScore += getEvalValue(MIDGAME_QUEEN_ATTACK_NEAR_KING); - evalContext.blackEndgameScore += getEvalValue(ENDGAME_QUEEN_ATTACK_NEAR_KING); - break; + attacksTo &= ~(1ULL << index); } - kingAttacks &= ~(1ULL << index); + kingAttacks &= ~(1ULL << attackIndex); } } @@ -1244,17 +1260,10 @@ namespace Zagreus { 0, 0, whitePawnAttacks, - whiteKnightAttacks, - whiteBishopAttacks, - whiteRookAttacks, - whiteQueenAttacks, whiteCombinedAttacks, blackPawnAttacks, - blackKnightAttacks, - blackBishopAttacks, - blackRookAttacks, - blackQueenAttacks, blackCombinedAttacks, + {}, {} }; @@ -1262,6 +1271,10 @@ namespace Zagreus { context.attacksFrom[i] = attacksFrom[i]; } + for (int i = 0; i < 64; i++) { + context.attacksTo[i] = attacksTo[i]; + } + return context; } } diff --git a/src/tuner.cpp b/src/tuner.cpp index 2b4519fe..b5c39978 100644 --- a/src/tuner.cpp +++ b/src/tuner.cpp @@ -39,10 +39,10 @@ namespace Zagreus { double K = 0.0; int batchSize = 512; - double learningRate = 0.4; - double epsilon = 6.0; + double learningRate = 0.5; + double epsilon = 1.0; double optimizerEpsilon = 1e-6; - double epsilonDecay = 0.97; + double epsilonDecay = 1.0; double beta1 = 0.9; double beta2 = 0.999; int epsilonWarmupIterations = 0; @@ -118,7 +118,7 @@ namespace Zagreus { double bestLoss = 9999999.0; double oldK = K; - for (double k = 0.0; k <= 2.0; k += 0.001) { + for (double k = 1.0; k <= 2.0; k += 0.001) { K = k; double totalLoss = 0.0; diff --git a/src/types.h b/src/types.h index 375f591c..b5ebd518 100644 --- a/src/types.h +++ b/src/types.h @@ -118,17 +118,10 @@ namespace Zagreus { int whiteEndgameScore = 0; int blackEndgameScore = 0; uint64_t whitePawnAttacks = 0; - uint64_t whiteKnightAttacks = 0; - uint64_t whiteBishopAttacks = 0; - uint64_t whiteRookAttacks = 0; - uint64_t whiteQueenAttacks = 0; uint64_t whiteCombinedAttacks = 0; uint64_t blackPawnAttacks = 0; - uint64_t blackKnightAttacks = 0; - uint64_t blackBishopAttacks = 0; - uint64_t blackRookAttacks = 0; - uint64_t blackQueenAttacks = 0; uint64_t blackCombinedAttacks = 0; uint64_t attacksFrom[64] = { 0ULL }; + uint64_t attacksTo[64] = { 0ULL }; }; } \ No newline at end of file From d3a5104e34019cc963df2a4576f35d0b7e5c977f Mon Sep 17 00:00:00 2001 From: Dannyj1 <73849717+Dannyj1@users.noreply.github.com> Date: Fri, 10 Feb 2023 15:57:41 +0100 Subject: [PATCH 4/7] Tuned values Bench: 9798424 --- src/features.cpp | 2 +- src/pst.cpp | 139 ++++------------------------------------------- src/tuner.cpp | 46 ++++------------ 3 files changed, 25 insertions(+), 162 deletions(-) diff --git a/src/features.cpp b/src/features.cpp index 5b976416..2e10880a 100644 --- a/src/features.cpp +++ b/src/features.cpp @@ -21,7 +21,7 @@ #include namespace Zagreus { - int evalValues[74] = { 99, 99, 349, 349, 350, 350, 525, 525, 999, 999, 1, 1, 6, 1, 8, 3, 2, 6, 3, 7, -50, 0, -25, 0, -25, 0, -5, 0, -10, 0, -3, -2, -4, -4, -9, -9, 9, 9, 6, 6, 7, 7, 3, 3, 0, 0, 20, 20, 15, 15, 10, 10, 4, 4, 5, 5, -24, -24, 10, 0, -9, -9, 9, 9, -20, -20, -10, -10, 3, 3, 19, 0, 0, 0, }; + int evalValues[74] = { 99, 117, 367, 350, 383, 363, 540, 553, 1018, 1016, 10, 10, 5, 2, 7, 6, 4, 6, 0, 20, -50, 0, -25, 0, -38, -4, -18, -4, 0, 4, 8, 0, -1, -1, 0, 2, 5, 13, 20, 13, 14, 15, 2, 23, 9, 12, 20, 20, 15, 15, 3, 0, 13, 7, 8, 8, -32, -26, 24, 7, -3, 0, -1, 0, -20, -20, 0, 0, 3, 3, 34, -4, 12, 0, }; int baseEvalValues[74] = { 100, // MIDGAME_PAWN_MATERIAL diff --git a/src/pst.cpp b/src/pst.cpp index 6eaaef70..4dc3ff25 100644 --- a/src/pst.cpp +++ b/src/pst.cpp @@ -21,138 +21,23 @@ #include namespace Zagreus { - int midgamePawnTable[64] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 98, 134, 61, 95, 68, 126, 34, -11, - -6, 7, 26, 31, 65, 56, 25, -20, - -14, 13, 6, 21, 23, 12, 17, -23, - -27, -2, -5, 12, 17, 6, 10, -25, - -26, -4, -4, -10, 3, 3, 33, -12, - -35, -1, -20, -23, -15, 24, 38, -22, - 0, 0, 0, 0, 0, 0, 0, 0, - }; + int midgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 96, 131, 62, 92, 68, 127, 35, -7, 0, 8, 26, 31, 58, 52, 26, -10, -14, 9, -1, 17, 21, 8, 21, -12, -44, -5, -14, 15, 22, 2, 8, -31, -24, -6, -9, -1, 2, 1, 12, -16, -23, 10, -9, -17, -8, 11, 36, -15, 0, 0, 0, 0, 0, 0, 0, 0 }; + int endgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 181, 175, 159, 131, 151, 138, 166, 198, 110, 109, 85, 71, 58, 58, 89, 102, 37, 29, 7, -4, -6, 5, 24, 31, 15, 1, -9, -8, -13, -12, 2, 12, -3, 0, -6, 6, 3, -12, -6, -2, 20, 10, 11, 18, 16, 1, 2, -2, 0, 0, 0, 0, 0, 0, 0, 0 }; - int endgamePawnTable[64] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 178, 173, 158, 134, 147, 132, 165, 187, - 94, 100, 85, 67, 56, 53, 82, 84, - 32, 24, 13, 5, -2, 4, 17, 17, - 13, 9, -3, -7, -7, -8, 3, -1, - 4, 7, -6, 1, 0, -5, -1, -8, - 13, 8, 8, 10, 13, 0, 2, -7, - 0, 0, 0, 0, 0, 0, 0, 0, - }; - - int midgameKnightTable[64] = { - -167, -89, -34, -49, 61, -97, -15, -107, - -73, -41, 72, 36, 23, 62, 7, -17, - -47, 60, 37, 65, 84, 129, 73, 44, - -9, 17, 19, 53, 37, 69, 18, 22, - -13, 4, 16, 13, 28, 19, 21, -8, - -23, -9, 12, 10, 19, 17, 25, -16, - -29, -53, -12, -3, -1, 18, -14, -19, - -105, -21, -58, -33, -17, -28, -19, -23, - }; + int midgameKnightTable[64] = { -164, -89, -34, -48, 59, -96, -14, -106, -70, -41, 78, 33, 22, 67, 6, -18, -45, 58, 35, 70, 85, 123, 71, 45, -9, 17, 22, 44, 39, 65, 17, 21, -15, 3, 12, 17, 23, 19, 20, -13, -23, -4, 12, 14, 18, 15, 16, -20, -23, -47, -5, 11, 11, 18, -12, -11, -105, -24, -58, -30, -20, -29, -14, -21 }; + int endgameKnightTable[64] = { -60, -38, -14, -27, -33, -27, -63, -95, -23, -11, -23, -3, -7, -24, -25, -51, -21, -20, 11, 12, 0, -11, -20, -39, -19, 9, 21, 19, 21, 11, 6, -17, -20, -6, 16, 29, 15, 21, 1, -16, -22, -3, -5, 16, 10, -3, -23, -23, -43, -16, -7, 0, 0, -20, -22, -39, -30, -49, -21, -12, -26, -17, -51, -64 }; - int endgameKnightTable[64] = { - -58, -38, -13, -28, -31, -27, -63, -99, - -25, -8, -25, -2, -9, -25, -24, -52, - -24, -20, 10, 9, -1, -9, -19, -41, - -17, 3, 22, 22, 22, 11, 8, -18, - -18, -6, 16, 25, 16, 17, 4, -18, - -23, -3, -1, 15, 10, -3, -20, -22, - -42, -20, -10, -5, -2, -20, -23, -44, - -29, -51, -23, -15, -22, -18, -50, -64, - }; + int midgameBishopTable[64] = { -29, 3, -82, -36, -25, -37, 6, -6, -25, 12, -13, -11, 31, 59, 19, -43, -10, 38, 41, 38, 38, 54, 38, 0, -5, 3, 18, 44, 37, 29, 0, -1, -9, 8, 2, 25, 36, 5, 12, 1, 0, 16, 12, 4, 5, 24, 20, 19, 11, 29, 14, 4, 13, 25, 45, 0, -27, 0, -4, -17, -10, 0, -38, -20 }; + int endgameBishopTable[64] = { -11, -19, -9, -4, -3, -5, -18, -23, -9, -4, 9, -6, -5, -16, -4, -11, 8, -8, 0, 0, -1, 6, 0, 3, -3, 7, 8, 9, 10, 4, 1, 0, -6, 2, 8, 15, 6, 8, 0, -12, -10, -3, 3, 11, 8, 0, -5, -15, -12, -7, -5, 0, 8, -11, -7, -29, -20, -8, -7, 0, -8, -7, -1, -15 }; - int midgameBishopTable[64] = { - -29, 4, -82, -37, -25, -42, 7, -8, - -26, 16, -18, -13, 30, 59, 18, -47, - -16, 37, 43, 40, 35, 50, 37, -2, - -4, 5, 19, 50, 37, 37, 7, -2, - -6, 13, 13, 26, 34, 12, 10, 4, - 0, 15, 15, 15, 14, 27, 18, 10, - 4, 15, 16, 0, 7, 21, 33, 1, - -33, -3, -14, -21, -13, -12, -39, -21, - }; + int midgameRookTable[64] = { 30, 40, 28, 46, 62, 12, 33, 42, 24, 31, 60, 64, 75, 66, 22, 43, -4, 18, 26, 33, 16, 44, 59, 13, -19, -14, 9, 27, 21, 32, -4, -18, -35, -27, -15, -2, 13, -10, 3, -26, -45, -24, -17, -19, 1, 5, -6, -32, -45, -15, -20, -11, -4, 8, -6, -65, -13, -17, 2, 17, 12, 13, -29, -26 }; + int endgameRookTable[64] = { 10, 4, 13, 8, 9, 17, 9, 3, 10, 12, 9, 12, -6, 3, 10, 2, 12, 7, 8, 2, 8, -3, -4, -4, 10, 0, 12, 4, 3, 0, 0, 3, 4, 4, 10, 1, 0, -7, -10, -12, -1, 1, 0, 0, -7, -8, -10, -16, -4, -6, 0, 1, -13, -6, -9, 0, -1, 0, 7, -1, -2, -8, 6, -13 }; - int endgameBishopTable[64] = { - -14, -21, -11, -8, -7, -9, -17, -24, - -8, -4, 7, -12, -3, -13, -4, -14, - 2, -8, 0, -1, -2, 6, 0, 4, - -3, 9, 12, 9, 14, 10, 3, 2, - -6, 3, 13, 19, 7, 10, -3, -9, - -12, -3, 8, 10, 13, 3, -7, -15, - -14, -18, -7, -1, 4, -9, -15, -27, - -23, -9, -23, -5, -9, -16, -5, -17, - }; + int midgameQueenTable[64] = { -25, -1, 32, 13, 58, 43, 43, 43, -23, -41, -1, 0, -18, 55, 17, 52, -5, -14, 3, 8, 29, 56, 46, 58, -19, -31, -20, -15, 0, 11, -2, 5, -12, -24, -10, -17, -7, -6, 7, -6, -15, -2, -5, -6, -12, -3, 5, 0, -32, -5, 11, 0, 3, 8, -2, -1, -1, -15, -10, 10, 0, -16, -23, -40 }; + int endgameQueenTable[64] = { -5, 22, 26, 29, 25, 19, 8, 17, -13, 20, 36, 41, 57, 29, 23, 0, -17, 9, 6, 45, 48, 31, 17, 7, 5, 22, 25, 41, 53, 38, 56, 35, -13, 32, 16, 39, 29, 34, 38, 22, -13, -24, 15, 2, 9, 16, 5, 0, -18, -20, -31, -11, -17, -25, -34, -31, -30, -26, -22, -35, 5, -26, -20, -36 }; - int midgameRookTable[64] = { - 32, 42, 32, 51, 63, 9, 31, 43, - 27, 32, 58, 62, 80, 67, 26, 44, - -5, 19, 26, 36, 17, 45, 61, 16, - -24, -11, 7, 26, 24, 35, -8, -20, - -36, -26, -12, -1, 9, -7, 6, -23, - -45, -25, -16, -17, 3, 0, -5, -33, - -44, -16, -20, -9, -1, 11, -6, -71, - -19, -13, 1, 17, 16, 7, -37, -26, - }; - - int endgameRookTable[64] = { - 13, 10, 18, 15, 12, 12, 8, 5, - 11, 13, 13, 11, -3, 3, 8, 3, - 7, 7, 7, 5, 4, -3, -5, -3, - 4, 3, 13, 1, 2, 1, -1, 2, - 3, 5, 8, 4, -5, -6, -8, -11, - -4, 0, -5, -1, -7, -12, -8, -16, - -6, -6, 0, 2, -9, -9, -11, -3, - -9, 2, 3, -1, -5, -13, 4, -20, - }; - - - int midgameQueenTable[64] = { - -28, 0, 29, 12, 59, 44, 43, 45, - -24, -39, -5, 1, -16, 57, 28, 54, - -13, -17, 7, 8, 29, 56, 47, 57, - -27, -27, -16, -16, -1, 17, -2, 1, - -9, -26, -9, -10, -2, -4, 3, -3, - -14, 2, -11, -2, -5, 2, 14, 5, - -35, -8, 11, 2, 8, 15, -3, 1, - -1, -18, -9, 10, -15, -25, -31, -50, - }; - - int endgameQueenTable[64] = { - -9, 22, 22, 27, 27, 19, 10, 20, - -17, 20, 32, 41, 58, 25, 30, 0, - -20, 6, 9, 49, 47, 35, 19, 9, - 3, 22, 24, 45, 57, 40, 57, 36, - -18, 28, 19, 47, 31, 34, 39, 23, - -16, -27, 15, 6, 9, 17, 10, 5, - -22, -23, -30, -16, -16, -23, -36, -32, - -33, -28, -22, -43, -5, -32, -20, -41, - }; - - int midgameKingTable[64] = { - -65, 23, 16, -15, -56, -34, 2, 13, - 29, -1, -20, -7, -8, -4, -38, -29, - -9, 24, 2, -16, -20, 6, 22, -22, - -17, -20, -12, -27, -30, -25, -14, -36, - -49, -1, -27, -39, -46, -44, -33, -51, - -14, -14, -22, -46, -44, -30, -15, -27, - 1, 7, -8, -64, -43, -16, 9, 8, - -15, 36, 12, -54, 8, -28, 24, 14, - }; - - int endgameKingTable[64] = { - -74, -35, -18, -18, -11, 15, 4, -17, - -12, 17, 14, 17, 17, 38, 23, 11, - 10, 17, 23, 15, 20, 45, 44, 13, - -8, 22, 24, 27, 26, 33, 26, 3, - -18, -4, 21, 24, 27, 23, 9, -11, - -19, -3, 11, 21, 23, 16, 7, -9, - -27, -11, 4, 13, 14, 4, -5, -17, - -53, -34, -21, -11, -28, -14, -24, -43 - }; + int midgameKingTable[64] = { -64, 24, 15, -13, -55, -34, 2, 13, 29, 0, -18, -7, -7, -1, -36, -28, -8, 22, 1, -15, -20, 5, 23, -22, -16, -17, -13, -25, -28, -23, -15, -35, -49, -1, -28, -35, -46, -43, -34, -50, -14, -13, -26, -45, -44, -29, -12, -28, 0, 6, -13, -70, -51, -16, 13, 12, -6, 31, 5, -36, -9, -32, 28, 13 }; + int endgameKingTable[64] = { -74, -35, -18, -16, -9, 14, 5, -16, -10, 21, 14, 16, 19, 40, 28, 10, 13, 18, 24, 17, 18, 47, 47, 11, -5, 22, 26, 32, 31, 40, 30, 5, -17, -2, 22, 24, 26, 26, 8, -5, -22, 0, 10, 23, 28, 18, 7, -9, -24, -15, 0, 9, 13, 8, -6, -16, -58, -38, -23, -14, -29, -16, -31, -51 }; /* int midgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/src/tuner.cpp b/src/tuner.cpp index b5c39978..c4875526 100644 --- a/src/tuner.cpp +++ b/src/tuner.cpp @@ -39,50 +39,28 @@ namespace Zagreus { double K = 0.0; int batchSize = 512; - double learningRate = 0.5; - double epsilon = 1.0; + double learningRate = 0.4; + double epsilon = 5.0; double optimizerEpsilon = 1e-6; - double epsilonDecay = 1.0; + double epsilonDecay = 0.95; double beta1 = 0.9; double beta2 = 0.999; int epsilonWarmupIterations = 0; - std::vector> divideByScore(const std::vector &v) { - std::map> scoreMap; - for (const auto &p : v) { - scoreMap[p.score].push_back(p); - } - - std::vector> subVectors; - for (const auto &kv : scoreMap) { - subVectors.push_back(kv.second); - } - - return subVectors; - } - - // Create batches with a uniform distribution by score rounded to 50 std::vector> createBatches(std::vector v, std::mt19937_64 gen) { - std::sort(v.begin(), v.end(), [](const TunePosition &a, const TunePosition &b) { - return a.score < b.score; - }); + // Create random batches of batchSize positions + std::vector> batches; - auto subVectors = divideByScore(v); - for (auto &subVector : subVectors) { - std::shuffle(subVector.begin(), subVector.end(), gen); - } - - v.clear(); - for (const auto &subVector : subVectors) { - v.insert(v.end(), subVector.begin(), subVector.end()); - } - - std::vector> result; + std::shuffle(v.begin(), v.end(), gen); for (int i = 0; i < v.size(); i += batchSize) { - result.push_back({v.begin() + i, v.begin() + std::min(i + batchSize, (int) v.size())}); + std::vector batch; + for (int j = i; j < i + batchSize && j < v.size(); j++) { + batch.push_back(v[j]); + } + batches.push_back(batch); } - return result; + return batches; } double sigmoid(double x) { From 0ff55171a605faa0c8022e1df45faa62f78bdc55 Mon Sep 17 00:00:00 2001 From: Dannyj1 <73849717+Dannyj1@users.noreply.github.com> Date: Fri, 10 Feb 2023 16:40:37 +0100 Subject: [PATCH 5/7] Remove knight attacks on king penalty Bench: 9724432 --- README.md | 4 ++-- src/features.cpp | 6 ++---- src/features.h | 4 ---- src/pst.cpp | 24 ++++++++++++------------ src/search.cpp | 8 -------- 5 files changed, 16 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 2f9cb54b..fb3ee61b 100644 --- a/README.md +++ b/README.md @@ -55,8 +55,6 @@ Thanks to: - Some ideas in this engine are inspired by [Stockfish](https://github.com/official-stockfish/Stockfish) # License -Zagreus is a chess engine that supports the UCI protocol - Copyright (C) 2023 Danny Jelsma This program is free software: you can redistribute it and/or modify @@ -71,3 +69,5 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . + +This project uses the [Senjo UCI Adapter](https://github.com/zd3nik/SenjoUCIAdapter) by zd3nik which is licensed under the MIT license. All files from the Senjo UCI Adapter retain their original copyright and license notices. \ No newline at end of file diff --git a/src/features.cpp b/src/features.cpp index 2e10880a..adf75969 100644 --- a/src/features.cpp +++ b/src/features.cpp @@ -21,9 +21,9 @@ #include namespace Zagreus { - int evalValues[74] = { 99, 117, 367, 350, 383, 363, 540, 553, 1018, 1016, 10, 10, 5, 2, 7, 6, 4, 6, 0, 20, -50, 0, -25, 0, -38, -4, -18, -4, 0, 4, 8, 0, -1, -1, 0, 2, 5, 13, 20, 13, 14, 15, 2, 23, 9, 12, 20, 20, 15, 15, 3, 0, 13, 7, 8, 8, -32, -26, 24, 7, -3, 0, -1, 0, -20, -20, 0, 0, 3, 3, 34, -4, 12, 0, }; + int evalValues[72] = { 96, 112, 362, 352, 378, 364, 534, 547, 1017, 1012, 10, 11, 7, 0, 7, 6, 4, 7, 0, 17, -50, 0, -25, 0, -31, -3, -16, -6, 4, -1, 8, 1, 0, -3, 0, -5, 5, 10, 22, 7, 11, 4, 10, 19, 11, 11, 20, 20, 15, 15, 4, 0, 6, 0, 8, 7, -36, -20, 24, 12, -3, 0, -2, 0, -20, -20, 2, 0, 3, 3, 35, -1, }; - int baseEvalValues[74] = { + int baseEvalValues[72] = { 100, // MIDGAME_PAWN_MATERIAL 100, // ENDGAME_PAWN_MATERIAL 350, // MIDGAME_KNIGHT_MATERIAL @@ -96,8 +96,6 @@ namespace Zagreus { 3, // ENDGAME_PAWN_SEMI_OPEN_FILE 20, // MIDGAME_PAWN_SHIELD 0, // ENDGAME_PAWN_SHIELD - -1, // MIDGAME_KNIGHT_ATTACK_NEAR_KING - -1, // ENDGAME_KNIGHT_ATTACK_NEAR_KING }; void printEvalValues() { diff --git a/src/features.h b/src/features.h index 20abb3b1..46365662 100644 --- a/src/features.h +++ b/src/features.h @@ -94,8 +94,6 @@ namespace Zagreus { ENDGAME_PAWN_SEMI_OPEN_FILE, MIDGAME_PAWN_SHIELD, ENDGAME_PAWN_SHIELD, - MIDGAME_KNIGHT_ATTACK_NEAR_KING, - ENDGAME_KNIGHT_ATTACK_NEAR_KING }; static std::vector evalFeatureNames = { @@ -171,8 +169,6 @@ namespace Zagreus { "ENDGAME_PAWN_SEMI_OPEN_FILE", "MIDGAME_PAWN_SHIELD", "ENDGAME_PAWN_SHIELD", - "MIDGAME_KNIGHT_ATTACK_NEAR_KING", - "ENDGAME_KNIGHT_ATTACK_NEAR_KING", }; void printEvalValues(); diff --git a/src/pst.cpp b/src/pst.cpp index 4dc3ff25..6af90ca8 100644 --- a/src/pst.cpp +++ b/src/pst.cpp @@ -21,23 +21,23 @@ #include namespace Zagreus { - int midgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 96, 131, 62, 92, 68, 127, 35, -7, 0, 8, 26, 31, 58, 52, 26, -10, -14, 9, -1, 17, 21, 8, 21, -12, -44, -5, -14, 15, 22, 2, 8, -31, -24, -6, -9, -1, 2, 1, 12, -16, -23, 10, -9, -17, -8, 11, 36, -15, 0, 0, 0, 0, 0, 0, 0, 0 }; - int endgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 181, 175, 159, 131, 151, 138, 166, 198, 110, 109, 85, 71, 58, 58, 89, 102, 37, 29, 7, -4, -6, 5, 24, 31, 15, 1, -9, -8, -13, -12, 2, 12, -3, 0, -6, 6, 3, -12, -6, -2, 20, 10, 11, 18, 16, 1, 2, -2, 0, 0, 0, 0, 0, 0, 0, 0 }; + int midgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 98, 130, 60, 94, 69, 126, 40, -9, -3, 10, 26, 28, 61, 61, 28, -14, -16, 9, 0, 22, 18, 11, 20, -20, -42, -13, -11, 15, 21, 7, 11, -33, -25, 3, -12, -5, 2, -1, 17, -15, -22, 10, -10, -17, -12, 11, 38, -14, 0, 0, 0, 0, 0, 0, 0, 0 }; + int endgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 185, 175, 158, 133, 151, 132, 171, 196, 102, 107, 85, 63, 56, 58, 83, 96, 37, 26, 12, -4, -5, 5, 22, 31, 12, 3, -13, -10, -12, -13, 0, 1, 2, -1, -10, 3, -1, -5, -3, -6, 16, 12, 11, 14, 12, 3, 1, -2, 0, 0, 0, 0, 0, 0, 0, 0 }; - int midgameKnightTable[64] = { -164, -89, -34, -48, 59, -96, -14, -106, -70, -41, 78, 33, 22, 67, 6, -18, -45, 58, 35, 70, 85, 123, 71, 45, -9, 17, 22, 44, 39, 65, 17, 21, -15, 3, 12, 17, 23, 19, 20, -13, -23, -4, 12, 14, 18, 15, 16, -20, -23, -47, -5, 11, 11, 18, -12, -11, -105, -24, -58, -30, -20, -29, -14, -21 }; - int endgameKnightTable[64] = { -60, -38, -14, -27, -33, -27, -63, -95, -23, -11, -23, -3, -7, -24, -25, -51, -21, -20, 11, 12, 0, -11, -20, -39, -19, 9, 21, 19, 21, 11, 6, -17, -20, -6, 16, 29, 15, 21, 1, -16, -22, -3, -5, 16, 10, -3, -23, -23, -43, -16, -7, 0, 0, -20, -22, -39, -30, -49, -21, -12, -26, -17, -51, -64 }; + int midgameKnightTable[64] = { -167, -89, -36, -47, 61, -94, -14, -109, -68, -38, 70, 39, 25, 65, 6, -18, -44, 59, 40, 68, 88, 125, 71, 42, -7, 12, 22, 49, 31, 64, 12, 24, -17, 6, 17, 16, 25, 20, 20, -15, -27, -2, 15, 17, 19, 13, 23, -17, -24, -48, -13, 5, 14, 15, -14, -15, -103, -24, -56, -31, -19, -29, -17, -23 }; + int endgameKnightTable[64] = { -57, -39, -11, -26, -27, -25, -61, -100, -24, -6, -25, 0, -8, -25, -23, -49, -23, -24, 12, 8, 2, -7, -20, -43, -16, 5, 25, 19, 20, 8, 6, -17, -20, -3, 18, 23, 15, 16, 0, -21, -24, -1, -1, 15, 8, -7, -22, -20, -40, -18, -12, -4, -3, -16, -22, -42, -29, -43, -24, -12, -22, -18, -46, -65 }; - int midgameBishopTable[64] = { -29, 3, -82, -36, -25, -37, 6, -6, -25, 12, -13, -11, 31, 59, 19, -43, -10, 38, 41, 38, 38, 54, 38, 0, -5, 3, 18, 44, 37, 29, 0, -1, -9, 8, 2, 25, 36, 5, 12, 1, 0, 16, 12, 4, 5, 24, 20, 19, 11, 29, 14, 4, 13, 25, 45, 0, -27, 0, -4, -17, -10, 0, -38, -20 }; - int endgameBishopTable[64] = { -11, -19, -9, -4, -3, -5, -18, -23, -9, -4, 9, -6, -5, -16, -4, -11, 8, -8, 0, 0, -1, 6, 0, 3, -3, 7, 8, 9, 10, 4, 1, 0, -6, 2, 8, 15, 6, 8, 0, -12, -10, -3, 3, 11, 8, 0, -5, -15, -12, -7, -5, 0, 8, -11, -7, -29, -20, -8, -7, 0, -8, -7, -1, -15 }; + int midgameBishopTable[64] = { -27, 3, -79, -35, -25, -43, 3, -5, -29, 15, -17, -12, 31, 57, 15, -41, -9, 35, 43, 38, 34, 54, 38, 1, 0, 0, 13, 43, 33, 33, 0, -3, -7, 17, 1, 27, 32, 0, 8, 0, 2, 8, 17, 4, 6, 27, 14, 14, 5, 34, 16, 8, 13, 22, 47, 4, -29, -4, -6, -21, -12, 1, -38, -25 }; + int endgameBishopTable[64] = { -11, -18, -7, -4, -7, -9, -19, -21, -11, -3, 3, -11, -3, -12, -2, -13, 4, -3, -1, -3, -3, 7, 2, 4, 0, 13, 12, 3, 13, 7, 2, 3, -9, 3, 10, 18, 2, 8, -6, -13, -9, -6, 6, 9, 13, 3, -4, -12, -13, -16, -6, 0, 8, -9, -10, -27, -22, -10, -13, -1, -7, -13, -5, -14 }; - int midgameRookTable[64] = { 30, 40, 28, 46, 62, 12, 33, 42, 24, 31, 60, 64, 75, 66, 22, 43, -4, 18, 26, 33, 16, 44, 59, 13, -19, -14, 9, 27, 21, 32, -4, -18, -35, -27, -15, -2, 13, -10, 3, -26, -45, -24, -17, -19, 1, 5, -6, -32, -45, -15, -20, -11, -4, 8, -6, -65, -13, -17, 2, 17, 12, 13, -29, -26 }; - int endgameRookTable[64] = { 10, 4, 13, 8, 9, 17, 9, 3, 10, 12, 9, 12, -6, 3, 10, 2, 12, 7, 8, 2, 8, -3, -4, -4, 10, 0, 12, 4, 3, 0, 0, 3, 4, 4, 10, 1, 0, -7, -10, -12, -1, 1, 0, 0, -7, -8, -10, -16, -4, -6, 0, 1, -13, -6, -9, 0, -1, 0, 7, -1, -2, -8, 6, -13 }; + int midgameRookTable[64] = { 32, 40, 27, 53, 62, 11, 31, 41, 25, 27, 57, 62, 77, 65, 26, 45, -1, 17, 23, 35, 20, 44, 58, 16, -26, -11, 3, 21, 24, 33, -10, -15, -38, -26, -15, -2, 12, -3, 3, -24, -45, -25, -15, -12, 5, 0, -7, -36, -45, -16, -18, -9, 0, 6, -4, -67, -14, -11, 0, 18, 16, 9, -23, -24 }; + int endgameRookTable[64] = { 10, 7, 12, 13, 8, 11, 7, 2, 10, 12, 11, 10, -8, 9, 8, 2, 10, 8, 6, 5, 6, 0, -6, 0, 4, 2, 11, -2, 1, 1, 0, 6, 2, 5, 8, 0, -1, 0, -10, -8, -1, -1, -2, -3, -7, -12, -9, -17, -4, -7, 0, 4, -4, -8, -7, 1, -3, 2, 5, -2, -5, -8, 8, -14 }; - int midgameQueenTable[64] = { -25, -1, 32, 13, 58, 43, 43, 43, -23, -41, -1, 0, -18, 55, 17, 52, -5, -14, 3, 8, 29, 56, 46, 58, -19, -31, -20, -15, 0, 11, -2, 5, -12, -24, -10, -17, -7, -6, 7, -6, -15, -2, -5, -6, -12, -3, 5, 0, -32, -5, 11, 0, 3, 8, -2, -1, -1, -15, -10, 10, 0, -16, -23, -40 }; - int endgameQueenTable[64] = { -5, 22, 26, 29, 25, 19, 8, 17, -13, 20, 36, 41, 57, 29, 23, 0, -17, 9, 6, 45, 48, 31, 17, 7, 5, 22, 25, 41, 53, 38, 56, 35, -13, 32, 16, 39, 29, 34, 38, 22, -13, -24, 15, 2, 9, 16, 5, 0, -18, -20, -31, -11, -17, -25, -34, -31, -30, -26, -22, -35, 5, -26, -20, -36 }; + int midgameQueenTable[64] = { -24, 0, 28, 10, 61, 44, 42, 42, -22, -42, -4, -4, -14, 59, 20, 53, -10, -15, 9, 7, 31, 55, 43, 53, -24, -19, -11, -14, -8, 20, -2, 0, -14, -20, -10, -17, -7, -10, 2, -8, -12, 3, -9, 0, -8, 0, 12, 3, -31, -9, 6, 1, 4, 13, 1, 3, 0, -15, -14, 3, 2, -22, -30, -42 }; + int endgameQueenTable[64] = { -4, 22, 22, 25, 30, 17, 9, 18, -15, 18, 33, 39, 57, 24, 30, 0, -15, 6, 9, 50, 46, 33, 17, 5, 3, 23, 26, 41, 53, 39, 58, 37, -17, 28, 19, 43, 29, 32, 38, 23, -17, -26, 13, 2, 6, 15, 7, 3, -20, -22, -26, -15, -19, -24, -34, -28, -32, -26, -20, -38, 4, -28, -17, -39 }; - int midgameKingTable[64] = { -64, 24, 15, -13, -55, -34, 2, 13, 29, 0, -18, -7, -7, -1, -36, -28, -8, 22, 1, -15, -20, 5, 23, -22, -16, -17, -13, -25, -28, -23, -15, -35, -49, -1, -28, -35, -46, -43, -34, -50, -14, -13, -26, -45, -44, -29, -12, -28, 0, 6, -13, -70, -51, -16, 13, 12, -6, 31, 5, -36, -9, -32, 28, 13 }; - int endgameKingTable[64] = { -74, -35, -18, -16, -9, 14, 5, -16, -10, 21, 14, 16, 19, 40, 28, 10, 13, 18, 24, 17, 18, 47, 47, 11, -5, 22, 26, 32, 31, 40, 30, 5, -17, -2, 22, 24, 26, 26, 8, -5, -22, 0, 10, 23, 28, 18, 7, -9, -24, -15, 0, 9, 13, 8, -6, -16, -58, -38, -23, -14, -29, -16, -31, -51 }; + int midgameKingTable[64] = { -65, 23, 16, -15, -55, -34, 1, 13, 29, 0, -18, -5, -7, -3, -36, -28, -8, 25, 3, -15, -17, 5, 20, -22, -16, -18, -11, -26, -30, -24, -14, -36, -47, 0, -26, -40, -45, -44, -31, -50, -11, -12, -20, -48, -40, -29, -14, -27, 6, 6, -12, -68, -42, -19, 10, 6, -7, 31, 2, -32, -7, -29, 26, 10 }; + int endgameKingTable[64] = { -73, -33, -17, -18, -10, 14, 4, -16, -11, 17, 18, 17, 18, 39, 24, 11, 9, 19, 25, 18, 23, 41, 45, 14, -9, 25, 23, 30, 24, 35, 26, 2, -16, -3, 19, 23, 31, 26, 12, -9, -19, -3, 11, 20, 23, 14, 7, -8, -26, -11, 3, 16, 12, 7, -7, -21, -50, -39, -22, -3, -31, -16, -31, -51 }; /* int midgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/src/search.cpp b/src/search.cpp index 635a852d..7a8e73ea 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -735,10 +735,6 @@ namespace Zagreus { PieceType pieceOnSquare = bitboard.getPieceOnSquare(index); switch (pieceOnSquare) { - case PieceType::WHITE_KNIGHT: - evalContext.whiteMidgameScore += getEvalValue(MIDGAME_KNIGHT_ATTACK_NEAR_KING); - evalContext.whiteEndgameScore += getEvalValue(ENDGAME_KNIGHT_ATTACK_NEAR_KING); - break; case PieceType::WHITE_BISHOP: evalContext.whiteMidgameScore += getEvalValue(MIDGAME_BISHOP_ATTACK_NEAR_KING); evalContext.whiteEndgameScore += getEvalValue(ENDGAME_BISHOP_ATTACK_NEAR_KING); @@ -820,10 +816,6 @@ namespace Zagreus { PieceType pieceOnSquare = bitboard.getPieceOnSquare(index); switch (pieceOnSquare) { - case BLACK_KNIGHT: - evalContext.blackMidgameScore += getEvalValue(MIDGAME_KNIGHT_ATTACK_NEAR_KING); - evalContext.blackEndgameScore += getEvalValue(ENDGAME_KNIGHT_ATTACK_NEAR_KING); - break; case PieceType::BLACK_BISHOP: evalContext.blackMidgameScore += getEvalValue(MIDGAME_BISHOP_ATTACK_NEAR_KING); evalContext.blackEndgameScore += getEvalValue(ENDGAME_BISHOP_ATTACK_NEAR_KING); From 83dfafefac0abbc2ef7c8538e1877653d8f64186 Mon Sep 17 00:00:00 2001 From: Dannyj1 <73849717+Dannyj1@users.noreply.github.com> Date: Fri, 10 Feb 2023 16:56:48 +0100 Subject: [PATCH 6/7] Slight performance improvement and bug fix Bench: 9472149 --- src/search.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/search.cpp b/src/search.cpp index 7a8e73ea..a2db3164 100644 --- a/src/search.cpp +++ b/src/search.cpp @@ -679,7 +679,7 @@ namespace Zagreus { void getWhiteKingScore(EvalContext &evalContext, Bitboard &bitboard) { uint64_t kingBB = bitboard.getPieceBoard(); uint64_t kingLocation = bitscanForward(kingBB); - uint64_t kingAttacks = bitboard.getKingAttacks(kingLocation); + uint64_t kingAttacks = evalContext.attacksFrom[kingLocation]; uint64_t pawnBB = bitboard.getPieceBoard(); uint64_t safetyMask = nortOne(kingBB) | noEaOne(kingBB) | noWeOne(kingBB); safetyMask |= nortOne(safetyMask); @@ -727,7 +727,7 @@ namespace Zagreus { while (kingAttacks) { int8_t attackIndex = bitscanForward(kingAttacks); - uint64_t attacksTo = evalContext.attacksTo[attackIndex] & bitboard.getColorBoard(); + uint64_t attacksTo = evalContext.attacksTo[attackIndex] & bitboard.getColorBoard(); while (attacksTo) { int8_t index = bitscanForward(attacksTo); @@ -761,7 +761,7 @@ namespace Zagreus { void getBlackKingScore(EvalContext &evalContext, Bitboard &bitboard) { uint64_t kingBB = bitboard.getPieceBoard(); uint64_t kingLocation = bitscanForward(kingBB); - uint64_t kingAttacks = bitboard.getKingAttacks(kingLocation); + uint64_t kingAttacks = evalContext.attacksFrom[kingLocation]; uint64_t pawnBB = bitboard.getPieceBoard(); uint64_t safetyMask = soutOne(kingBB) | soEaOne(kingBB) | soWeOne(kingBB); safetyMask |= soutOne(safetyMask); From c8c65c0ff05f987a834a73ae9bd58a757d636023 Mon Sep 17 00:00:00 2001 From: Dannyj1 <73849717+Dannyj1@users.noreply.github.com> Date: Fri, 10 Feb 2023 17:27:57 +0100 Subject: [PATCH 7/7] New tuned values after bug fix Bench: 10026380 --- src/features.cpp | 2 +- src/pst.cpp | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/features.cpp b/src/features.cpp index adf75969..231228ac 100644 --- a/src/features.cpp +++ b/src/features.cpp @@ -21,7 +21,7 @@ #include namespace Zagreus { - int evalValues[72] = { 96, 112, 362, 352, 378, 364, 534, 547, 1017, 1012, 10, 11, 7, 0, 7, 6, 4, 7, 0, 17, -50, 0, -25, 0, -31, -3, -16, -6, 4, -1, 8, 1, 0, -3, 0, -5, 5, 10, 22, 7, 11, 4, 10, 19, 11, 11, 20, 20, 15, 15, 4, 0, 6, 0, 8, 7, -36, -20, 24, 12, -3, 0, -2, 0, -20, -20, 2, 0, 3, 3, 35, -1, }; + int evalValues[72] = { 101, 111, 360, 349, 374, 358, 539, 538, 1012, 1010, 7, 11, 7, 0, 8, 5, 4, 7, 0, 15, -50, 0, -25, 0, -30, -4, -9, -1, -8, 0, -3, -3, -5, -5, -10, -10, 5, 12, 20, 8, 13, 9, 1, 15, 11, 9, 20, 20, 15, 15, 5, 1, 9, 4, 8, 6, -32, -21, 24, 1, -4, 0, -1, 0, -20, -20, 0, -2, 3, 3, 32, -4, }; int baseEvalValues[72] = { 100, // MIDGAME_PAWN_MATERIAL diff --git a/src/pst.cpp b/src/pst.cpp index 6af90ca8..7125ea0b 100644 --- a/src/pst.cpp +++ b/src/pst.cpp @@ -21,23 +21,23 @@ #include namespace Zagreus { - int midgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 98, 130, 60, 94, 69, 126, 40, -9, -3, 10, 26, 28, 61, 61, 28, -14, -16, 9, 0, 22, 18, 11, 20, -20, -42, -13, -11, 15, 21, 7, 11, -33, -25, 3, -12, -5, 2, -1, 17, -15, -22, 10, -10, -17, -12, 11, 38, -14, 0, 0, 0, 0, 0, 0, 0, 0 }; - int endgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 185, 175, 158, 133, 151, 132, 171, 196, 102, 107, 85, 63, 56, 58, 83, 96, 37, 26, 12, -4, -5, 5, 22, 31, 12, 3, -13, -10, -12, -13, 0, 1, 2, -1, -10, 3, -1, -5, -3, -6, 16, 12, 11, 14, 12, 3, 1, -2, 0, 0, 0, 0, 0, 0, 0, 0 }; + int midgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 98, 130, 59, 98, 66, 124, 34, -7, -2, 9, 28, 32, 62, 60, 31, -16, -12, 11, -1, 19, 19, 17, 22, -16, -41, -10, -11, 16, 23, 11, 10, -31, -26, 0, -9, -8, 0, 0, 17, -18, -23, 12, -6, -16, -10, 7, 38, -13, 0, 0, 0, 0, 0, 0, 0, 0 }; + int endgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0, 185, 175, 159, 136, 145, 130, 173, 191, 104, 106, 86, 70, 60, 62, 91, 89, 35, 23, 5, -4, -8, 5, 24, 27, 6, 1, -7, -14, -9, -13, 4, 5, 2, 3, -11, 0, 0, -4, -3, 0, 14, 11, 11, 15, 14, 4, 0, -6, 0, 0, 0, 0, 0, 0, 0, 0 }; - int midgameKnightTable[64] = { -167, -89, -36, -47, 61, -94, -14, -109, -68, -38, 70, 39, 25, 65, 6, -18, -44, 59, 40, 68, 88, 125, 71, 42, -7, 12, 22, 49, 31, 64, 12, 24, -17, 6, 17, 16, 25, 20, 20, -15, -27, -2, 15, 17, 19, 13, 23, -17, -24, -48, -13, 5, 14, 15, -14, -15, -103, -24, -56, -31, -19, -29, -17, -23 }; - int endgameKnightTable[64] = { -57, -39, -11, -26, -27, -25, -61, -100, -24, -6, -25, 0, -8, -25, -23, -49, -23, -24, 12, 8, 2, -7, -20, -43, -16, 5, 25, 19, 20, 8, 6, -17, -20, -3, 18, 23, 15, 16, 0, -21, -24, -1, -1, 15, 8, -7, -22, -20, -40, -18, -12, -4, -3, -16, -22, -42, -29, -43, -24, -12, -22, -18, -46, -65 }; + int midgameKnightTable[64] = { -166, -89, -34, -48, 59, -95, -15, -108, -72, -37, 76, 36, 23, 61, 2, -17, -48, 59, 38, 67, 86, 128, 74, 45, -8, 11, 18, 46, 38, 60, 19, 24, -13, 6, 16, 19, 31, 19, 22, -9, -22, -8, 18, 10, 18, 13, 18, -13, -25, -53, -13, 2, 7, 17, -12, -12, -107, -24, -54, -27, -17, -25, -19, -23 }; + int endgameKnightTable[64] = { -59, -38, -13, -29, -33, -26, -64, -97, -27, -8, -22, -1, -11, -27, -24, -52, -22, -18, 10, 13, 0, -6, -20, -41, -16, 9, 19, 21, 22, 10, 4, -18, -19, -6, 17, 23, 18, 15, 4, -15, -26, -4, -6, 15, 12, -7, -21, -25, -40, -20, -11, 0, 0, -19, -22, -41, -30, -46, -20, -13, -21, -16, -48, -65 }; - int midgameBishopTable[64] = { -27, 3, -79, -35, -25, -43, 3, -5, -29, 15, -17, -12, 31, 57, 15, -41, -9, 35, 43, 38, 34, 54, 38, 1, 0, 0, 13, 43, 33, 33, 0, -3, -7, 17, 1, 27, 32, 0, 8, 0, 2, 8, 17, 4, 6, 27, 14, 14, 5, 34, 16, 8, 13, 22, 47, 4, -29, -4, -6, -21, -12, 1, -38, -25 }; - int endgameBishopTable[64] = { -11, -18, -7, -4, -7, -9, -19, -21, -11, -3, 3, -11, -3, -12, -2, -13, 4, -3, -1, -3, -3, 7, 2, 4, 0, 13, 12, 3, 13, 7, 2, 3, -9, 3, 10, 18, 2, 8, -6, -13, -9, -6, 6, 9, 13, 3, -4, -12, -13, -16, -6, 0, 8, -9, -10, -27, -22, -10, -13, -1, -7, -13, -5, -14 }; + int midgameBishopTable[64] = { -26, 4, -81, -36, -26, -42, 4, -7, -25, 12, -15, -9, 27, 57, 19, -42, -10, 35, 40, 37, 37, 53, 35, 2, -1, 0, 20, 46, 33, 35, 1, 0, -8, 11, 4, 27, 32, 8, 8, 1, 0, 20, 17, 4, 7, 21, 16, 12, 3, 28, 17, 6, 12, 22, 39, 0, -32, -6, -6, -19, -11, 0, -38, -17 }; + int endgameBishopTable[64] = { -11, -17, -12, -6, -3, -9, -19, -23, -7, -3, 6, -10, -4, -14, -3, -12, 6, -9, 0, 0, 0, 6, 0, 10, 0, 6, 9, 9, 11, 6, 1, 1, -5, 3, 10, 16, 5, 5, -2, -10, -11, -2, 6, 3, 11, 4, -7, -15, -11, -15, -7, 1, 11, -7, -13, -29, -23, -9, -16, 0, -10, -13, -3, -14 }; - int midgameRookTable[64] = { 32, 40, 27, 53, 62, 11, 31, 41, 25, 27, 57, 62, 77, 65, 26, 45, -1, 17, 23, 35, 20, 44, 58, 16, -26, -11, 3, 21, 24, 33, -10, -15, -38, -26, -15, -2, 12, -3, 3, -24, -45, -25, -15, -12, 5, 0, -7, -36, -45, -16, -18, -9, 0, 6, -4, -67, -14, -11, 0, 18, 16, 9, -23, -24 }; - int endgameRookTable[64] = { 10, 7, 12, 13, 8, 11, 7, 2, 10, 12, 11, 10, -8, 9, 8, 2, 10, 8, 6, 5, 6, 0, -6, 0, 4, 2, 11, -2, 1, 1, 0, 6, 2, 5, 8, 0, -1, 0, -10, -8, -1, -1, -2, -3, -7, -12, -9, -17, -4, -7, 0, 4, -4, -8, -7, 1, -3, 2, 5, -2, -5, -8, 8, -14 }; + int midgameRookTable[64] = { 31, 42, 30, 48, 59, 10, 29, 44, 27, 30, 59, 61, 79, 61, 31, 42, -5, 19, 27, 36, 17, 47, 60, 14, -20, -10, 6, 25, 21, 34, -8, -19, -34, -25, -12, -2, 8, -6, 6, -22, -45, -21, -15, -17, 5, 0, -1, -35, -49, -18, -17, -10, 0, 12, -6, -66, -15, -19, 4, 15, 17, 6, -30, -25 }; + int endgameRookTable[64] = { 14, 9, 13, 12, 5, 13, 4, 4, 10, 9, 13, 9, 0, 0, 8, 1, 7, 8, 8, 4, 5, 0, -5, -1, 5, 4, 13, 2, 0, 6, -3, 6, 5, 4, 7, 2, -5, -6, -6, -8, -2, 2, -3, 0, -9, -15, -4, -14, -3, -6, 1, -1, -4, -7, -10, -2, -2, 0, 0, 0, -4, -6, 9, -18 }; - int midgameQueenTable[64] = { -24, 0, 28, 10, 61, 44, 42, 42, -22, -42, -4, -4, -14, 59, 20, 53, -10, -15, 9, 7, 31, 55, 43, 53, -24, -19, -11, -14, -8, 20, -2, 0, -14, -20, -10, -17, -7, -10, 2, -8, -12, 3, -9, 0, -8, 0, 12, 3, -31, -9, 6, 1, 4, 13, 1, 3, 0, -15, -14, 3, 2, -22, -30, -42 }; - int endgameQueenTable[64] = { -4, 22, 22, 25, 30, 17, 9, 18, -15, 18, 33, 39, 57, 24, 30, 0, -15, 6, 9, 50, 46, 33, 17, 5, 3, 23, 26, 41, 53, 39, 58, 37, -17, 28, 19, 43, 29, 32, 38, 23, -17, -26, 13, 2, 6, 15, 7, 3, -20, -22, -26, -15, -19, -24, -34, -28, -32, -26, -20, -38, 4, -28, -17, -39 }; + int midgameQueenTable[64] = { -25, -1, 28, 11, 58, 43, 43, 44, -20, -36, -8, -1, -17, 57, 22, 49, -10, -12, 9, 9, 26, 55, 42, 57, -25, -24, -15, -13, -2, 18, 0, 0, -14, -22, -16, -12, 0, -2, 1, -5, -13, 0, -8, -4, -2, 0, 10, 4, -33, -1, 6, -5, 2, 14, -2, 0, -4, -15, -11, 2, 3, -28, -32, -44 }; + int endgameQueenTable[64] = { -4, 20, 20, 25, 29, 18, 10, 20, -11, 19, 32, 38, 58, 24, 26, 0, -17, 8, 10, 47, 47, 31, 17, 7, 5, 23, 23, 45, 52, 38, 56, 37, -17, 27, 15, 44, 30, 36, 35, 23, -14, -26, 15, 6, 12, 19, 6, 5, -19, -21, -33, -16, -12, -24, -34, -30, -35, -25, -22, -40, 0, -32, -18, -36 }; - int midgameKingTable[64] = { -65, 23, 16, -15, -55, -34, 1, 13, 29, 0, -18, -5, -7, -3, -36, -28, -8, 25, 3, -15, -17, 5, 20, -22, -16, -18, -11, -26, -30, -24, -14, -36, -47, 0, -26, -40, -45, -44, -31, -50, -11, -12, -20, -48, -40, -29, -14, -27, 6, 6, -12, -68, -42, -19, 10, 6, -7, 31, 2, -32, -7, -29, 26, 10 }; - int endgameKingTable[64] = { -73, -33, -17, -18, -10, 14, 4, -16, -11, 17, 18, 17, 18, 39, 24, 11, 9, 19, 25, 18, 23, 41, 45, 14, -9, 25, 23, 30, 24, 35, 26, 2, -16, -3, 19, 23, 31, 26, 12, -9, -19, -3, 11, 20, 23, 14, 7, -8, -26, -11, 3, 16, 12, 7, -7, -21, -50, -39, -22, -3, -31, -16, -31, -51 }; + int midgameKingTable[64] = { -65, 22, 16, -14, -56, -34, 3, 12, 29, -1, -19, -7, -7, -4, -37, -29, -9, 24, 2, -16, -20, 6, 25, -22, -17, -19, -13, -25, -32, -24, -14, -34, -49, -1, -28, -37, -44, -40, -31, -50, -15, -12, -22, -46, -44, -29, -15, -28, 5, 6, -11, -65, -47, -15, 11, 12, -5, 32, 1, -31, -13, -30, 24, 19 }; + int endgameKingTable[64] = { -74, -34, -17, -16, -11, 13, 6, -17, -12, 19, 15, 18, 15, 35, 25, 11, 10, 16, 24, 11, 21, 43, 49, 13, -7, 22, 23, 27, 21, 33, 29, 4, -19, -1, 18, 22, 31, 32, 11, -9, -21, -2, 13, 20, 23, 19, 6, -11, -26, -8, 0, 18, 16, 7, -6, -17, -48, -43, -25, -10, -34, -17, -25, -46 }; /* int midgamePawnTable[64] = { 0, 0, 0, 0, 0, 0, 0, 0,