summaryrefslogtreecommitdiff
path: root/src/prop/minisat/simp
diff options
context:
space:
mode:
authorKshitij Bansal <kshitij@cs.nyu.edu>2012-02-22 03:00:24 +0000
committerKshitij Bansal <kshitij@cs.nyu.edu>2012-02-22 03:00:24 +0000
commit5113a97006ab1ed6de2eec471b9ad624d14e8d27 (patch)
tree1901f38edc7d6d5658d3f9f8c54e9e01ba83c779 /src/prop/minisat/simp
parent17cb8457875dbe3a9eb79312a9b6d158070f7224 (diff)
minor change to order fn in sat solver's ElimLt
(better, (marginally) faster -- regressions 3605, 3606)
Diffstat (limited to 'src/prop/minisat/simp')
-rw-r--r--src/prop/minisat/simp/SimpSolver.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/prop/minisat/simp/SimpSolver.h b/src/prop/minisat/simp/SimpSolver.h
index 9b5e5d45c..68ea6e463 100644
--- a/src/prop/minisat/simp/SimpSolver.h
+++ b/src/prop/minisat/simp/SimpSolver.h
@@ -114,13 +114,14 @@ class SimpSolver : public Solver {
// TODO: are 64-bit operations here noticably bad on 32-bit platforms? Could use a saturating
// 32-bit implementation instead then, but this will have to do for now.
uint64_t cost (Var x) const { return (uint64_t)n_occ[toInt(mkLit(x))] * (uint64_t)n_occ[toInt(~mkLit(x))]; }
- bool operator()(Var x, Var y) const { return cost(x) < cost(y); }
+
+ // old ordering function
+ // bool operator()(Var x, Var y) const { return cost(x) < cost(y); }
- // TODO: investigate this order alternative more.
- // bool operator()(Var x, Var y) const {
- // int c_x = cost(x);
- // int c_y = cost(y);
- // return c_x < c_y || c_x == c_y && x < y; }
+ bool operator()(Var x, Var y) const {
+ int c_x = cost(x);
+ int c_y = cost(y);
+ return c_x < c_y || c_x == c_y && x < y; }
};
struct ClauseDeleted {
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback