Remove requirement that DNF/CNF is simple

cjdrake · Mar 1, 2015 · 95c9328 · 95c9328
1 parent 65b3308
commit 95c9328
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/extension/boolexpr/boolexpr.c b/extension/boolexpr/boolexpr.c
@@ -560,9 +560,6 @@ BoolExpr_OpCount(struct BoolExpr *ex)
 bool
 BoolExpr_IsDNF(struct BoolExpr *ex)
 {
-    if (!IS_SIMPLE(ex))
-        return false;
-
     if (IS_ZERO(ex) || IS_LIT(ex)) {
         return true;
     }
@@ -586,9 +583,6 @@ BoolExpr_IsDNF(struct BoolExpr *ex)
 bool
 BoolExpr_IsCNF(struct BoolExpr *ex)
 {
-    if (!IS_SIMPLE(ex))
-        return false;
-
     if (IS_ONE(ex) || IS_LIT(ex)) {
         return true;
     }

diff --git a/extension/boolexpr/test/test_basic.cpp b/extension/boolexpr/test/test_basic.cpp
@@ -203,16 +203,16 @@ TEST_F(BoolExprTest, IsCnfDnf)
 
     // OR clause
     ops[0] = OrN(2, xns[0], xs[1], xns[2], xs[3]);
-    EXPECT_FALSE(BoolExpr_IsDNF(ops[0])); // not simple
-    EXPECT_FALSE(BoolExpr_IsCNF(ops[0])); // not simple
+    EXPECT_TRUE(BoolExpr_IsDNF(ops[0]));
+    EXPECT_TRUE(BoolExpr_IsCNF(ops[0]));
     ops[1] = BoolExpr_Simplify(ops[0]);
     EXPECT_TRUE(BoolExpr_IsDNF(ops[1]));
     EXPECT_TRUE(BoolExpr_IsCNF(ops[1]));
 
     // AND clause
     ops[2] = AndN(2, xns[0], xs[1], xns[2], xs[3]);
-    EXPECT_FALSE(BoolExpr_IsDNF(ops[2])); // not simple
-    EXPECT_FALSE(BoolExpr_IsCNF(ops[2])); // not simple
+    EXPECT_TRUE(BoolExpr_IsDNF(ops[2]));
+    EXPECT_TRUE(BoolExpr_IsCNF(ops[2]));
     ops[3] = BoolExpr_Simplify(ops[2]);
     EXPECT_TRUE(BoolExpr_IsDNF(ops[3]));
     EXPECT_TRUE(BoolExpr_IsCNF(ops[3]));