lukas/shenzhen-solitaire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved solver performance

Browse Source
This commit is contained in:
Lukas Wölfer
2020-02-12 02:51:26 +01:00
parent c05aa194ce
commit c789e48b06
4 changed files with 73 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
shenzhen_solitaire/solver/board_possibilities.py
View File

@@ -125,7 +125,6 @@ def possible_goal_move_actions(
]
top_cards = field_cards + bunker_cards
result: List[board_actions.GoalAction] = []
for source, index, card in top_cards:
if not (card.number == search_board.getGoal(card.suit) + 1):
continue
@@ -145,9 +144,6 @@ def possible_goal_move_actions(
)
break
result = sorted(result, key=lambda x: not x.obvious)
yield from iter(result)
def _can_stack(bottom: board.Card, top: board.Card) -> bool:
if not isinstance(bottom, board.NumberCard):
@@ -216,11 +212,19 @@ def possible_field_move_actions(
)
def possible_actions(search_board: board.Board) -> Iterator[board_actions.Action]:
def possible_actions(search_board: board.Board) -> List[board_actions.Action]:
"""Enumerate all possible actions on the current search_board"""
yield from possible_huakill_action(search_board)
yield from possible_dragonkill_actions(search_board)
yield from possible_goal_move_actions(search_board)
yield from possible_debunkerize_actions(search_board)
yield from possible_field_move_actions(search_board)
yield from possible_bunkerize_actions(search_board)
result: List[board_actions.Action] = [
*list(possible_huakill_action(search_board)),
*list(possible_dragonkill_actions(search_board)),
*list(possible_goal_move_actions(search_board)),
*list(possible_debunkerize_actions(search_board)),
*list(possible_field_move_actions(search_board)),
*list(possible_bunkerize_actions(search_board)),
]
for x in result:
if x.automatic():
return [x]
return result