Formatting

shenzhen_solitaire/solver/board_actions.py

@@ -1,6 +1,7 @@
 """Contains actions that can be used on the board"""
-from typing import List, Tuple, Optional
 from dataclasses import dataclass
+from typing import List, Optional, Tuple
+
 from .. import board
 
 

shenzhen_solitaire/solver/board_possibilities.py

@@ -1,8 +1,9 @@
 """Contains function to iterate different kinds of possible actions"""
+import pdb
 from typing import Iterator, List, Tuple
+
 from .. import board
 from . import board_actions
-import pdb
 
 
 def possible_huakill_action(
@@ -124,6 +125,7 @@ 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
@@ -143,6 +145,9 @@ 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):

shenzhen_solitaire/solver/solver.py

@@ -1,9 +1,12 @@
 """Contains solver for solitaire"""
-from typing import List, Iterator, Optional
+import typing
+from typing import Iterator, List, Optional
+
 from ..board import Board
 from . import board_actions
+from .board_actions import (DragonKillAction, GoalAction, HuaKillAction,
+                            MoveAction)
 from .board_possibilities import possible_actions
-from .board_actions import MoveAction, GoalAction, HuaKillAction, DragonKillAction
 
 
 class ActionStack: