optimize travis.yml

Using the BlackHoleSolverWrapper .

See https://github.com/shlomif/PySolFC/issues/98 issue98.

.travis.yml

@@ -1,24 +1,38 @@
-dist: trusty
 addons:
-  apt:
-    packages:
-      - cpanminus
-      - libperl-dev
-      - make
-      - perl
-      - python-glade2
-      - python-gnome2
-      - python-gnome2-dev
-      - python-gtk2
-      - python-setuptools
-      - python-tk
-      - python3
-      - python3-pip
-      - python3-setuptools
-      - python3-tk
-  homebrew:
-    update: true
-    brewfile: true
+    apt:
+        packages:
+            - cpanminus
+            - libperl-dev
+            - make
+            - perl
+            - python-glade2
+            - python-gnome2
+            - python-gnome2-dev
+            - python-gtk2
+            - python-setuptools
+            - python-tk
+            - python3
+            - python3-pip
+            - python3-setuptools
+            - python3-tk
+    homebrew:
+        update: true
+        brewfile: true
+cache:
+    directories:
+        - $HOME/perl_modules
+        - $HOME/tidyall_d
+deploy:
+    provider: releases
+    api_key:
+        secure: SrKnXigL/oUHNbqpbGx0DB1o+LAEkfPA2QTBllXxg4V+1vGAHBT9FRecp8Do+no/zSPRttH+sPDEPBXMMAV0BWVKKw5Mxas/S5ulVkNdfxpTq1bKjI3EjZbVsS1zZlHe0P77TDFDAj8zyeiYecBM08suhd9OvScieiPlpFPE1UYp9vvNKaBgc66IRNnIDRBdktW4YLsgvkrpXnxGPy8gGwylsTeOzNs5/r5dzHswGdksJl46kqCIbV+s4/Xcx+BEnfibWzEFZmLQoGKhoukbSis3YXGIlERcgiVU6v7S2D4wbwUXSAKOj/Io7z/88Co2P3Qbm538kf/pjeR9+DaM1HsHQQcL0detCjjLog+ekKr2fM00QI1yRmqOiZtuXxTMpneYX73EBmPt4la4rjKmnlhS+NTxrynHcPZD8QopCPvoZ3sUD6dQCrbi8kcGxe13srfdJ3KjuWZXdedLIOgNELbj5o6GNivsanWna59yoJzChC5/H5Jjllncvzbp56TZfEkM1NJkE84jjSS8Sn2KLXjD0woHIsuUSkRNExrCt/6QmIub/QxZPUhwQ2J0xCv1IJPdd0XvO3gCqasG3UA2Q0OlP172x92ocOV/wm1/4wfoG6v/mn+bX5ZwvrsMmm+r3FKKlM8L3T33yFjMzgG/YMoRN8w7pXUIkdtZK8EEDVg=
+    # file: dist/PySolFC.app
+    file: PySolFC.app.tar.xz
+    on:
+        repo: shlomif/PySolFC
+        tags: true
+    skip_cleanup: true
+dist: trusty
 before_install:
     - if test "$TRAVIS_OS_NAME" = "osx" ; then export CPPFLAGS="$CPPFLAGS -I$(brew --prefix openssl)/include" PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig:$PKG_CONFIG_PATH" LDFLAGS="$LDFLAGS -L$(brew --prefix openssl)/lib" ;fi
 install:
@@ -43,17 +57,8 @@ matrix:
             - LDFLAGS="$LDFLAGS -L/usr/local/opt/openssl/lib"
             - CPPFLAGS="$CPPFLAGS -I/usr/local/opt/openssl/include"
 script:
-    - "sh -x scripts/travis-ci-build"
+    - export TIDYALL_DATA_DIR="$HOME/tidyall_d"
+    - bash -x scripts/travis-ci-build
     - if test "$TRAVIS_OS_NAME" = "osx" ; then PYTHONPATH="`pwd`" python3 setup_osx.py py2app ; fi
     - if test "$TRAVIS_OS_NAME" = "osx" ; then find . -iname '*.app' ; fi
     - if test "$TRAVIS_OS_NAME" = "osx" ; then (cd dist; tar -cvf ../PySolFC.app.tar PySolFC.app/ ; ); xz PySolFC.app.tar ; fi
-deploy:
-    provider: releases
-    api_key:
-        secure: SrKnXigL/oUHNbqpbGx0DB1o+LAEkfPA2QTBllXxg4V+1vGAHBT9FRecp8Do+no/zSPRttH+sPDEPBXMMAV0BWVKKw5Mxas/S5ulVkNdfxpTq1bKjI3EjZbVsS1zZlHe0P77TDFDAj8zyeiYecBM08suhd9OvScieiPlpFPE1UYp9vvNKaBgc66IRNnIDRBdktW4YLsgvkrpXnxGPy8gGwylsTeOzNs5/r5dzHswGdksJl46kqCIbV+s4/Xcx+BEnfibWzEFZmLQoGKhoukbSis3YXGIlERcgiVU6v7S2D4wbwUXSAKOj/Io7z/88Co2P3Qbm538kf/pjeR9+DaM1HsHQQcL0detCjjLog+ekKr2fM00QI1yRmqOiZtuXxTMpneYX73EBmPt4la4rjKmnlhS+NTxrynHcPZD8QopCPvoZ3sUD6dQCrbi8kcGxe13srfdJ3KjuWZXdedLIOgNELbj5o6GNivsanWna59yoJzChC5/H5Jjllncvzbp56TZfEkM1NJkE84jjSS8Sn2KLXjD0woHIsuUSkRNExrCt/6QmIub/QxZPUhwQ2J0xCv1IJPdd0XvO3gCqasG3UA2Q0OlP172x92ocOV/wm1/4wfoG6v/mn+bX5ZwvrsMmm+r3FKKlM8L3T33yFjMzgG/YMoRN8w7pXUIkdtZK8EEDVg=
-    # file: dist/PySolFC.app
-    file: PySolFC.app.tar.xz
-    on:
-        repo: shlomif/PySolFC
-        tags: true
-    skip_cleanup: true

pysollib/games/golf.py

@@ -102,6 +102,8 @@ class Golf_Waste(WasteStack):
         WasteStack.__init__(self, x, y, game, **cap)
 
     def acceptsCards(self, from_stack, cards):
+        if from_stack is self.game.s.talon:
+            return True
         if not WasteStack.acceptsCards(self, from_stack, cards):
             return False
         # check cards
@@ -129,6 +131,8 @@ class Golf_RowStack(BasicRowStack):
 # ************************************************************************
 
 class Golf(Game):
+    Solver_Class = BlackHoleSolverWrapper(preset='golf', base_rank=0,
+                                          queens_on_kings=True)
     Waste_Class = Golf_Waste
     Hint_Class = Golf_Hint
 
@@ -201,6 +205,8 @@ class Golf(Game):
 # ************************************************************************
 
 class DeadKingGolf(Golf):
+    Solver_Class = BlackHoleSolverWrapper(preset='golf', base_rank=0)
+
     def getStrictness(self):
         return 1
 
@@ -211,6 +217,8 @@ class DeadKingGolf(Golf):
 
 
 class RelaxedGolf(Golf):
+    Solver_Class = BlackHoleSolverWrapper(preset='golf', base_rank=0,
+                                          wrap_ranks=True)
     Waste_Class = StackWrapper(Golf_Waste, mod=13)
 
     shallHighlightMatch = Game._shallHighlightMatch_RKW

pysollib/hint.py

@@ -788,15 +788,26 @@ class Base_Solver_Hint:
         if len(src.cards) > ncards and not src.cards[-ncards-1].face_up:
             # flip card
             thint = (999999, 0, 1, src, src, None, None)
+        skip = False
         if dest is None:                 # foundation
-            cards = src.cards[-ncards:]
-            for f in self.game.s.foundations:
-                if f.acceptsCards(src, cards):
-                    dest = f
-                    break
+            if src is self.game.s.talon:
+                if not src.cards[-1].face_up:
+                    self.game.flipMove(src)
+                # src.prepareStack()
+                # src.dealCards()
+                dest = self.game.s.foundations[0]
+                # skip = True
+            else:
+                cards = src.cards[-ncards:]
+                for f in self.game.s.foundations:
+                    if f.acceptsCards(src, cards):
+                        dest = f
+                        break
         assert dest
-        hint = (999999, 0, ncards, src, dest, None, thint)
         self.hints_index += 1
+        if skip:
+            return []
+        hint = (999999, 0, ncards, src, dest, None, thint)
         # print hint
         return [hint]
 
@@ -1168,6 +1179,11 @@ class BlackHoleSolver_Hint(Base_Solver_Hint):
 
     def calcBoardString(self):
         board = ''
+        cards = self.game.s.talon.cards
+        if (len(cards) > 0):
+            board += ' '.join(['Talon:'] +
+                              [self.card2str1(x) for x in reversed(cards)])
+            board += '\n'
         cards = self.game.s.foundations[0].cards
         s = '-'
         if (len(cards) > 0):
@@ -1198,6 +1214,10 @@ class BlackHoleSolver_Hint(Base_Solver_Hint):
         # args += ['-sam', '-p', '-opt', '--display-10-as-t']
         args += ['--game', game_type['preset'], '--rank-reach-prune']
         args += ['--max-iters', self.options['max_iters']]
+        if 'queens_on_kings' in game_type:
+            args += ['--queens-on-kings']
+        if 'wrap_ranks' in game_type:
+            args += ['--wrap-ranks']
         #
 
         command = self.BLACK_HOLE_SOLVER_COMMAND + ' ' + \
@@ -1231,6 +1251,11 @@ class BlackHoleSolver_Hint(Base_Solver_Hint):
             s = six.text_type(sbytes, encoding='utf-8')
             if DEBUG:
                 print(s)
+
+            if s.strip() == 'Deal talon':
+                hints.append([1, game.s.talon, None])
+                continue
+
             m = re.match('Total number of states checked is ([0-9]+)\\.', s)
             if m:
                 iter_ = int(m.group(1))

tests/lib/MyTidyAll.pm

@@ -0,0 +1,27 @@
+package MyCacheModel;
+
+use Moo;
+
+extends('Code::TidyAll::CacheModel');
+
+my $DUMMY_LAST_MOD = 0;
+
+sub _build_cache_value
+{
+    my ($self) = @_;
+
+    return $self->_sig(
+        [ $self->base_sig, $DUMMY_LAST_MOD, $self->file_contents ] );
+}
+
+package main;
+
+use Test::Code::TidyAll qw/ tidyall_ok /;
+
+my $KEY = 'TIDYALL_DATA_DIR';
+tidyall_ok(
+    cache_model_class => 'MyCacheModel',
+    ( exists( $ENV{$KEY} ) ? ( data_dir => $ENV{$KEY} ) : () )
+);
+
+1;

tests/style/tidyall.t

@@ -3,12 +3,13 @@
 use strict;
 use warnings;
 
-if ( $ENV{FCS_TEST_SKIP_PERLTIDY} )
+if ( $ENV{TEST_SKIP_TIDYALL} )
 {
     require Test::More;
     Test::More::plan( 'skip_all' =>
             "Skipping perltidy test because FCS_TEST_SKIP_PERLTIDY was set" );
 }
-require Test::Code::TidyAll;
 
-Test::Code::TidyAll::tidyall_ok( conf_file => ".tidyallrc", );
+use lib './tests/lib';
+
+require MyTidyAll;