clean up

src/ProblemReductions.jl

@@ -21,7 +21,6 @@ export target_problem, AbstractProblem, AbstractReductionResult, reduceto, extra
 export spinglass_circuit
 export findbest, BruteForce
 
-include("Core.jl")
 include("truth_table.jl")
 include("topology.jl")
 include("bitvector.jl")

test/models/Circuit.jl

@@ -1,5 +1,32 @@
 using ProblemReductions, Test
+using ProblemReductions: BooleanExpr, booleans, is_literal, is_cnf, is_dnf
 
+@testset "clauses" begin
+    a, b, c, d, e = booleans(5)
+    @test a isa BooleanExpr
+    @test a.head == :var
+    @test a.var == Symbol(1)
+    nota = ¬a
+    @test is_literal(a)
+    @test is_literal(¬a)
+    @test nota isa BooleanExpr
+    @test nota.head == :¬
+    @test nota.args[1] == a
+
+    clause = ∧(∨(¬a, b), ∨(c, ¬e))
+    @test is_cnf(clause)
+    clause = ∨(∧(a, b), ∧(c, ¬e))
+    @test is_dnf(clause)
+end
+
+@testset "hash, eval" begin
+    a, b, c, d, e = booleans(5)
+    expr = (a ∧ b) ∨ (c ∧ ¬e)
+    d = Dict(a=>true, b=>true, c=>true, e=>false)
+    @test ProblemReductions.evaluate(a, d)  == true
+    @test d[a] == true
+    @test ProblemReductions.evaluate(expr, d) == true
+end
 @testset "circuit expr" begin
     ex = quote
         c = x ∧ y

test/runtests.jl

@@ -14,10 +14,6 @@ end
     include("rules/rules.jl")
 end
 
-@testset "sat" begin
-    include("sat.jl")
-end
-
 @testset "topology" begin
     include("topology.jl")
 end