Skip to content

LegalAllで歩などの不成が生成されないバグを修正 #45

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

LegalAllで歩などの不成が生成されないバグを修正 #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 11 additions & 11 deletions cppshogi/generateMoves.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,22 +503,22 @@ namespace {
// 王手が掛かっていないときの指し手生成
// これには、玉が相手駒の利きのある地点に移動する自殺手と、pin されている駒を動かす自殺手を含む。
// ここで生成した手は pseudo legal
template <Color US> struct GenerateMoves<NonEvasion, US> {
template <Color US, bool ALL> struct GenerateMoves<NonEvasion, US, ALL> {
/*FORCE_INLINE*/ ExtMove* operator () (ExtMove* moveList, const Position& pos) {
Bitboard target = pos.emptyBB();

moveList = generateDropMoves<US>(moveList, pos, target);
target |= pos.bbOf(oppositeColor(US));
const Square ksq = pos.kingSquare(oppositeColor(US));

moveList = GeneratePieceMoves<NonEvasion, Pawn , US, false>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, Lance , US, false>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, Knight , US, false>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, Silver , US, false>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, Bishop , US, false>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, Rook , US, false>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, GoldHorseDragon, US, false>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, King , US, false>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, Pawn , US, ALL>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, Lance , US, ALL>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, Knight , US, ALL>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, Silver , US, ALL>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, Bishop , US, ALL>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, Rook , US, ALL>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, GoldHorseDragon, US, ALL>()(moveList, pos, target, ksq);
moveList = GeneratePieceMoves<NonEvasion, King , US, ALL>()(moveList, pos, target, ksq);

return moveList;
}
Expand All @@ -533,7 +533,7 @@ namespace {
const Bitboard pinned = pos.pinnedBB();

moveList = pos.inCheck() ?
GenerateMoves<Evasion, US>()(moveList, pos) : GenerateMoves<NonEvasion, US>()(moveList, pos);
GenerateMoves<Evasion, US, false>()(moveList, pos) : GenerateMoves<NonEvasion, US, false>()(moveList, pos);

// 玉の移動による自殺手と、pinされている駒の移動による自殺手を削除
while (curr != moveList) {
Expand All @@ -555,7 +555,7 @@ namespace {
const Bitboard pinned = pos.pinnedBB();

moveList = pos.inCheck() ?
GenerateMoves<Evasion, US, true>()(moveList, pos) : GenerateMoves<NonEvasion, US>()(moveList, pos);
GenerateMoves<Evasion, US, true>()(moveList, pos) : GenerateMoves<NonEvasion, US, true>()(moveList, pos);

// 玉の移動による自殺手と、pinされている駒の移動による自殺手を削除
while (curr != moveList) {
Expand Down