anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-15 02:54:09 -04:00
Code Releases Activity

fix simple simon solver

Browse source
This commit is contained in:
Shlomi Fish 2020-06-17 13:07:48 +03:00
parent e49c3a153f
commit fa85fbdadd
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pysollib/hint.py
View file

@ -1069,8 +1069,6 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
# print(args) # print(args)
lib_freecell_solver_obj.input_cmd_line(args) lib_freecell_solver_obj.input_cmd_line(args)
status = lib_freecell_solver_obj.solve_board(board) status = lib_freecell_solver_obj.solve_board(board)
if status != 0:
assert 0
else: else:
command = FCS_COMMAND+' '+' '.join(args) command = FCS_COMMAND+' '+' '.join(args)
pout, perr = self.run_solver(command, board) pout, perr = self.run_solver(command, board)
@ -1110,21 +1108,24 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
self.dialog.setText(iter=iter_, depth=depth, states=states) self.dialog.setText(iter=iter_, depth=depth, states=states)
hints = [] hints = []
if use_fc_solve_lib: if use_fc_solve_lib and status == 0:
m = lib_freecell_solver_obj.get_next_move() m = lib_freecell_solver_obj.get_next_move()
while m: while m:
type_ = ord(m.s[0]) type_ = ord(m.s[0])
src = ord(m.s[1]) src = ord(m.s[1])
dest = ord(m.s[2]) dest = ord(m.s[2])
hints.append([ hints.append([
(ord(m.s[3]) if type_ == 0 else 1), (ord(m.s[3]) if type_ == 0
(game.s.rows if (type_ in [0, 1, 4]) else (13 if type_ == 11 else 1)),
(game.s.rows if (type_ in [0, 1, 4, 11, ])
else game.s.reserves)[src], else game.s.reserves)[src],
(game.s.rows[dest] if (type_ in [0, 2]) (game.s.rows[dest] if (type_ in [0, 2])
else (game.s.reserves[dest] else (game.s.reserves[dest]
if (type_ in [1, 3]) else None))]) if (type_ in [1, 3]) else None))])
m = lib_freecell_solver_obj.get_next_move() m = lib_freecell_solver_obj.get_next_move()
elif use_fc_solve_lib:
self.solver_state = 'unsolved'
else: else:
for sbytes in pout: for sbytes in pout:
s = six.text_type(sbytes, encoding='utf-8') s = six.text_type(sbytes, encoding='utf-8')