From 824c2b46db9019bc480647dcfee49af9c8a13e5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20W=C3=B6lfer?= <lukas.woelfer@rwth-aachen.de>
Date: Thu, 20 Jun 2019 23:25:09 +0200
Subject: [PATCH] Refactored solver loop

---
 shenzhen_solitaire/solver.py | 45 +++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/shenzhen_solitaire/solver.py b/shenzhen_solitaire/solver.py
index 2beffb7..d2dd125 100644
--- a/shenzhen_solitaire/solver.py
+++ b/shenzhen_solitaire/solver.py
@@ -56,6 +56,29 @@ def solve(board: Board) -> Iterator[List[board_actions.Action]]:
     stack = ActionStack()
     stack.push(board)
 
+    def _limit_stack_size(stack_size: int) -> None:
+        if len(stack) == -1:
+            stack.pop()
+            assert stack.action_stack[-1] is not None
+            stack.action_stack[-1].undo(board)
+            assert (board.state_identifier
+                    in state_set)
+
+    def _backtrack_action() -> None:
+        stack.pop()
+        assert stack.action_stack[-1] is not None
+        stack.action_stack[-1].undo(board)
+        assert (board.state_identifier
+                in state_set)
+
+    def _skip_loop_move(action: board_actions.Action) -> bool:
+        if isinstance(action, MoveAction):
+            for prev_action in stack.action_stack[-2::-1]:
+                if isinstance(prev_action, MoveAction):
+                    if prev_action.cards == action.cards:
+                        return True
+        return False
+
     count = 0
     while stack:
         count += 1
@@ -63,32 +86,18 @@ def solve(board: Board) -> Iterator[List[board_actions.Action]]:
             count = 0
             print(f"{len(stack)} {sum(board.goal.values())}")
 
-        if len(stack) == -1:
-            stack.pop()
-            stack.action_stack[-1].undo(board)
-            assert (board.state_identifier
-                    in state_set)
+        # _limit_stack_size(80)
 
         assert (board.state_identifier ==
                 stack.state_stack[-1])
         action = stack.get()
 
         if not action:
-            stack.pop()
-            stack.action_stack[-1].undo(board)
-            assert (board.state_identifier
-                    in state_set)
+            _backtrack_action()
             continue
 
-        if isinstance(action, MoveAction):
-            drop = False
-            for prev_action in stack.action_stack[-2::-1]:
-                if isinstance(prev_action, MoveAction):
-                    if prev_action.cards == action.cards:
-                        drop = True
-                        break
-            if drop:
-                continue
+        if _skip_loop_move(action):
+            continue
 
         action.apply(board)