cdricms/swift-chess
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linear + Diagonal moves

Browse Source
This commit is contained in:
cdricms
2024-06-27 18:09:01 +02:00
parent bc145da022
commit 8b5c2a592e
11 changed files with 179 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Sources/Engine/Board.swift
View File

@@ -60,17 +60,17 @@ public class Board: CustomStringConvertible {
let piece: Piece = let piece: Piece =
switch k { switch k {
case .Pawn: case .Pawn:
Pawn(color: c, on: .init(file: file, rank: rank)) Pawn(color: c, on: .init(rank: rank, file: file))
case .Knight: case .Knight:
Knight(color: c, on: .init(file: file, rank: rank)) Knight(color: c, on: .init(rank: rank, file: file))
case .Bishop: case .Bishop:
Bishop(color: c, on: .init(file: file, rank: rank)) Bishop(color: c, on: .init(rank: rank, file: file))
case .Rook: case .Rook:
Rook(color: c, on: .init(file: file, rank: rank)) Rook(color: c, on: .init(rank: rank, file: file))
case .Queen: case .Queen:
Queen(color: c, on: .init(file: file, rank: rank)) Queen(color: c, on: .init(rank: rank, file: file))
case .King: case .King:
King(color: c, on: .init(file: file, rank: rank)) King(color: c, on: .init(rank: rank, file: file))
} }
b[8*r+Int(file)-1].piece = piece b[8*r+Int(file)-1].piece = piece
case .none: case .none:
@@ -96,7 +96,7 @@ public class Board: CustomStringConvertible {
for i in 0...63 { for i in 0...63 {
let index = Int8(i) let index = Int8(i)
let square = Square( let square = Square(
position: .init(file: (index % 8) + 1, rank: rank), position: .init(rank: rank, file: (index % 8) + 1),
index: i, index: i,
color: index % 2 != rank % 2 ? .Black : .White) color: index % 2 != rank % 2 ? .Black : .White)
squares.append(square) squares.append(square)
@@ -135,7 +135,9 @@ public class Board: CustomStringConvertible {
} }
public subscript(pos: Square.Position) -> Square? { public subscript(pos: Square.Position) -> Square? {
let i = pos.index guard let i = pos.index else {
return nil
}
if i > squares.count { if i > squares.count {
return nil return nil
} }

22
Sources/Engine/Pieces/Bishop.swift
View File

@@ -1,27 +1,27 @@
internal final class Bishop: Piece, DiagonalMoves { final class Bishop: Piece, DiagonalMoves {
internal weak var board: Board? weak var board: Board?
internal var kind: Kind = .Bishop var kind: Kind = .Bishop
internal var unicodeRepresentation: String { var unicodeRepresentation: String {
return color == .Black ? "♝" : "♗" return color == .Black ? "♝" : "♗"
} }
internal var color: Color var color: Color
internal var position: Square.Position var position: Square.Position
internal var pseudoLegalPositions: [Square.Position] { var pseudoLegalPositions: [Square.Position] {
return getDiagonalMoves(from: position) return getDiagonalMoves(from: position)
} }
internal var legalPositions: [Square.Position] { var legalPositions: [Square.Position] {
return pseudoLegalPositions.filter { isLegal(on: $0) } return pseudoLegalPositions.filter { isLegal(on: $0) }
} }
internal func move(to dst: Square.Position) -> Bool { func move(to dst: Square.Position) -> Bool {
return false return false
} }
internal func isLegal(on pos: Square.Position) -> Bool { func isLegal(on pos: Square.Position) -> Bool {
if let board = board, let s = board[pos] { if let board = board, let s = board[pos] {
if let p = s.piece { if let p = s.piece {
if p.color == color { return false } if p.color == color { return false }
@@ -34,7 +34,7 @@ internal final class Bishop: Piece, DiagonalMoves {
return true return true
} }
internal init(color: Color, on position: Square.Position) { init(color: Color, on position: Square.Position) {
self.color = color self.color = color
self.position = position self.position = position
} }

24
Sources/Engine/Pieces/CommonMoves.swift
View File

@@ -1,19 +1,35 @@
internal protocol DiagonalMoves { protocol DiagonalMoves {
func getDiagonalMoves(from pos: Square.Position) -> [Square.Position] func getDiagonalMoves(from pos: Square.Position) -> [Square.Position]
} }
extension DiagonalMoves { extension DiagonalMoves {
func getDiagonalMoves(from pos: Square.Position) -> [Square.Position] { func getDiagonalMoves(from pos: Square.Position) -> [Square.Position] {
return [] var squares = [Square.Position]()
for i: (Int8, Int8) in [(1, -1), (1, 1), (-1, 1), (-1, -1)] {
var currentSquare = pos + i
while currentSquare.index != nil {
squares.append(currentSquare)
currentSquare += i
}
}
return squares
} }
} }
internal protocol LinearMoves { protocol LinearMoves {
func getLinearMoves(from pos: Square.Position) -> [Square.Position] func getLinearMoves(from pos: Square.Position) -> [Square.Position]
} }
extension LinearMoves { extension LinearMoves {
func getLinearMoves(from pos: Square.Position) -> [Square.Position] { func getLinearMoves(from pos: Square.Position) -> [Square.Position] {
return [] var squares = [Square.Position]()
for i: (Int8, Int8) in [(1, 0), (0, 1), (-1, 0), (0, -1)] {
var currentSquare = pos + i
while currentSquare.index != nil {
squares.append(currentSquare)
currentSquare += i
}
}
return squares
} }
} }

22
Sources/Engine/Pieces/King.swift
View File

@@ -1,27 +1,27 @@
internal final class King: Piece { final class King: Piece {
internal weak var board: Board? weak var board: Board?
internal var kind: Kind = .King var kind: Kind = .King
internal var unicodeRepresentation: String { var unicodeRepresentation: String {
return color == .Black ? "♛" : "♕" return color == .Black ? "♛" : "♕"
} }
internal var color: Color var color: Color
internal var position: Square.Position var position: Square.Position
internal var pseudoLegalPositions: [Square.Position] { var pseudoLegalPositions: [Square.Position] {
return [] return []
} }
internal var legalPositions: [Square.Position] { var legalPositions: [Square.Position] {
return pseudoLegalPositions.filter { isLegal(on: $0) } return pseudoLegalPositions.filter { isLegal(on: $0) }
} }
internal func move(to dst: Square.Position) -> Bool { func move(to dst: Square.Position) -> Bool {
return false return false
} }
internal func isLegal(on pos: Square.Position) -> Bool { func isLegal(on pos: Square.Position) -> Bool {
if let board = board, let s = board[pos] { if let board = board, let s = board[pos] {
if let p = s.piece { if let p = s.piece {
if p.color == color { return false } if p.color == color { return false }
@@ -35,7 +35,7 @@ internal final class King: Piece {
return true return true
} }
internal init(color: Color, on position: Square.Position) { init(color: Color, on position: Square.Position) {
self.color = color self.color = color
self.position = position self.position = position
} }

43
Sources/Engine/Pieces/Knight.swift
View File

@@ -1,40 +1,37 @@
internal final class Knight: Piece { final class Knight: Piece {
internal weak var board: Board? weak var board: Board?
internal var kind: Kind = .Knight var kind: Kind = .Knight
internal var unicodeRepresentation: String { var unicodeRepresentation: String {
return color == .Black ? "♞" : "♘" return color == .Black ? "♞" : "♘"
} }
internal var color: Color var color: Color
internal var position: Square.Position var position: Square.Position
internal var pseudoLegalPositions: [Square.Position] { var pseudoLegalPositions: [Square.Position] {
let directions: [Square.Position] = [ let directions: [Square.Position] = [
.init(file: position.file + 1, rank: position.rank + 2), .init(rank: position.rank + 2, file: position.file + 1),
.init(file: position.file - 1, rank: position.rank + 2), .init(rank: position.rank + 2, file: position.file - 1),
.init(file: position.file + 1, rank: position.rank - 2), .init(rank: position.rank - 2, file: position.file + 1),
.init(file: position.file - 1, rank: position.rank - 2), .init(rank: position.rank - 2, file: position.file - 1),
.init(file: position.file + 2, rank: position.rank + 1), .init(rank: position.rank + 1, file: position.file + 2),
.init(file: position.file - 2, rank: position.rank + 1), .init(rank: position.rank + 1, file: position.file - 2),
.init(file: position.file + 2, rank: position.rank - 1), .init(rank: position.rank - 1, file: position.file + 2),
.init(file: position.file - 2, rank: position.rank - 1) .init(rank: position.rank - 1, file: position.file - 2)
] ]
return directions.filter { return directions.filter { $0.index != nil }
let index = $0.index
return index < 0 || index > 63
}
} }
internal var legalPositions: [Square.Position] { var legalPositions: [Square.Position] {
return pseudoLegalPositions.filter { isLegal(on: $0) } return pseudoLegalPositions.filter { isLegal(on: $0) }
} }
internal func move(to dst: Square.Position) -> Bool { func move(to dst: Square.Position) -> Bool {
return false return false
} }
internal func isLegal(on pos: Square.Position) -> Bool { func isLegal(on pos: Square.Position) -> Bool {
if let board = board, let s = board[pos] { if let board = board, let s = board[pos] {
if let p = s.piece { if let p = s.piece {
if p.color == color { return false } if p.color == color { return false }
@@ -48,7 +45,7 @@ internal final class Knight: Piece {
return true return true
} }
internal init(color: Color, on position: Square.Position) { init(color: Color, on position: Square.Position) {
self.color = color self.color = color
self.position = position self.position = position
} }

35
Sources/Engine/Pieces/Pawn.swift
View File

@@ -1,32 +1,29 @@
internal final class Pawn: Piece { final class Pawn: Piece {
internal var kind: Kind = .Pawn var kind: Kind = .Pawn
internal weak var board: Board? weak var board: Board?
internal var color: Color var color: Color
internal var position: Square.Position var position: Square.Position
internal var pseudoLegalPositions: [Square.Position] { var pseudoLegalPositions: [Square.Position] {
let sign: Int8 = color == .Black ? -1 : 1 let sign: Int8 = color == .Black ? -1 : 1
let rank = Int8(position.rank) let rank = Int8(position.rank)
let directions: [Square.Position] = [ let directions: [Square.Position] = [
.init(file: position.file, rank: rank + 1 * sign), .init(rank: rank + 1 * sign, file: position.file),
.init(file: position.file, rank: rank + 2 * sign), .init(rank: rank + 2 * sign, file: position.file),
.init(file: position.file + 1, rank: rank + 1 * sign), .init(rank: rank + 1 * sign, file: position.file + 1),
.init(file: position.file - 1, rank: rank + 1 * sign) .init(rank: rank + 1 * sign, file: position.file - 1)
] ]
// TODO: Handle en passant // TODO: Handle en passant
return directions.filter { return directions.filter { $0.index != nil }
let index = $0.index
return index < 1 || index > 63
} }
} var legalPositions: [Square.Position] {
internal var legalPositions: [Square.Position] {
pseudoLegalPositions.filter { isLegal(on: $0) } pseudoLegalPositions.filter { isLegal(on: $0) }
} }
internal var unicodeRepresentation: String { var unicodeRepresentation: String {
color == .Black ? "♟" : "♙" color == .Black ? "♟" : "♙"
} }
internal func move(to dst: Square.Position) -> Bool { func move(to dst: Square.Position) -> Bool {
guard board != nil else { guard board != nil else {
return false return false
} }
@@ -45,7 +42,7 @@ internal final class Pawn: Piece {
return true return true
} }
internal func isLegal(on pos: Square.Position) -> Bool { func isLegal(on pos: Square.Position) -> Bool {
// TODO: Handle "En-Passant" // TODO: Handle "En-Passant"
if let board = board, let s = board[pos] { if let board = board, let s = board[pos] {
if let p = s.piece { if let p = s.piece {
@@ -60,7 +57,7 @@ internal final class Pawn: Piece {
return true return true
} }
internal init( init(
color: Color, on position: Square.Position color: Color, on position: Square.Position
) { ) {
self.color = color self.color = color

8
Sources/Engine/Pieces/Piece.swift
View File

@@ -1,7 +1,7 @@
internal enum Kind: String, CaseIterable { enum Kind: String, CaseIterable {
case Pawn, Knight, Bishop, Rook, Queen, King case Pawn, Knight, Bishop, Rook, Queen, King
internal var value: Int8 { var value: Int8 {
switch self { switch self {
case .Pawn: 1 case .Pawn: 1
case .Bishop: 3 case .Bishop: 3
@@ -12,7 +12,7 @@ internal enum Kind: String, CaseIterable {
} }
} }
internal static subscript(_ c: Character) -> (Self, Color)? { static subscript(_ c: Character) -> (Self, Color)? {
let v = c.uppercased() let v = c.uppercased()
guard guard
@@ -39,7 +39,7 @@ internal enum Kind: String, CaseIterable {
} }
} }
internal protocol Piece { protocol Piece {
var board: Board? { get } var board: Board? { get }
var color: Color { get } var color: Color { get }
var unicodeRepresentation: String { get } var unicodeRepresentation: String { get }

22
Sources/Engine/Pieces/Queen.swift
View File

@@ -1,28 +1,28 @@
internal final class Queen: Piece, LinearMoves, DiagonalMoves { final class Queen: Piece, LinearMoves, DiagonalMoves {
internal weak var board: Board? weak var board: Board?
internal var kind: Kind = .Queen var kind: Kind = .Queen
internal var unicodeRepresentation: String { var unicodeRepresentation: String {
return color == .Black ? "♛" : "♕" return color == .Black ? "♛" : "♕"
} }
internal var color: Color var color: Color
internal var position: Square.Position var position: Square.Position
internal var pseudoLegalPositions: [Square.Position] { var pseudoLegalPositions: [Square.Position] {
return getDiagonalMoves(from: position) + getLinearMoves(from: position) return getDiagonalMoves(from: position) + getLinearMoves(from: position)
} }
internal var legalPositions: [Square.Position] { var legalPositions: [Square.Position] {
return pseudoLegalPositions.filter { isLegal(on: $0) } return pseudoLegalPositions.filter { isLegal(on: $0) }
} }
internal func move(to dst: Square.Position) -> Bool { func move(to dst: Square.Position) -> Bool {
return false return false
} }
internal func isLegal(on pos: Square.Position) -> Bool { func isLegal(on pos: Square.Position) -> Bool {
if let board = board, let s = board[pos] { if let board = board, let s = board[pos] {
if let p = s.piece { if let p = s.piece {
if p.color == color { return false } if p.color == color { return false }
@@ -36,7 +36,7 @@ internal final class Queen: Piece, LinearMoves, DiagonalMoves {
return true return true
} }
internal init(color: Color, on position: Square.Position) { init(color: Color, on position: Square.Position) {
self.color = color self.color = color
self.position = position self.position = position
} }

22
Sources/Engine/Pieces/Rook.swift
View File

@@ -1,27 +1,27 @@
internal final class Rook: Piece, LinearMoves { final class Rook: Piece, LinearMoves {
internal weak var board: Board? weak var board: Board?
internal var kind: Kind = .Rook var kind: Kind = .Rook
internal var unicodeRepresentation: String { var unicodeRepresentation: String {
return color == .Black ? "♜" : "♖" return color == .Black ? "♜" : "♖"
} }
internal var color: Color var color: Color
internal var position: Square.Position var position: Square.Position
internal var pseudoLegalPositions: [Square.Position] { var pseudoLegalPositions: [Square.Position] {
return getLinearMoves(from: position) return getLinearMoves(from: position)
} }
internal var legalPositions: [Square.Position] { var legalPositions: [Square.Position] {
return pseudoLegalPositions.filter { isLegal(on: $0) } return pseudoLegalPositions.filter { isLegal(on: $0) }
} }
internal func move(to dst: Square.Position) -> Bool { func move(to dst: Square.Position) -> Bool {
return false return false
} }
internal func isLegal(on pos: Square.Position) -> Bool { func isLegal(on pos: Square.Position) -> Bool {
if let board = board, let s = board[pos] { if let board = board, let s = board[pos] {
if let p = s.piece { if let p = s.piece {
if p.color == color { return false } if p.color == color { return false }
@@ -35,7 +35,7 @@ internal final class Rook: Piece, LinearMoves {
return true return true
} }
internal init(color: Color, on position: Square.Position) { init(color: Color, on position: Square.Position) {
self.color = color self.color = color
self.position = position self.position = position
} }

23
Sources/Engine/Square.swift
View File

@@ -1,16 +1,35 @@
public struct Square: Equatable { public struct Square: Equatable {
public struct Position: Equatable { public struct Position: Equatable {
public let file: Int8
public let rank: Int8 public let rank: Int8
public let file: Int8
public var index: Int { public var index: Int? {
guard (rank > 0 && rank < 9) && (file > 0 && file < 9) else {
return nil
}
return Int(8*(8-rank)+file-1) return Int(8*(8-rank)+file-1)
} }
public static func == (lhs: Position, rhs: Position) -> Bool { public static func == (lhs: Position, rhs: Position) -> Bool {
return lhs.index == rhs.index return lhs.index == rhs.index
} }
public static func + (lhs: Position, rhs: Position) -> Position {
.init(rank: lhs.rank + rhs.rank, file: lhs.file + rhs.file)
}
public static func + (lhs: Position, rhs: (Int8, Int8)) -> Position {
.init(rank: lhs.rank + rhs.0, file: lhs.file + rhs.1)
}
public static func += (lhs: inout Position, rhs: Position) {
lhs = lhs + rhs
}
public static func += (lhs: inout Position, rhs: (Int8, Int8)) {
lhs = lhs + rhs
}
} }
public let position: Position public let position: Position

48
Tests/EngineTests/EngineTests.swift
View File

@@ -7,16 +7,56 @@ final class EngineTests: XCTestCase {
super.setUp() super.setUp()
} }
func testPositionIndex() throws { func testPositionIndex() throws {
var rank = 9 var rank: Int8 = 9
for i in 0..<64 { for i: Int8 in 0..<64 {
let file = (i % 8) + 1 let file = (i % 8) + 1
if file - 1 == 0 { if file - 1 == 0 {
rank -= 1 rank -= 1
} }
let pos: Square.Position = .init(file: UInt8(file), rank: UInt8(rank)) let pos: Square.Position = .init(rank: rank, file: file)
XCTAssertTrue(pos.index == i, "Expected \(i) got \(pos.index)") XCTAssertTrue(pos.index == Int(i), "Expected \(i) got \(pos.index!)")
} }
} }
func testDiagonalMoves() throws {
let b: Bishop = .init(color: .White, on: .init(rank: 4, file: 4))
let result = [
Square.Position(rank: 5, file: 3),
Square.Position(rank: 6, file: 2),
Square.Position(rank: 7, file: 1),
Square.Position(rank: 5, file: 5),
Square.Position(rank: 6, file: 6),
Square.Position(rank: 7, file: 7),
Square.Position(rank: 8, file: 8),
Square.Position(rank: 3, file: 5),
Square.Position(rank: 2, file: 6),
Square.Position(rank: 1, file: 7),
Square.Position(rank: 3, file: 3),
Square.Position(rank: 2, file: 2),
Square.Position(rank: 1, file: 1),
]
XCTAssertEqual(result, b.pseudoLegalPositions)
}
func testLinearMoves() throws {
let r: Rook = .init(color: .White, on: .init(rank: 4, file: 4))
let result = [
Square.Position(rank: 5, file: 4),
Square.Position(rank: 6, file: 4),
Square.Position(rank: 7, file: 4),
Square.Position(rank: 8, file: 4),
Square.Position(rank: 4, file: 5),
Square.Position(rank: 4, file: 6),
Square.Position(rank: 4, file: 7),
Square.Position(rank: 4, file: 8),
Square.Position(rank: 3, file: 4),
Square.Position(rank: 2, file: 4),
Square.Position(rank: 1, file: 4),
Square.Position(rank: 4, file: 3),
Square.Position(rank: 4, file: 2),
Square.Position(rank: 4, file: 1),
]
XCTAssertEqual(result, r.pseudoLegalPositions)
}
// func testBoard() throws { // func testBoard() throws {
// let board = Board() // let board = Board()
// } // }