Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@eduherminio
eduherminio committed May 16, 2024
1 parent de329a0 commit dfecfc1
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 61 deletions.
30 changes: 14 additions & 16 deletions src/Lynx/Configuration.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,36 +203,34 @@ public sealed class EngineSettings

#region Evaluation

//public TaperedEvaluationTerm DoubledPawnPenalty { get; set; } = new(-6, -12);
public TaperedEvaluationTerm IsolatedPawnPenalty { get; set; } = new(-21, -17);

public TaperedEvaluationTerm IsolatedPawnPenalty { get; set; } = new(-17, -13);
public TaperedEvaluationTerm OpenFileRookBonus { get; set; } = new(46, 9);

public TaperedEvaluationTerm OpenFileRookBonus { get; set; } = new(47, 10);

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

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

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

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

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

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

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

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

public TaperedEvaluationTermByRank PassedPawnBonus { get; set; } = new(
new(0, 0),
new(-2, 7),
new(-15, 13),
new(-14, 41),
new(20, 74),
new(60, 150),
new(98, 217),
new(4, 12),
new(-11, 19),
new(-11, 47),
new(21, 80),
new(62, 158),
new(104, 243),
new(0, 0));

#endregion
Expand Down
6 changes: 0 additions & 6 deletions src/Lynx/Model/Position.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -867,12 +867,6 @@ private int PawnAdditionalEvaluation(int squareIndex, int pieceIndex)
{
int packedBonus = 0;

//var doublePawnsCount = (PieceBitBoards[pieceIndex] & Masks.FileMasks[squareIndex]).CountBits();
//if (doublePawnsCount > 1)
//{
// packedBonus += doublePawnsCount * Configuration.EngineSettings.DoubledPawnPenalty.PackedEvaluation;
//}

if ((PieceBitBoards[pieceIndex] & Masks.IsolatedPawnMasks[squareIndex]) == default) // isIsolatedPawn
{
packedBonus += Configuration.EngineSettings.IsolatedPawnPenalty.PackedEvaluation;
Expand Down
78 changes: 39 additions & 39 deletions tests/Lynx.Test/Model/PositionTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,25 +230,25 @@ public void StaticEvaluation_IsolatedPawnPenalty(string fen)
/// a b c d e f g h
/// </summary>
/// <param name="fen"></param>
[TestCase("4k3/ppp5/8/8/8/P7/PP6/4K3 w - - 0 1")]
/// <summary>
/// Previous one mirrored
/// </summary>
/// <param name="fen"></param>
[TestCase("3k4/6pp/7p/8/8/8/5PPP/3K4 b - - 0 1")]
public void StaticEvaluation_DoublePawnPenalty(string fen)
{
Position position = new Position(fen);
int evaluation = AdditionalPieceEvaluation(position, Piece.P)
- AdditionalPieceEvaluation(position, Piece.p);

if (position.Side == Side.Black)
{
evaluation = -evaluation;
}

Assert.AreEqual(4 * Configuration.EngineSettings.DoubledPawnPenalty.MG, evaluation);
}
//[TestCase("4k3/ppp5/8/8/8/P7/PP6/4K3 w - - 0 1")]
///// <summary>
///// Previous one mirrored
///// </summary>
///// <param name="fen"></param>
//[TestCase("3k4/6pp/7p/8/8/8/5PPP/3K4 b - - 0 1")]
//public void StaticEvaluation_DoublePawnPenalty(string fen)
//{
// Position position = new Position(fen);
// int evaluation = AdditionalPieceEvaluation(position, Piece.P)
// - AdditionalPieceEvaluation(position, Piece.p);

// if (position.Side == Side.Black)
// {
// evaluation = -evaluation;
// }

// Assert.AreEqual(4 * Configuration.EngineSettings.DoubledPawnPenalty.MG, evaluation);
//}

/// <summary>
/// Illegal position, but avoids any positional bonuses
Expand All @@ -263,25 +263,25 @@ public void StaticEvaluation_DoublePawnPenalty(string fen)
/// a b c d e f g h
/// </summary>
/// <param name="fen"></param>
[TestCase("7k/ppp2ppp/8/8/8/P7/PP4PP/P6K w - - 0 1")]
/// <summary>
/// Previous one mirrored
/// </summary>
/// <param name="fen"></param>
[TestCase("k6p/pp4pp/7p/8/8/8/PPP2PPP/K7 b - - 0 1")]
public void StaticEvaluation_TriplePawnPenalty(string fen)
{
Position position = new Position(fen);
int evaluation = AdditionalPieceEvaluation(position, Piece.P)
- AdditionalPieceEvaluation(position, Piece.p);

if (position.Side == Side.Black)
{
evaluation = -evaluation;
}

Assert.AreEqual(9 * Configuration.EngineSettings.DoubledPawnPenalty.MG, evaluation);
}
//[TestCase("7k/ppp2ppp/8/8/8/P7/PP4PP/P6K w - - 0 1")]
///// <summary>
///// Previous one mirrored
///// </summary>
///// <param name="fen"></param>
//[TestCase("k6p/pp4pp/7p/8/8/8/PPP2PPP/K7 b - - 0 1")]
//public void StaticEvaluation_TriplePawnPenalty(string fen)
//{
// Position position = new Position(fen);
// int evaluation = AdditionalPieceEvaluation(position, Piece.P)
// - AdditionalPieceEvaluation(position, Piece.p);

// if (position.Side == Side.Black)
// {
// evaluation = -evaluation;
// }

// Assert.AreEqual(9 * Configuration.EngineSettings.DoubledPawnPenalty.MG, evaluation);
//}

/// <summary>
/// 8 . . . . . . k .
Expand Down Expand Up @@ -422,7 +422,7 @@ public void StaticEvaluation_PassedPawnBonus(string fen, BoardSquare square)
}

Assert.AreEqual(
(-4 * Configuration.EngineSettings.DoubledPawnPenalty.MG)
//(-4 * Configuration.EngineSettings.DoubledPawnPenalty.MG)
+ Configuration.EngineSettings.IsolatedPawnPenalty.MG
+ Configuration.EngineSettings.PassedPawnBonus[rank].MG,

Expand Down

0 comments on commit dfecfc1

Please sign in to comment.