Move neighbour count to generation calculation

This commit is contained in:
Andrew Cooper
2022-09-09 07:57:51 +10:00
parent 3042247e06
commit 8994d9b03c
3 changed files with 21 additions and 12 deletions

View File

@@ -34,6 +34,8 @@ internal class Board
public int Player1Count => _cellCounts[Player1];
public int Player2Count => _cellCounts[Player2];
internal bool IsEmptyAt(Coordinates coordinates) => (this[coordinates] & PieceMask) == Empty;
public string? Result =>
(Player1Count, Player2Count) switch
{
@@ -43,6 +45,12 @@ internal class Board
_ => null
};
internal void ClearCell(Coordinates coordinates) => this[coordinates] = Empty;
internal void AddPlayer1Piece(Coordinates coordinates) => this[coordinates] = Player1;
internal void AddPlayer2Piece(Coordinates coordinates) => this[coordinates] = Player2;
public void CalculateNextGeneration()
{
_cellCounts[Empty] = _cellCounts[Player1] = _cellCounts[Player2] = 0;
@@ -63,9 +71,11 @@ internal class Board
_cellCounts[newValue]++;
}
}
CountNeighbours();
}
public void CalculateNeighbours()
private void CountNeighbours()
{
for (var x = 1; x <= 5; x++)
{
@@ -97,7 +107,7 @@ internal class Board
}
private string GetDisplay(int x, int y) =>
(x, y, this[x, y]) switch
(x, y, this[x, y] & PieceMask) switch
{
(0 or 6, _, _) => $" {y % 6} ",
(_, 0 or 6, _) => $" {x % 6} ",