Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⚖️ Index bishop mobility bonus by attacks count #758

Merged
merged 8 commits into from
May 22, 2024
Merged

⚖️ Index bishop mobility bonus by attacks count #758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4242e78
Add TaperedEvaluationTermByCount
eduherminio May 20, 2024
93a44f4
Modify BishopMobilityBonus to be indexed by count
eduherminio May 20, 2024
4c056d2
Expression body for member
eduherminio May 20, 2024
e54f916
Add tuned values
eduherminio May 20, 2024
213e4eb
Add tuned values to config file as well
eduherminio May 20, 2024
d01ec8b
Merge remote-tracking branch 'origin/main' into eval/index-bishop-mob…
eduherminio May 20, 2024
899b6b7
Merge remote-tracking branch 'origin/main' into eval/index-bishop-mob…
eduherminio May 21, 2024
57d2a4a
Fix bishop mobility tests
eduherminio May 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 77 additions & 19 deletions src/Lynx.Cli/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,42 +60,38 @@
// Evaluation
"IsolatedPawnPenalty": {
"MG": -21,
"EG": -17
"EG": -18
},
"OpenFileRookBonus": {
"MG": 46,
"EG": 9
},
"SemiOpenFileRookBonus": {
"MG": 15,
"EG": 15
},
"BishopMobilityBonus": {
"MG": 10,
"EG": 9
"EG": 14
},
"RookMobilityBonus": {
"MG": 5,
"EG": 5
},
"QueenMobilityBonus": {
"MG": 4,
"EG": 8
"EG": 7
},
"SemiOpenFileKingPenalty": {
"MG": -41,
"MG": -39,
"EG": 21
},
"OpenFileKingPenalty": {
"MG": -110,
"EG": 10
"MG": -105,
"EG": 7
},
"KingShieldBonus": {
"MG": 17,
"EG": -5
"MG": 16,
"EG": -6
},
"BishopPairBonus": {
"MG": 33,
"MG": 31,
"EG": 80
},
"PassedPawnBonus": {
Expand All @@ -104,7 +100,7 @@
"EG": 0
},
"Rank1": {
"MG": 4,
"MG": 2,
"EG": 12
},
"Rank2": {
Expand All @@ -116,21 +112,83 @@
"EG": 47
},
"Rank4": {
"MG": 21,
"MG": 19,
"EG": 80
},
"Rank5": {
"MG": 62,
"EG": 158
"MG": 58,
"EG": 156
},
"Rank6": {
"MG": 104,
"EG": 243
"MG": 95,
"EG": 223
},
"Rank7": {
"MG": 0,
"EG": 0
}
},
"BishopMobilityBonus": {
"Count0": {
"MG": 0,
"EG": 0
},
"Count1": {
"MG": 196,
"EG": 160
},
"Count2": {
"MG": 208,
"EG": 159
},
"Count3": {
"MG": 219,
"EG": 198
},
"Count4": {
"MG": 233,
"EG": 214
},
"Count5": {
"MG": 241,
"EG": 229
},
"Count6": {
"MG": 256,
"EG": 249
},
"Count7": {
"MG": 266,
"EG": 259
},
"Count8": {
"MG": 275,
"EG": 271
},
"Count9": {
"MG": 276,
"EG": 277
},
"Count10": {
"MG": 282,
"EG": 282
},
"Count11": {
"MG": 284,
"EG": 279
},
"Count12": {
"MG": 286,
"EG": 278
},
"Count13": {
"MG": 315,
"EG": 272
},
"Count14": {
"MG": 0,
"EG": 0
}
}
// End of evaluation
},
Expand Down
100 changes: 87 additions & 13 deletions src/Lynx/Configuration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,34 +203,49 @@ public sealed class EngineSettings

#region Evaluation

public TaperedEvaluationTerm IsolatedPawnPenalty { get; set; } = new(-21, -17);
public TaperedEvaluationTerm IsolatedPawnPenalty { get; set; } = new(-21, -18);

public TaperedEvaluationTerm OpenFileRookBonus { get; set; } = new(46, 9);

public TaperedEvaluationTerm SemiOpenFileRookBonus { get; set; } = new(15, 15);

public TaperedEvaluationTerm BishopMobilityBonus { get; set; } = new(10, 9);
public TaperedEvaluationTerm SemiOpenFileRookBonus { get; set; } = new(15, 14);

public TaperedEvaluationTerm RookMobilityBonus { get; set; } = new(5, 5);

public TaperedEvaluationTerm QueenMobilityBonus { get; set; } = new(4, 8);
public TaperedEvaluationTerm QueenMobilityBonus { get; set; } = new(4, 7);

public TaperedEvaluationTerm SemiOpenFileKingPenalty { get; set; } = new(-41, 21);
public TaperedEvaluationTerm SemiOpenFileKingPenalty { get; set; } = new(-39, 21);

public TaperedEvaluationTerm OpenFileKingPenalty { get; set; } = new(-110, 10);
public TaperedEvaluationTerm OpenFileKingPenalty { get; set; } = new(-105, 7);

public TaperedEvaluationTerm KingShieldBonus { get; set; } = new(17, -5);
public TaperedEvaluationTerm KingShieldBonus { get; set; } = new(16, -6);

public TaperedEvaluationTerm BishopPairBonus { get; set; } = new(33, 80);
public TaperedEvaluationTerm BishopPairBonus { get; set; } = new(31, 80);

public TaperedEvaluationTermByRank PassedPawnBonus { get; set; } = new(
new(0, 0),
new(4, 12),
new(2, 12),
new(-11, 19),
new(-11, 47),
new(21, 80),
new(62, 158),
new(104, 243),
new(19, 80),
new(58, 156),
new(95, 223),
new(0, 0));

public TaperedEvaluationTermByCount BishopMobilityBonus { get; set; } = new(
new(0, 0),
new(196, 160),
new(208, 159),
new(219, 198),
new(233, 214),
new(241, 229),
new(256, 249),
new(266, 259),
new(275, 271),
new(276, 277),
new(282, 282),
new(284, 279),
new(286, 278),
new(315, 272),
new(0, 0));

#endregion
Expand Down Expand Up @@ -327,6 +342,65 @@ public override string ToString()
}
}

/// <summary>
/// 13 for bishop,
/// 14 bor rook
/// </summary>
public sealed class TaperedEvaluationTermByCount
{
private readonly List<TaperedEvaluationTerm> _evaluationTermsIndexedByCount;

public TaperedEvaluationTerm Count0 => _evaluationTermsIndexedByCount[0];
public TaperedEvaluationTerm Count1 => _evaluationTermsIndexedByCount[1];
public TaperedEvaluationTerm Count2 => _evaluationTermsIndexedByCount[2];
public TaperedEvaluationTerm Count3 => _evaluationTermsIndexedByCount[3];
public TaperedEvaluationTerm Count4 => _evaluationTermsIndexedByCount[4];
public TaperedEvaluationTerm Count5 => _evaluationTermsIndexedByCount[5];
public TaperedEvaluationTerm Count6 => _evaluationTermsIndexedByCount[6];
public TaperedEvaluationTerm Count7 => _evaluationTermsIndexedByCount[7];
public TaperedEvaluationTerm Count8 => _evaluationTermsIndexedByCount[8];
public TaperedEvaluationTerm Count9 => _evaluationTermsIndexedByCount[9];
public TaperedEvaluationTerm Count10 => _evaluationTermsIndexedByCount[10];
public TaperedEvaluationTerm Count11 => _evaluationTermsIndexedByCount[11];
public TaperedEvaluationTerm Count12 => _evaluationTermsIndexedByCount[12];
public TaperedEvaluationTerm Count13 => _evaluationTermsIndexedByCount[13];
public TaperedEvaluationTerm Count14 => _evaluationTermsIndexedByCount[14];

public TaperedEvaluationTermByCount(
TaperedEvaluationTerm rank0, TaperedEvaluationTerm rank1, TaperedEvaluationTerm rank2,
TaperedEvaluationTerm rank3, TaperedEvaluationTerm rank4, TaperedEvaluationTerm rank5,
TaperedEvaluationTerm rank6, TaperedEvaluationTerm rank7, TaperedEvaluationTerm rank8,
TaperedEvaluationTerm rank9, TaperedEvaluationTerm rank10, TaperedEvaluationTerm rank11,
TaperedEvaluationTerm rank12, TaperedEvaluationTerm rank13, TaperedEvaluationTerm rank14)
{
_evaluationTermsIndexedByCount =
[rank0, rank1, rank2, rank3, rank4, rank5, rank6, rank7, rank8, rank9, rank10, rank11, rank12, rank13, rank14];
}

public TaperedEvaluationTerm this[int i] => _evaluationTermsIndexedByCount[i];

public override string ToString()
{
return "{" +
$"\"{nameof(Count0)}\":{Count0}," +
$"\"{nameof(Count1)}\":{Count1}," +
$"\"{nameof(Count2)}\":{Count2}," +
$"\"{nameof(Count3)}\":{Count3}," +
$"\"{nameof(Count4)}\":{Count4}," +
$"\"{nameof(Count5)}\":{Count5}," +
$"\"{nameof(Count6)}\":{Count6}," +
$"\"{nameof(Count7)}\":{Count7}," +
$"\"{nameof(Count8)}\":{Count8}," +
$"\"{nameof(Count9)}\":{Count9}," +
$"\"{nameof(Count10)}\":{Count10}," +
$"\"{nameof(Count11)}\":{Count11}," +
$"\"{nameof(Count12)}\":{Count12}," +
$"\"{nameof(Count13)}\":{Count13}," +
$"\"{nameof(Count14)}\":{Count14}" +
"}";
}
}

[JsonSourceGenerationOptions(
GenerationMode = JsonSourceGenerationMode.Default, WriteIndented = true)] // https://github.com/dotnet/runtime/issues/78602#issuecomment-1322004254
[JsonSerializable(typeof(EngineSettings))]
Expand Down
Loading
Loading