projects
/
satune.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Renaming
[satune.git]
/
src
/
Test
/
testcnf.c
diff --git
a/src/Test/testcnf.c
b/src/Test/testcnf.c
index 20cd5cd4668cdc001941a0c90b09adccc291a8c3..6740543ffaeef71821e83a5f0721310e1866295c 100644
(file)
--- a/
src/Test/testcnf.c
+++ b/
src/Test/testcnf.c
@@
-7,7
+7,6
@@
int main(int numargs, char ** argv) {
Edge v2=constraintNewVar(cnf);
Edge v3=constraintNewVar(cnf);
Edge v4=constraintNewVar(cnf);
Edge v2=constraintNewVar(cnf);
Edge v3=constraintNewVar(cnf);
Edge v4=constraintNewVar(cnf);
- Edge v5=constraintNewVar(cnf);
Edge nv1=constraintNegate(v1);
Edge nv2=constraintNegate(v2);
Edge nv1=constraintNegate(v1);
Edge nv2=constraintNegate(v2);
@@
-18,7
+17,7
@@
int main(int numargs, char ** argv) {
Edge c2=constraintAND2(cnf, v3, nv4);
Edge c3=constraintAND2(cnf, nv1, v2);
Edge c4=constraintAND2(cnf, nv3, v4);
Edge c2=constraintAND2(cnf, v3, nv4);
Edge c3=constraintAND2(cnf, nv1, v2);
Edge c4=constraintAND2(cnf, nv3, v4);
- Edge cor=constraintOR2(cnf, constraintAND2(cnf, c1, c2),
v5
);
+ Edge cor=constraintOR2(cnf, constraintAND2(cnf, c1, c2),
constraintAND2(cnf, c3, c4)
);
printCNF(cor);
printf("\n");
addConstraintCNF(cnf, cor);
printCNF(cor);
printf("\n");
addConstraintCNF(cnf, cor);