Fix next deal / Ctrl+N for ms deals.

.appveyor.yml

@@ -14,6 +14,7 @@ install:
     - python3 -mpip install py2exe
     - python3 -mpip install pycotap
     - python3 -mpip install pygame
+    - python3 -mpip install pysol-cards
     - python3 -mpip install random2
     - python3 -mpip install six
     - perl -v

.travis.yml

@@ -39,7 +39,7 @@ before_install:
 install:
     - sudo cpanm --notest Capture::Tiny
     - sudo cpanm Code::TidyAll::Plugin::Flake8 Perl::Tidy Test::Code::TidyAll Test::Differences Test::TrailingSpace
-    - export PY_MODS='pycotap random2 six'
+    - export PY_MODS='pycotap pysol-cards random2 six'
     - "`which python3` -m pip install --upgrade flake8 flake8-import-order $PY_MODS"
     - "sudo /usr/bin/python3 -m pip install --upgrade $PY_MODS || true"
     - "sudo `which python2` -m pip install --upgrade $PY_MODS"

pysollib/pysolrandom.py

@@ -34,6 +34,8 @@ except ImportError:
         "You need to install " +
         "https://pypi.python.org/pypi/random2 using pip or similar.")
 
+from pysol_cards.random import RandomBase  # noqa: I100
+
 
 # ************************************************************************
 # * Abstract class for PySol Random number generator.
@@ -42,7 +44,7 @@ except ImportError:
 # ************************************************************************
 
 
-class BasicRandom:
+class BasicRandom(RandomBase):
     # MAX_SEED = 0L
     # MAX_SEED = 0xffffffffffffffffL  # 64 bits
     MAX_SEED = int('100000000000000000000')  # 20 digits
@@ -172,20 +174,9 @@ class MFXRandom(BasicRandom):
     def choice(self, seq):
         return seq[int(self.random() * len(seq))]
 
-    # Get a random integer in the range [a, b] including both end points.
-    def randint(self, a, b):
-        return a + int(self.random() * (b+1-a))
-
     def randrange(self, a, b):
         return self.randint(a, b-1)
 
-    def shuffle(self, seq):
-        n = len(seq) - 1
-        while n > 0:
-            j = self.randint(0, n)
-            seq[n], seq[j] = seq[j], seq[n]
-            n -= 1
-
 
 # ************************************************************************
 # * Linear Congruential random generator
@@ -234,11 +225,15 @@ class CustomRandom(BasicRandom):
 class LCRandom31(MFXRandom):
     MAX_SEED = int('0x1ffffffff', 0)          # 33 bits
 
+    def increaseSeed(self, seed):
+        ret = super(LCRandom31, self).increaseSeed(seed)
+        return "ms{}".format(ret)
+
     def getSeedStr(self):
         return "ms" + str(self.initial_seed)
 
     def str(self, seed):
-        return "%05d" % int(seed)
+        return "%05d" % int(seed) if not _match_ms(seed) else seed
 
     def setSeed(self, seed):
         seed = int(seed)
@@ -266,13 +261,6 @@ class LCRandom31(MFXRandom):
 
         return a + (ret % (b+1-a))
 
-    def shuffle(self, seq):
-        n = len(seq) - 1
-        while n > 0:
-            j = self.randint(0, n)
-            seq[n], seq[j] = seq[j], seq[n]
-            n -= 1
-
     def reset(self):
         self.setSeed(self.seed)
 

tests/lib/pysol_tests/ms_deals1/__init__.py

@@ -665,3 +665,21 @@ QH 9H 9D 5S 7S 6C
 
         # TEST
         self.assertEqual(got, inp, 'str2long PySolFC roundtrip.')
+
+        rand = constructRandom('ms100000')
+        seed = rand.increaseSeed(rand.initial_seed)
+        seed = rand.str(seed)
+        # TEST
+        self.assertEqual(seed, 'ms100001', 'increaseSeed for ms deals')
+        rand = constructRandom(seed)
+        game = Game("freecell", rand, True)
+        # TEST
+        self._cmp_board(game.print_layout(), '''5S AH 4H TD 4S JD JS
+3C 8C 4C AC JC AS QS
+7C QH 2D QD 8S 9D AD
+KS 7S 5H 3H TS 3S 5D
+9S 7H KC TH 8D 6S
+5C KD 9H 2H 2S 6D
+9C JH 8H 3D 4D QC
+KH 6H 6C TC 2C 7D
+''', 'ms100001')