From 65c7c12e75bdef1541897801c5c744b8c9264246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Blanc?= <regwblanc@gmail.com>
Date: Wed, 2 May 2012 16:56:18 +0200
Subject: [PATCH] add a negation of the contains test in evalClause
---
testcases/SatFun.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/testcases/SatFun.scala b/testcases/SatFun.scala
index 410f37557..da37a77fb 100644
--- a/testcases/SatFun.scala
+++ b/testcases/SatFun.scala
@@ -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
}
--
GitLab