remove deprecated optimizer

qlasskit/boolopt/__init__.py

@@ -14,3 +14,4 @@
 # isort:skip_file
 
 from .sympytransformer import SympyTransformer  # noqa: F401
+from .bool_optimizer import BoolOptimizerProfile, bestWorkingOptimizer  # noqa: F401

qlasskit/boolopt/bool_optimizer.py

@@ -18,7 +18,7 @@
 from sympy.logic.boolalg import And, Boolean, Not, Or, Xor, simplify_logic
 
 from ..ast2logic import BoolExpList
-from . import SympyTransformer, deprecated
+from . import SympyTransformer
 from .exp_transformers import (
     remove_Implies,
     remove_ITE,
@@ -83,18 +83,3 @@ def apply(self, exps):
         transform_or2and(),
     ]
 )
-
-
-deprecatedWorkingOptimizer = BoolOptimizerProfile(
-    [
-        deprecated.remove_const_exps,
-        deprecated.remove_unnecessary_assigns,
-        deprecated.merge_unnecessary_assigns,
-        merge_expressions,
-        apply_cse,
-        remove_ITE(),
-        remove_Implies(),
-        transform_or2xor(),
-        transform_or2and(),
-    ]
-)

qlasskit/qlassf.py

@@ -22,7 +22,7 @@
 
 from .ast2ast import ast2ast
 from .ast2logic import Arg, Args, BoolExpList, LogicFun, flatten, translate_ast
-from .boolopt.bool_optimizer import bestWorkingOptimizer
+from .boolopt import BoolOptimizerProfile, bestWorkingOptimizer
 from .compiler import SupportedCompiler, to_quantum
 from .types import *  # noqa: F403, F401
 from .types import Qtype, type_repr
@@ -180,6 +180,7 @@ def from_function(
         defs: List[LogicFun] = [],
         to_compile: bool = True,
         compiler: SupportedCompiler = "internal",
+        bool_optimizer: BoolOptimizerProfile = bestWorkingOptimizer,
     ) -> "QlassF":
         """Create a QlassF from a function or a string containing a function
 
@@ -189,6 +190,8 @@ def from_function(
             defs (List[LogicFun]): list of LogicFun to inject
             to_compile (boolean, optional): if True, compile to quantum circuit (default: True)
             compiler (SupportedCompiler, optional): override default compiler (default: internal)
+            bool_optimizer (BoolOptimizerProfile, optional): override default optimizer
+                (default: bestWorkingOptimizer)
         """
         if isinstance(f, str):
             exec(f)
@@ -199,7 +202,7 @@ def from_function(
         fun_name, args, fun_ret, exps = translate_ast(fun, types, defs)
         original_f = eval(fun_name) if isinstance(f, str) else f
 
-        exps = bestWorkingOptimizer.apply(exps)
+        exps = bool_optimizer.apply(exps)
 
         # print(exps)
 
@@ -217,6 +220,7 @@ def qlassf(
     defs: List[QlassF] = [],
     to_compile: bool = True,
     compiler: SupportedCompiler = "internal",
+    bool_optimizer: BoolOptimizerProfile = bestWorkingOptimizer,
 ) -> QlassF:
     """Decorator / function creating a QlassF object
 
@@ -225,7 +229,9 @@ def qlassf(
         types (List[Qtype]): list of qtypes to inject
         defs (List[Qlassf]): list of qlassf to inject
         to_compile (boolean, optional): if True, compile to quantum circuit (default: True)
-            compiler (SupportedCompiler, optional): override default compiler (default: internal)
+        compiler (SupportedCompiler, optional): override default compiler (default: internal)
+        bool_optimizer (BoolOptimizerProfile, optional): override default optimizer
+            (default: bestWorkingOptimizer)
     """
     defs_fun = list(map(lambda q: q.to_logicfun(), defs))