Merge branch 'develop' into req-placements

Author: christianbean

gen_rec_prog.py

@@ -5,12 +5,12 @@
 from comb_spec_searcher import *
 from permuta import *
 from tilescopethree import *
-from tilescopethree.strategies import one_by_one_verification
+from tilescopethree.strategies import one_by_one_verified
 from tilescopethree.strategy_packs import point_placements_db
 from tilings import *
 
 pack = point_placements_db
-pack.ver_strats = [one_by_one_verification]
+pack.ver_strats = [one_by_one_verified]
 
 if len(sys.argv) > 1:
     inp = sys.argv[1]

setup.py

@@ -19,20 +19,21 @@ def read(fname):
     packages=find_packages(),
     long_description=read("README.md"),
     install_requires=[
-        'permuta==1.2.1',
-        'comb_spec_searcher==0.2.2',
+        'permuta==1.3.0',
+        'comb_spec_searcher==0.3.0',
         'logzero==1.5.0',
         'tilings==1.0.1',
-        'sympy==1.4',
+        'sympy==1.5.1',
     ],
     dependency_links = [
         'https://github.com/PermutaTriangle/Tilings/tarball/develop#egg=tilings-1.0.1',
     ],
     setup_requires=['pytest-runner==5.1'],
     tests_require=[
-        'pytest==5.1.1',
-        'pytest-cov==2.7.1',
+        'pytest==5.3.3',
+        'pytest-cov==2.8.1',
         'pytest-pep8==1.0.6',
         'pytest-isort==0.3.1',
+        'pytest-timeout==1.3.4',
     ],
 )

tests/test_tilescope.py

@@ -4,8 +4,8 @@
 from comb_spec_searcher import ProofTree
 from tilescopethree import TileScopeTHREE
 from tilescopethree.strategy_packs_v2 import (
-    point_placements, point_placements_fusion,
-    point_placements_fusion_with_interleaving,
+    all_the_strategies_database_verified, point_placements,
+    point_placements_fusion, point_placements_fusion_with_interleaving,
     row_and_col_placements_fusion_with_interleaving_fusion)
 
 
@@ -14,6 +14,12 @@ def test_132():
     searcher = TileScopeTHREE('132', point_placements)
     t = searcher.auto_search(smallest=True)
     assert isinstance(t, ProofTree)
+
+
+@pytest.mark.xfail(reason='Generating function finding not implemented')
+def test_132_genf():
+    searcher = TileScopeTHREE('132', point_placements)
+    t = searcher.auto_search(smallest=True)
     gf = sympy.series(t.get_genf(), n=15)
     x = sympy.Symbol('x')
     assert ([gf.coeff(x, n) for n in range(13)] ==
@@ -22,6 +28,13 @@ def test_132():
 
 @pytest.mark.timeout(20)
 def test_123():
+    searcher = TileScopeTHREE('123', all_the_strategies_database_verified)
+    t = searcher.auto_search(smallest=True)
+    assert isinstance(t, ProofTree)
+
+
+@pytest.mark.timeout(20)
+def test_123_with_db():
     searcher = TileScopeTHREE('123', point_placements_fusion)
     t = searcher.auto_search(smallest=True)
     assert isinstance(t, ProofTree)