Skip to content
Snippets Groups Projects
Commit 65c7c12e authored by Régis Blanc's avatar Régis Blanc
Browse files

add a negation of the contains test in evalClause

parent 100929ba
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
testcases/SatFun.scala
+ 2
− 2
View file @ 65c7c12e
......@@ -38,7 +38,7 @@ object SatFun {
case VarCons(v, vs) => (if(v < 0) trueVars.contains(-v) else trueVars.contains(v)) || evalClauseCnf(vs, trueVars)
if(v == 1) true
else if(v == -1) evalClauseCnf(vs, trueVars)
else if(v < -1) trueVars.contains(-v) || evalClauseCnf(vs, trueVars)
else if(v < -1) !trueVars.contains(-v) || evalClauseCnf(vs, trueVars)
else if(v > 1) trueVars.contains(v) || evalClauseCnf(vs, trueVars)
else false
case VarNil() => false
......@@ -48,7 +48,7 @@ object SatFun {
case VarCons(v, vs) => {
if(v == 1) evalClauseDnf(vs, trueVars)
else if(v == -1) false
else if(v < -1) trueVars.contains(-v) && evalClauseDnf(vs, trueVars)
else if(v < -1) !trueVars.contains(-v) && evalClauseDnf(vs, trueVars)
else if(v > 1) trueVars.contains(v) && evalClauseDnf(vs, trueVars)
else false
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment