From 5da836e778b6aa2edd748214527624a6b2ee5e49 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Tue, 14 Oct 2014 11:37:16 +0300
Subject: [PATCH] distinguish between intractable and unsolvable.

---
 pysollib/hint.py              | 17 +++++++++++++++--
 pysollib/tile/solverdialog.py |  2 +-
 pysollib/tk/solverdialog.py   |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/pysollib/hint.py b/pysollib/hint.py
index 2bda9b14..0afa3dd2 100644
--- a/pysollib/hint.py
+++ b/pysollib/hint.py
@@ -95,6 +95,7 @@ class AbstractHint(HintInterface):
         self.hints = []
         self.max_score = 0
         self.__destructClones()
+        self.solver_state = 'not_started';
 
     #
     # stack cloning
@@ -821,7 +822,7 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
         #
         args = []
         ##args += ['-sam', '-p', '-opt', '--display-10-as-t']
-        args += ['-m', '-p', '-opt']
+        args += ['-m', '-p', '-opt', '-sel']
         if progress:
             args += ['--iter-output']
             if DEBUG:
@@ -884,7 +885,13 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
                     if iter % 100 == 0:
                         self.dialog.setText(iter=iter, depth=depth,
                                             states=states)
-                elif re.search('^(?:-=-=|I could not solve this game)', s):
+                elif re.search('^(?:-=-=)', s):
+                    break
+                elif re.search('^(?:Iterations count exceeded)', s):
+                    self.solver_state = 'intractable'
+                    break
+                elif re.search('^(?:I could not solve this game)', s):
+                    self.solver_state = 'unsolved'
                     break
             self.dialog.setText(iter=iter, depth=depth, states=states)
 
@@ -952,6 +959,8 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
         ##print perr.read(),
 
         self.hints = hints
+        if len(hints) > 0:
+            self.solver_state = 'solved'
         self.hints.append(None)         # XXX
 
         ##print self.hints
@@ -1029,10 +1038,14 @@ class BlackHoleSolver_Hint(Base_Solver_Hint):
         self.dialog.setText(iter=iter, depth=depth, states=states)
 
         if (result == 'Intractable!'):
+            self.solver_state = 'intractable'
             return
         if (result == 'Unsolved!'):
+            self.solver_state = 'unsolved'
             return
 
+        self.solver_state = 'solved'
+
         hints = []
         for s in pout:
             if DEBUG:
diff --git a/pysollib/tile/solverdialog.py b/pysollib/tile/solverdialog.py
index 05aa84bc..6d365ea1 100644
--- a/pysollib/tile/solverdialog.py
+++ b/pysollib/tile/solverdialog.py
@@ -245,7 +245,7 @@ class SolverDialog(MfxDialog):
             self.result_label['text'] = t
             self.play_button.config(state='normal')
         else:
-            self.result_label['text'] = _('I could not solve this game.')
+            self.result_label['text'] = (_('I could not solve this game.') if solver.solver_state == 'unsolved' else _('Iterations count exceeded (Intractable)'))
             self.play_button.config(state='disabled')
 
     def startPlay(self):
diff --git a/pysollib/tk/solverdialog.py b/pysollib/tk/solverdialog.py
index cc27f4cc..1cd5bd4a 100644
--- a/pysollib/tk/solverdialog.py
+++ b/pysollib/tk/solverdialog.py
@@ -248,7 +248,7 @@ class SolverDialog(MfxDialog):
             self.result_label['text'] = t
             self.play_button.config(state='normal')
         else:
-            self.result_label['text'] = _('I could not solve this game.')
+            self.result_label['text'] = (_('I could not solve this game.') if solver.solver_state == 'unsolved' else _('Iterations count exceeded (Intractable)'))
             self.play_button.config(state='disabled')
 
     def startPlay(self):