migrate verification strategy

PermutaTriangle · Jan 31, 2020 · 0fc3e9d · 0fc3e9d
1 parent fb2e75f
commit 0fc3e9d
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 1,494 deletions.
diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@ def read(fname):
         'sympy==1.5.1',
     ],
     dependency_links = [
-        'https://github.com/PermutaTriangle/Tilings/tarball/develop#egg=tilings-1.0.1',
+        'https://github.com/PermutaTriangle/Tilings/tarball/migrate-strategy#egg=tilings-1.0.1',
     ],
     setup_requires=['pytest-runner==5.1'],
     tests_require=[

diff --git a/tests/test_tilescope.py b/tests/test_tilescope.py
@@ -4,7 +4,7 @@
 from comb_spec_searcher import ProofTree
 from tilescopethree import TileScopeTHREE
 from tilescopethree.strategy_packs_v2 import (
-    all_the_strategies_database_verified, point_placements,
+    all_the_strategies_verify_database, point_placements,
     point_placements_fusion, point_placements_fusion_with_interleaving,
     row_and_col_placements_fusion_with_interleaving_fusion)
 
@@ -28,7 +28,7 @@ def test_132_genf():
 
 @pytest.mark.timeout(20)
 def test_123():
-    searcher = TileScopeTHREE('123', all_the_strategies_database_verified)
+    searcher = TileScopeTHREE('123', all_the_strategies_verify_database)
     t = searcher.auto_search(smallest=True)
     assert isinstance(t, ProofTree)
 

diff --git a/tilescopethree/strategies/verification_strategies.py b/tilescopethree/strategies/verification_strategies.py
@@ -0,0 +1,4 @@
+from tilings.strategies.verification import (verify_basic, verify_database,
+                                             verify_elementary, verify_local,
+                                             verify_locally_factorable,
+                                             verify_one_by_one)
diff --git a/tilescopethree/strategies/verification_strategies/__init__.py b/tilescopethree/strategies/verification_strategies/__init__.py
diff --git a/tilescopethree/strategies/verification_strategies/database_verification.py b/tilescopethree/strategies/verification_strategies/database_verification.py
diff --git a/tilescopethree/strategies/verification_strategies/globally_verified.py b/tilescopethree/strategies/verification_strategies/globally_verified.py
diff --git a/tilescopethree/strategies/verification_strategies/subclass_verified.py b/tilescopethree/strategies/verification_strategies/subclass_verified.py
diff --git a/tilescopethree/strategies/verification_strategies/subset_verified.py b/tilescopethree/strategies/verification_strategies/subset_verified.py
diff --git a/tilescopethree/strategies/verification_strategies/verify_atoms.py b/tilescopethree/strategies/verification_strategies/verify_atoms.py