Skip to content

Make IPASIR support compile #5549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2020
Merged

Make IPASIR support compile #5549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,4 +163,4 @@ cadical-download:
doc :
doxygen

.PHONY: ipasir-build minisat2-download glucose-download
.PHONY: minisat2-download cudd-download glucose-download cadical-download
3 changes: 2 additions & 1 deletion src/memory-analyzer/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ SRC = \

INCLUDES= -I ..

LIBS = \
OBJ += \
../ansi-c/ansi-c$(LIBEXT) \
../goto-programs/goto-programs$(LIBEXT) \
../linking/linking$(LIBEXT) \
../util/util$(LIBEXT) \
../big-int/big-int$(LIBEXT) \
../langapi/langapi$(LIBEXT)

LIBS =

CLEANFILES = memory-analyzer$(EXEEXT)

Expand Down
7 changes: 5 additions & 2 deletions src/solvers/sat/satcheck_ipasir.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ void satcheck_ipasirt::lcnf(const bvt &bv)
}
ipasir_add(solver, 0); // terminate clause

with_solver_hardness(
[&bv](solver_hardnesst &hardness) { hardness.register_clause(bv); });

clause_counter++;
}

Expand Down Expand Up @@ -158,8 +161,8 @@ void satcheck_ipasirt::set_assignment(literalt a, bool value)
INVARIANT(false, "method not supported");
}

satcheck_ipasirt::satcheck_ipasirt()
: solver(nullptr)
satcheck_ipasirt::satcheck_ipasirt(message_handlert &message_handler)
: cnf_solvert(message_handler), solver(nullptr)
{
INVARIANT(!solver, "there cannot be a solver already");
solver=ipasir_init();
Expand Down
22 changes: 20 additions & 2 deletions src/solvers/sat/satcheck_ipasir.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ instructions.

#include "cnf.h"

#include <solvers/hardness_collector.h>

/// Interface for generic SAT solver interface IPASIR
class satcheck_ipasirt:public cnf_solvert
class satcheck_ipasirt : public cnf_solvert, public hardness_collectort
{
public:
satcheck_ipasirt();
satcheck_ipasirt(message_handlert &message_handler);
virtual ~satcheck_ipasirt() override;

/// This method returns the description produced by the linked SAT solver
Expand All @@ -44,12 +46,28 @@ class satcheck_ipasirt:public cnf_solvert
return true;
}

void
with_solver_hardness(std::function<void(solver_hardnesst &)> handler) override
{
if(solver_hardness.has_value())
{
handler(solver_hardness.value());
}
}

void enable_hardness_collection() override
{
solver_hardness = solver_hardnesst{};
}

protected:
resultt do_prop_solve() override;

void *solver;

bvt assumptions;

optionalt<solver_hardnesst> solver_hardness;
};

#endif // CPROVER_SOLVERS_SAT_SATCHECK_IPASIR_H