--amend

tudo-seal · Jun 28, 2023 · 3462c3d · 3462c3d
1 parent 44728ef
commit 3462c3d
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 222 deletions.
diff --git a/tests/benchmark_labyrinth.py b/tests/benchmark_labyrinth.py
@@ -2,15 +2,13 @@
 import timeit
 from dataclasses import dataclass, field
 
-from bcls import (
+from cls import (
     Type,
     Constructor,
     Product,
     Omega,
     Arrow,
     Intersection,
-    BooleanTerm,
-    Var,
     FiniteCombinatoryLogic,
     enumerate_terms,
     interpret_term,
@@ -117,7 +115,7 @@ def test():
     start = timeit.default_timer()
 
     # target: BooleanTerm[Type] = Var(pos(SIZE - 1, SIZE - 1)) & ~(Var(seen(1, 1)))
-    target: BooleanTerm[Type] = Var(pos(SIZE - 1, SIZE - 1))
+    target = pos(SIZE - 1, SIZE - 1)
     # target: BooleanTerm[Type] = Var(seen(1, 1))
 
     results = gamma.inhabit(target)

diff --git a/tests/benchmark_labyrinth_single_movements.py b/tests/benchmark_labyrinth_single_movements.py
@@ -2,15 +2,13 @@
 import itertools
 import timeit
 
-from bcls import (
+from cls import (
     Type,
     Constructor,
     Product,
     Omega,
     Arrow,
     Intersection,
-    BooleanTerm,
-    Var,
     FiniteCombinatoryLogic,
     enumerate_terms,
     interpret_term,
@@ -150,7 +148,7 @@ def test():
     start = timeit.default_timer()
 
     # target: BooleanTerm[Type] = Var(pos(SIZE - 1, SIZE - 1)) & ~(Var(seen(1, 1)))
-    target: BooleanTerm[Type] = Var(pos(SIZE - 1, SIZE - 1))
+    target = pos(SIZE - 1, SIZE - 1)
 
     results = gamma.inhabit(target)
     print("Time (Inhabitation): ", timeit.default_timer() - start)

diff --git a/tests/boolean.py b/tests/boolean.py
diff --git a/tests/example_1.py b/tests/example_1.py
@@ -1,15 +1,14 @@
 from collections.abc import Callable
-from bcls import (
+from cls import (
     Type,
     Constructor,
     Arrow,
     Intersection,
-    Var,
     FiniteCombinatoryLogic,
     enumerate_terms,
     Subtypes,
 )
-from bcls.enumeration import interpret_term
+from cls.enumeration import interpret_term
 
 
 def test() -> None:
@@ -32,7 +31,7 @@ def test() -> None:
     environment: dict[str, set[str]] = dict()
     subtypes = Subtypes(environment)
 
-    target = Var(a) & ~(Var(b) & Var(c))
+    target = Intersection(c, b)
     # target = Var(b)
 
     fcl = FiniteCombinatoryLogic(repository, subtypes)

diff --git a/tests/example_CC.py b/tests/example_CC.py
diff --git a/tests/example_K.py b/tests/example_K.py
@@ -1,15 +1,14 @@
 from collections.abc import Callable
-from bcls import (
+from cls import (
     Type,
     Constructor,
     Arrow,
     Intersection,
-    Var,
     FiniteCombinatoryLogic,
     enumerate_terms,
     Subtypes,
 )
-from bcls.enumeration import interpret_term
+from cls.enumeration import interpret_term
 
 
 def test() -> None:
@@ -43,7 +42,7 @@ def MAP2(x, f):
     environment: dict[str, set[str]] = dict()
     subtypes = Subtypes(environment)
 
-    target = Var(c)
+    target = c
     # target = Var(Arrow(b, c))
 
     fcl = FiniteCombinatoryLogic(repository, subtypes)

diff --git a/tests/example_intersection.py b/tests/example_intersection.py
@@ -1,16 +1,11 @@
 from collections.abc import Callable
-from bcls import (
+from cls import (
     Type,
     Constructor,
     Arrow,
     Intersection,
-    Var,
-    FiniteCombinatoryLogic,
-    enumerate_terms,
-    Subtypes,
     inhabit_and_interpret,
 )
-from bcls.enumeration import interpret_term
 
 
 def test() -> None:

diff --git a/tests/example_list.py b/tests/example_list.py
@@ -1,5 +1,5 @@
-from bcls import inhabit_and_interpret
-from bcls.types import Arrow, Constructor
+from cls import inhabit_and_interpret
+from cls.types import Arrow, Constructor
 
 
 def nil():

diff --git a/tests/example_multiargs.py b/tests/example_multiargs.py
@@ -10,7 +10,7 @@
 MultiArgsComponent) or default values (See DefaultArgComponent).
 
 """
-from bcls import (
+from cls import (
     Constructor,
     Arrow,
     Intersection,

diff --git a/tests/example_var_args.py b/tests/example_var_args.py
@@ -1,5 +1,4 @@
-from collections.abc import Callable
-from bcls import Type, Constructor, Arrow, Intersection, Var, inhabit_and_interpret
+from cls import Type, Constructor, Arrow, inhabit_and_interpret
 
 
 def F(*x):
@@ -17,7 +16,7 @@ def test() -> None:
 
     repository = dict({X: a, Y: b, F: Arrow(a, (Arrow(b, (Arrow(b, c)))))})
 
-    for real_result in inhabit_and_interpret(repository, Var(c)):
+    for real_result in inhabit_and_interpret(repository, c):
         print(real_result)
 
 

diff --git a/tests/set_cover.py b/tests/set_cover.py
@@ -1,4 +1,4 @@
-from bcls.combinatorics import minimal_covers, maximal_elements
+from cls.combinatorics import minimal_covers, maximal_elements
 from itertools import combinations
 from collections import deque
 from random import randrange

diff --git a/tests/types.py b/tests/types.py
@@ -1,6 +1,6 @@
 import unittest
 
-from bcls import *
+from cls import *
 
 a = Constructor("a")
 b = Constructor("b")

diff --git a/tests/wrong_spec.py b/tests/wrong_spec.py
@@ -1,5 +1,5 @@
 from collections.abc import Callable
-from bcls import Type, Constructor, Arrow, Intersection, Var, inhabit_and_interpret
+from cls import Type, Constructor, Arrow, Intersection, inhabit_and_interpret
 
 
 def test() -> None:
@@ -20,7 +20,7 @@ def test() -> None:
         }
     )
 
-    for real_result in inhabit_and_interpret(repository, Var(b)):
+    for real_result in inhabit_and_interpret(repository, b):
         print(real_result)
 
 

diff --git a/tests/wrong_spec2.py b/tests/wrong_spec2.py
@@ -1,5 +1,5 @@
 from collections.abc import Callable
-from bcls import Type, Constructor, Arrow, Intersection, Var, inhabit_and_interpret
+from cls import Type, Constructor, Arrow, Intersection, inhabit_and_interpret
 
 
 def test() -> None:
@@ -20,7 +20,7 @@ def test() -> None:
         }
     )
 
-    for real_result in inhabit_and_interpret(repository, Var(b)):
+    for real_result in inhabit_and_interpret(repository, b):
         print(real_result)