From 10932f169008a5bb2a141a5061693b97131fda49 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Fri, 9 Mar 2012 11:56:37 +0200 Subject: [PATCH] Have solver statistics without progress. This patch implements geting the solver's final statistics without setting the track progress. It also fixes the off-by-1 final report of the statistics with the progress. --- pysollib/hint.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pysollib/hint.py b/pysollib/hint.py index 57c7632a..ba53daac 100644 --- a/pysollib/hint.py +++ b/pysollib/hint.py @@ -26,6 +26,7 @@ import os import time import subprocess +import re # PySol imports from settings import DEBUG, FCS_COMMAND @@ -888,9 +889,16 @@ class FreeCellSolver_Hint: for s in pout: if DEBUG: print s, - # TODO: - # Total number of states checked is 6. - # This scan generated 6 states. + m = re.match('Total number of states checked is (\d+)\.', s) + if m: + iter = int(m.group(1)) + self.dialog.setText(iter=iter) + + m = re.match('This scan generated (\d+) states\.', s) + + if m: + states = int(m.group(1)) + self.dialog.setText(states=states) if not s.startswith('Move'): continue