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

Extract ms_rearrange .

Browse source
This commit is contained in:
Shlomi Fish 2019-06-05 15:00:12 +03:00
parent 86d2e6368f
commit 4a53c175f5
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pysollib/game.py
View file

@ -22,12 +22,13 @@
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
# imports
import math import math
import time import time
import traceback import traceback
from pickle import Pickler, Unpickler, UnpicklingError from pickle import Pickler, Unpickler, UnpicklingError
from pysol_cards.cards import ms_rearrange
from pysollib.gamedb import GI from pysollib.gamedb import GI
from pysollib.help import help_about from pysollib.help import help_about
from pysollib.hint import DefaultHint from pysollib.hint import DefaultHint
@ -1058,13 +1059,8 @@ class Game(object):
# get a fresh copy of the original game-cards # get a fresh copy of the original game-cards
cards = list(self.cards) cards = list(self.cards)
# init random generator # init random generator
if isinstance(self.random, LCRandom31) and len(cards) == 52: if isinstance(self.random, LCRandom31):
# FreeCell mode cards = ms_rearrange(cards)
fcards = []
for i in range(13):
for j in (0, 39, 26, 13):
fcards.append(cards[i + j])
cards = fcards
self.random.reset() # reset to initial seed self.random.reset() # reset to initial seed
# shuffle # shuffle
self.random.shuffle(cards) self.random.shuffle(cards)

11
tests/lib/pysol_tests/ms_deals1/__init__.py
View file

@ -53,6 +53,8 @@
# imports # imports
import unittest import unittest
from pysol_cards.cards import ms_rearrange
# So the localpaths will be overrided. # So the localpaths will be overrided.
from pysollib.pysolrandom import LCRandom31, constructRandom, \ from pysollib.pysolrandom import LCRandom31, constructRandom, \
random__long2str, random__str2long random__long2str, random__str2long
@ -244,13 +246,8 @@ def flip_card(card_str, flip):
def shuffle(orig_cards, rand): def shuffle(orig_cards, rand):
shuffled_cards = list(orig_cards) shuffled_cards = list(orig_cards)
if isinstance(rand, LCRandom31) and len(shuffled_cards) == 52: if isinstance(rand, LCRandom31):
# FreeCell mode shuffled_cards = ms_rearrange(shuffled_cards)
fcards = []
for i in range(13):
for j in (0, 39, 26, 13):
fcards.append(shuffled_cards[i + j])
shuffled_cards = fcards
# rand.shuffle works in place # rand.shuffle works in place
rand.shuffle(shuffled_cards) rand.shuffle(shuffled_cards)
return shuffled_cards return shuffled_cards