Skip to content

Commit b782cbc

Browse files
committed
API updates
1 parent 3db8012 commit b782cbc

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

movegen.go

+18-16
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,12 @@ func (b *Board) generatePinnedMoves(moveList *[]Move, allowDest uint64) uint64 {
9191

9292
// Calculate king moves as if it was a rook.
9393
// "king targets" includes our own friendly pieces, for the purpose of identifying pins.
94-
kingOrthoTargets := calculateRookMoveBitboard(ourKingIdx, allPieces)
94+
kingOrthoTargets := CalculateRookMoveBitboard(ourKingIdx, allPieces)
9595
oppRooks := oppPieces.Rooks | oppPieces.Queens
9696
for oppRooks != 0 { // For each opponent ortho slider
9797
currRookIdx := uint8(bits.TrailingZeros64(oppRooks))
9898
oppRooks &= oppRooks - 1
99-
rookTargets := calculateRookMoveBitboard(currRookIdx, allPieces) & (^(oppPieces.All))
99+
rookTargets := CalculateRookMoveBitboard(currRookIdx, allPieces) & (^(oppPieces.All))
100100
// A piece is pinned iff it falls along both attack rays.
101101
pinnedPiece := rookTargets & kingOrthoTargets & ourPieces.All
102102
if pinnedPiece == 0 { // there is no pin
@@ -126,7 +126,7 @@ func (b *Board) generatePinnedMoves(moveList *[]Move, allowDest uint64) uint64 {
126126
continue
127127
}
128128
// all ortho moves, as if it was not pinned
129-
pinnedPieceAllMoves := calculateRookMoveBitboard(pinnedPieceIdx, allPieces) & (^(ourPieces.All))
129+
pinnedPieceAllMoves := CalculateRookMoveBitboard(pinnedPieceIdx, allPieces) & (^(ourPieces.All))
130130
// actually available moves
131131
pinnedTargets := pinnedPieceAllMoves & (rookTargets | kingOrthoTargets | (uint64(1) << currRookIdx))
132132
pinnedTargets &= allowDest
@@ -135,12 +135,12 @@ func (b *Board) generatePinnedMoves(moveList *[]Move, allowDest uint64) uint64 {
135135

136136
// Calculate king moves as if it was a bishop.
137137
// "king targets" includes our own friendly pieces, for the purpose of identifying pins.
138-
kingDiagTargets := calculateBishopMoveBitboard(ourKingIdx, allPieces)
138+
kingDiagTargets := CalculateBishopMoveBitboard(ourKingIdx, allPieces)
139139
oppBishops := oppPieces.Bishops | oppPieces.Queens
140140
for oppBishops != 0 {
141141
currBishopIdx := uint8(bits.TrailingZeros64(oppBishops))
142142
oppBishops &= oppBishops - 1
143-
bishopTargets := calculateBishopMoveBitboard(currBishopIdx, allPieces) & (^(oppPieces.All))
143+
bishopTargets := CalculateBishopMoveBitboard(currBishopIdx, allPieces) & (^(oppPieces.All))
144144
pinnedPiece := bishopTargets & kingDiagTargets & ourPieces.All
145145
if pinnedPiece == 0 { // there is no pin
146146
continue
@@ -180,7 +180,7 @@ func (b *Board) generatePinnedMoves(moveList *[]Move, allowDest uint64) uint64 {
180180
continue
181181
}
182182
// all diag moves, as if it was not pinned
183-
pinnedPieceAllMoves := calculateBishopMoveBitboard(pinnedPieceIdx, allPieces) & (^(ourPieces.All))
183+
pinnedPieceAllMoves := CalculateBishopMoveBitboard(pinnedPieceIdx, allPieces) & (^(ourPieces.All))
184184
// actually available moves
185185
pinnedTargets := pinnedPieceAllMoves & (bishopTargets | kingDiagTargets | (uint64(1) << currBishopIdx))
186186
pinnedTargets &= allowDest
@@ -446,7 +446,7 @@ func (b *Board) rookMoves(moveList *[]Move, nonpinned uint64, allowDest uint64)
446446
for ourRooks != 0 {
447447
currRook := uint8(bits.TrailingZeros64(ourRooks))
448448
ourRooks &= ourRooks - 1
449-
targets := calculateRookMoveBitboard(currRook, allPieces) & (^friendlyPieces) & allowDest
449+
targets := CalculateRookMoveBitboard(currRook, allPieces) & (^friendlyPieces) & allowDest
450450
genMovesFromTargets(moveList, Square(currRook), targets)
451451
}
452452
}
@@ -466,7 +466,7 @@ func (b *Board) bishopMoves(moveList *[]Move, nonpinned uint64, allowDest uint64
466466
for ourBishops != 0 {
467467
currBishop := uint8(bits.TrailingZeros64(ourBishops))
468468
ourBishops &= ourBishops - 1
469-
targets := calculateBishopMoveBitboard(currBishop, allPieces) & (^friendlyPieces) & allowDest
469+
targets := CalculateBishopMoveBitboard(currBishop, allPieces) & (^friendlyPieces) & allowDest
470470
genMovesFromTargets(moveList, Square(currBishop), targets)
471471
}
472472
}
@@ -487,10 +487,10 @@ func (b *Board) queenMoves(moveList *[]Move, nonpinned uint64, allowDest uint64)
487487
currQueen := uint8(bits.TrailingZeros64(ourQueens))
488488
ourQueens &= ourQueens - 1
489489
// bishop motion
490-
diag_targets := calculateBishopMoveBitboard(currQueen, allPieces) & (^friendlyPieces) & allowDest
490+
diag_targets := CalculateBishopMoveBitboard(currQueen, allPieces) & (^friendlyPieces) & allowDest
491491
genMovesFromTargets(moveList, Square(currQueen), diag_targets)
492492
// rook motion
493-
ortho_targets := calculateRookMoveBitboard(currQueen, allPieces) & (^friendlyPieces) & allowDest
493+
ortho_targets := CalculateRookMoveBitboard(currQueen, allPieces) & (^friendlyPieces) & allowDest
494494
genMovesFromTargets(moveList, Square(currQueen), ortho_targets)
495495
}
496496
}
@@ -570,7 +570,7 @@ func (b *Board) countAttacks(byBlack bool, origin uint8, abortEarly int) (int, u
570570
for diag_attackers != 0 {
571571
curr_attacker := uint8(bits.TrailingZeros64(diag_attackers))
572572
diag_attackers &= diag_attackers - 1
573-
diag_attacks := calculateBishopMoveBitboard(curr_attacker, allPieces)
573+
diag_attacks := CalculateBishopMoveBitboard(curr_attacker, allPieces)
574574
attackRay := diag_attacks & origin_diag_rays
575575
blockerDestinations |= attackRay
576576
}
@@ -589,7 +589,7 @@ func (b *Board) countAttacks(byBlack bool, origin uint8, abortEarly int) (int, u
589589
for ortho_attackers != 0 {
590590
curr_attacker := uint8(bits.TrailingZeros64(ortho_attackers))
591591
ortho_attackers &= ortho_attackers - 1
592-
ortho_attacks := calculateRookMoveBitboard(curr_attacker, allPieces)
592+
ortho_attacks := CalculateRookMoveBitboard(curr_attacker, allPieces)
593593
attackRay := ortho_attacks & origin_ortho_rays
594594
blockerDestinations |= attackRay
595595
}
@@ -625,8 +625,9 @@ func (b *Board) countAttacks(byBlack bool, origin uint8, abortEarly int) (int, u
625625

626626
// Calculates the attack bitboard for a rook. This might include targeted squares
627627
// that are actually friendly pieces, so the proper usage is:
628-
// rookTargets := calculateRookMoveBitboard(myRookLoc, allPieces) & (^myPieces)
629-
func calculateRookMoveBitboard(currRook uint8, allPieces uint64) uint64 {
628+
// rookTargets := CalculateRookMoveBitboard(myRookLoc, allPieces) & (^myPieces)
629+
// Externally useful for evaluation functions.
630+
func CalculateRookMoveBitboard(currRook uint8, allPieces uint64) uint64 {
630631
blockers := magicRookBlockerMasks[currRook] & allPieces
631632
dbindex := (blockers * magicNumberRook[currRook]) >> magicRookShifts[currRook]
632633
targets := magicMovesRook[currRook][dbindex]
@@ -635,8 +636,9 @@ func calculateRookMoveBitboard(currRook uint8, allPieces uint64) uint64 {
635636

636637
// Calculates the attack bitboard for a bishop. This might include targeted squares
637638
// that are actually friendly pieces, so the proper usage is:
638-
// bishopTargets := calculateBishopMoveBitboard(myBishopLoc, allPieces) & (^myPieces)
639-
func calculateBishopMoveBitboard(currBishop uint8, allPieces uint64) uint64 {
639+
// bishopTargets := CalculateBishopMoveBitboard(myBishopLoc, allPieces) & (^myPieces)
640+
// Externally useful for evaluation functions.
641+
func CalculateBishopMoveBitboard(currBishop uint8, allPieces uint64) uint64 {
640642
blockers := magicBishopBlockerMasks[currBishop] & allPieces
641643
dbindex := (blockers * magicNumberBishop[currBishop]) >> magicBishopShifts[currBishop]
642644
targets := magicMovesBishop[currBishop][dbindex]

0 commit comments

Comments
 (0)