Skip to content

Commit 2cb743f

Browse files
Natasha Yogananda Jeppudanielsn
Natasha Yogananda Jeppu
authored andcommitted
Store clause counter value from satcheck_minisat instead of storing the clause itself
Add comment to explain solver_clause_num + 1 in solver hardness, change <int> to <size_t> Remove sorting of clause set keeping performance in mind Add additional utility to map program lines to clauses in --dimacs output clang format
1 parent 3accf8d commit 2cb743f

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

regression/solver-hardness/solver-hardness-simple/test.desc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ main.c
55
^SIGNAL=0$
66
^\[main.assertion.\d+\] line \d+ assertion a \+ b \< 10: FAILURE$
77
^VERIFICATION FAILED$
8-
^Valid JSON File$
9-
\"SAT_hardness\": \{(\"ClauseSet\": \[.*\]|\"Clauses\": \d+|\"Variables\": \d+|\"Literals\": \d+), (\"ClauseSet\": \[.*\]|\"Clauses\": \d+|\"Variables\": \d+|\"Literals\": \d+), (\"ClauseSet\": \[.*\]|\"Clauses\": \d+|\"Variables\": \d+|\"Literals\": \d+), (\"ClauseSet\": \[.*\]|\"Clauses\": \d+|\"Variables\": \d+|\"Literals\": \d+)\}
8+
\"SAT_hardness\":\{(\"ClauseSet\":\[.*\]|\"Clauses\":\d+|\"Variables\":\d+|\"Literals\":\d+),(\"ClauseSet\":\[.*\]|\"Clauses\":\d+|\"Variables\":\d+|\"Literals\":\d+),(\"ClauseSet\":\[.*\]|\"Clauses\":\d+|\"Variables\":\d+|\"Literals\":\d+),(\"ClauseSet\":\[.*\]|\"Clauses\":\d+|\"Variables\":\d+|\"Literals\":\d+)\}
109
--
1110
^warning: ignoring

src/solvers/solver_hardness.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,10 @@ struct solver_hardnesst
106106
/// Called e.g. from the `satcheck_minisat2::lcnf`, this function adds the
107107
/// complexity statistics from the last SAT query to the `current_ssa_key`.
108108
/// \param bv: the clause (vector of literals)
109-
/// \param solver_clause_num: clause counter value passed from
110-
/// `satcheck_minisat2::lcnf`
109+
/// \param cnf: processed clause
110+
/// \param cnf_clause_index: index of clause in dimacs output
111+
/// \param register_cnf: negation of boolean variable tracking if the clause
112+
/// can be eliminated
111113
void register_clause(
112114
const bvt &bv,
113115
const bvt &cnf,

0 commit comments

Comments
 (0)