File tree Expand file tree Collapse file tree 3 files changed +10
-10
lines changed
Expand file tree Collapse file tree 3 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -574,9 +574,9 @@ def neg(node: NNF) -> NNF:
574574
575575 return neg (self )
576576
577- def to_CNF (self , simplify_tautologies : bool = True ) -> 'And[Or[Var]]' :
577+ def to_CNF (self , simplify : bool = True ) -> 'And[Or[Var]]' :
578578 """Compile theory to a semantically equivalent CNF formula."""
579- return tseitin .to_CNF (self , simplify_tautologies )
579+ return tseitin .to_CNF (self , simplify )
580580
581581 def _cnf_satisfiable (self ) -> bool :
582582 """Call a SAT solver on the presumed CNF theory."""
Original file line number Diff line number Diff line change 1010from nnf .util import memoize
1111
1212
13- def to_CNF (theory : NNF , simplify_tautologies : bool = True ) -> And [Or [Var ]]:
13+ def to_CNF (theory : NNF , simplify : bool = True ) -> And [Or [Var ]]:
1414 """Convert an NNF into CNF using the Tseitin Encoding.
1515
1616 :param theory: Theory to convert.
17- :param simplify_tautologies : If True, remove clauses that are always true.
17+ :param simplify : If True, remove clauses that are always true.
1818 """
1919
2020 clauses = []
@@ -35,7 +35,7 @@ def process_node(node: NNF) -> Var:
3535
3636 aux = Var .aux ()
3737
38- if simplify_tautologies and any (~ var in children for var in children ):
38+ if simplify and any (~ var in children for var in children ):
3939 if isinstance (node , And ):
4040 clauses .append (Or ({~ aux }))
4141 else :
@@ -74,7 +74,7 @@ def process_required(node: NNF) -> None:
7474
7575 elif isinstance (node , Or ):
7676 children = {process_node (c ) for c in node .children }
77- if simplify_tautologies and any (~ v in children for v in children ):
77+ if simplify and any (~ v in children for v in children ):
7878 return
7979 clauses .append (Or (children ))
8080
Original file line number Diff line number Diff line change @@ -1108,19 +1108,19 @@ def test_models(sentence: nnf.NNF):
11081108
11091109
11101110@given (NNF ())
1111- def test_tautology_simplification_names (sentence : nnf .NNF ):
1111+ def test_toCNF_simplification_names (sentence : nnf .NNF ):
11121112 names1 = set (sentence .vars ())
1113- T = sentence .to_CNF (simplify_tautologies = False )
1113+ T = sentence .to_CNF (simplify = False )
11141114 names2 = set ({v for v in T .vars () if not isinstance (v , nnf .Aux )})
11151115 assert names1 == names2
11161116
11171117
1118- def test_tautology_simplification ():
1118+ def test_toCNF_simplification ():
11191119 x = Var ("x" )
11201120 T = x | ~ x
11211121
11221122 T1 = T .to_CNF ()
1123- T2 = T .to_CNF (simplify_tautologies = False )
1123+ T2 = T .to_CNF (simplify = False )
11241124
11251125 assert T1 == nnf .true
11261126 assert T1 .is_CNF ()
You can’t perform that action at this time.
0 commit comments