Skip to content

Commit

Permalink
Making things line up
Browse files Browse the repository at this point in the history
  • Loading branch information
msoos committed Jun 24, 2023
1 parent 841ef8b commit 99c4ed4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
11 changes: 9 additions & 2 deletions src/arjun.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,11 @@ DLL_PUBLIC bool Arjun::add_clause(const vector<CMSat::Lit>& lits)
return arjdata->common.solver->add_clause(lits);
}

DLL_PUBLIC bool Arjun::add_red_clause(const vector<CMSat::Lit>& lits)
{
return arjdata->common.solver->add_red_clause(lits);
}

DLL_PUBLIC bool Arjun::add_xor_clause(const vector<uint32_t>& vars, bool rhs)
{
assert(false && "Funnily enough this does NOT work. The XORs would generate a BVA variable, and that would then not be returned as part of the simplified CNF. We could calculate a smaller independent set, but that's all.");
Expand Down Expand Up @@ -587,14 +592,16 @@ DLL_PUBLIC SimplifiedCNF Arjun::get_fully_simplified_renumbered_cnf(
str = str2 + string("intree-probe, occ-backw-sub-str, sub-str-cls-with-bin, clean-cls, distill-cls,distill-bins, ") + str;

solver.simplify(&dont_elim, &str);
if (arjdata->common.conf.backbone_simpl)
if (arjdata->common.conf.backbone_simpl) {
bool finished;
solver.backbone_simpl(
arjdata->common.conf.backbone_simpl_max_confl,
arjdata->common.conf.backbone_simpl_cmsgen);
arjdata->common.conf.backbone_simpl_cmsgen, finished);
/* backbone_simpl( */
/* arjdata->common.conf.verb, */
/* arjdata->common.conf.backbone_simpl_max_confl, */
/* arjdata->common.conf.backbone_simpl_cmsgen, &solver); */
}
solver.simplify(&dont_elim, &str);
solver.simplify(&dont_elim, &str);
if (sparsify) {
Expand Down
1 change: 1 addition & 0 deletions src/arjun.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ namespace ArjunNS {
void new_var();
bool add_xor_clause(const std::vector<uint32_t>& vars, bool rhs);
bool add_clause(const std::vector<CMSat::Lit>& lits);
bool add_red_clause(const std::vector<CMSat::Lit>& lits);
bool add_bnn_clause(
const std::vector<CMSat::Lit>& lits,
signed cutoff,
Expand Down

0 comments on commit 99c4ed4

Please sign in to comment.