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

cleanups.

Browse source
This commit is contained in:
Shlomi Fish 2017-12-18 22:02:01 +02:00
parent a803849b35
commit 2989880117
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pysollib/hint.py
View file

@ -829,8 +829,7 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
game = s_game.s game = s_game.s
stack_idx = 0 stack_idx = 0
def crCard(suit, rank): def crCard(target, suit, rank):
print(suit, rank)
ret = [i for i, c in enumerate(game.talon.cards) ret = [i for i, c in enumerate(game.talon.cards)
if c.suit == suit and c.rank == rank] if c.suit == suit and c.rank == rank]
assert len(ret) == 1 assert len(ret) == 1
@ -839,6 +838,7 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
game.talon.cards[0:ret] + game.talon.cards[ret:] +\ game.talon.cards[0:ret] + game.talon.cards[ret:] +\
[game.talon.cards[ret]] [game.talon.cards[ret]]
s_game.flipMove(game.talon) s_game.flipMove(game.talon)
s_game.moveMove(1, game.talon, target, frames=0)
for line_p in fh: for line_p in fh:
line = line_p.rstrip('\r\n') line = line_p.rstrip('\r\n')
m = re.match(r'^(?:Foundations:|Founds?:)\s*(.*)', line) m = re.match(r'^(?:Foundations:|Founds?:)\s*(.*)', line)
@ -849,9 +849,7 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
suit = foundat.cap.suit suit = foundat.cap.suit
if "CSHD"[suit] == gm[0]: if "CSHD"[suit] == gm[0]:
for r in range("0A23456789TJQK".index(gm[1])): for r in range("0A23456789TJQK".index(gm[1])):
crCard(suit, r) crCard(foundat, suit, r)
s_game.moveMove(1, game.talon, foundat,
frames=0)
break break
continue continue
m = re.match(r'^(?:FC:|Freecells:)\s*(.*)', line) m = re.match(r'^(?:FC:|Freecells:)\s*(.*)', line)
@ -863,16 +861,13 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
for i, gm in enumerate(g): for i, gm in enumerate(g):
str_ = gm str_ = gm
if str_ != '-': if str_ != '-':
print(str_) crCard(game.reserves[i], "CSHD".index(str_[1]),
crCard("CSHD".index(str_[1]),
"A23456789TJQK".index(str_[0])) "A23456789TJQK".index(str_[0]))
s_game.moveMove(
1, game.talon, game.reserves[i], frames=0)
continue continue
g = re.findall(r'\b((?:[A23456789TJQK][HCDS]))\b', line) g = re.findall(r'\b((?:[A23456789TJQK][HCDS]))\b', line)
for str_ in g: for str_ in g:
crCard("CSHD".index(str_[1]), "A23456789TJQK".index(str_[0])) crCard(game.rows[stack_idx], "CSHD".index(str_[1]),
s_game.moveMove(1, game.talon, game.rows[stack_idx], frames=0) "A23456789TJQK".index(str_[0]))
stack_idx += 1 stack_idx += 1