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

Fix file save.

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

26
pysollib/hint.py
View file

@ -814,31 +814,30 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
self._addBoardLine(prefix + b) self._addBoardLine(prefix + b)
return return
def _getNextId(self):
self._id += 1
return self._id
def importFile(solver, fh, s_game, self): def importFile(solver, fh, s_game, self):
solver._id = 1000
s_game.endGame() s_game.endGame()
s_game.newGame( s_game.newGame(
shuffle=True, shuffle=True,
dealer=lambda: solver.importFileHelper(fh, s_game, self)) dealer=lambda: solver.importFileHelper(fh, s_game))
def importFileHelper(solver, fh, s_game, self): def importFileHelper(solver, fh, s_game):
game = s_game.s game = s_game.s
stack_idx = 0 stack_idx = 0
def crCard(target, suit, rank): def put(target, 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
ret = ret[0] ret = ret[0]
game.talon.cards = \ game.talon.cards = \
game.talon.cards[0:ret] + game.talon.cards[ret:] +\ game.talon.cards[0:ret] + game.talon.cards[(ret+1):] +\
[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) s_game.moveMove(1, game.talon, target, frames=0)
def put_str(target, str_):
put(target, "CSHD".index(str_[1]), "A23456789TJQK".index(str_[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,7 +848,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(foundat, suit, r) put(foundat, suit, r)
break break
continue continue
m = re.match(r'^(?:FC:|Freecells:)\s*(.*)', line) m = re.match(r'^(?:FC:|Freecells:)\s*(.*)', line)
@ -861,15 +860,14 @@ 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_ != '-':
crCard(game.reserves[i], "CSHD".index(str_[1]), put_str(game.reserves[i], str_)
"A23456789TJQK".index(str_[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(game.rows[stack_idx], "CSHD".index(str_[1]), put_str(game.rows[stack_idx], str_)
"A23456789TJQK".index(str_[0]))
stack_idx += 1 stack_idx += 1
return
def calcBoardString(self): def calcBoardString(self):
game = self.game game = self.game