migrate equivalence strategies

Author: enadeau

tests/strategies/equivalence_strategies/test_fusion_with_interleaving.py renamed to tests/strategies/equivalence_strategies/test_component_fusion.py

@@ -1,7 +1,7 @@
 import pytest
 
 from permuta import Perm
-from tilescopethree.strategies import fusion_with_interleaving
+from tilescopethree.strategies import component_fusion
 from tilings import Obstruction, Tiling
 
 
@@ -37,5 +37,5 @@ def tiling2():
 
 
 def test_fusion_with_interleaving(tiling1, tiling2):
-    assert len(list(fusion_with_interleaving(tiling1))) == 0
-    assert len(list(fusion_with_interleaving(tiling2))) == 1
+    assert len(list(component_fusion(tiling1))) == 0
+    assert len(list(component_fusion(tiling2))) == 1

tests/strategies/equivalence_strategies/test_fusion.py

@@ -2,7 +2,7 @@
 
 from comb_spec_searcher import Rule
 from permuta import Perm
-from tilescopethree.strategies.equivalence_strategies.fusion import fusion
+from tilescopethree.strategies.equivalence_strategies import fusion
 from tilings import Obstruction, Tiling
 
 

tests/test_tilescope.py

@@ -5,8 +5,8 @@
 from tilescopethree import TileScopeTHREE
 from tilescopethree.strategy_packs_v2 import (
     all_the_strategies_verify_database, point_placements,
-    point_placements_fusion, point_placements_fusion_with_interleaving,
-    row_and_col_placements_fusion_with_interleaving_fusion)
+    point_placements_component_fusion, point_placements_fusion,
+    row_and_col_placements_component_fusion_fusion)
 
 
 @pytest.mark.timeout(20)
@@ -43,7 +43,7 @@ def test_123_with_db():
 @pytest.mark.timeout(20)
 def test_1342_1423():
     searcher = TileScopeTHREE('1342_1423',
-                              point_placements_fusion_with_interleaving)
+                              point_placements_component_fusion)
     t = searcher.auto_search(smallest=True)
     t.number_of_nodes() == 14
     assert isinstance(t, ProofTree)
@@ -53,7 +53,7 @@ def test_1342_1423():
 def test_1324():
     searcher = TileScopeTHREE(
         '1324',
-        row_and_col_placements_fusion_with_interleaving_fusion
+        row_and_col_placements_component_fusion_fusion
     )
     t = searcher.auto_search(smallest=True)
     t.number_of_nodes() == 14

tilescopethree/strategies/equivalence_strategies.py

@@ -0,0 +1,5 @@
+from tilings.strategies.equivalence import (all_placements, component_fusion,
+                                            fusion, partial_point_placement,
+                                            partial_requirement_placement,
+                                            point_placement,
+                                            requirement_placement)