Skip to content

Cleanup error handling in solvers/miniBDD #2959

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
Sep 19, 2018
Merged

Cleanup error handling in solvers/miniBDD #2959

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
89 changes: 51 additions & 38 deletions src/solvers/miniBDD/miniBDD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Author: Daniel Kroening, [email protected]

#include "miniBDD.h"

#include <cassert>
#include <util/invariant.h>

#include <iostream>

Expand All @@ -22,8 +22,8 @@ Author: Daniel Kroening, [email protected]

void mini_bdd_nodet::remove_reference()
{
// NOLINTNEXTLINE(build/deprecated)
assert(reference_counter!=0);
PRECONDITION_WITH_DIAGNOSTICS(
reference_counter != 0, "all references were already removed");

reference_counter--;

Expand Down Expand Up @@ -209,10 +209,12 @@ class mini_bdd_applyt

mini_bddt mini_bdd_applyt::APP_rec(const mini_bddt &x, const mini_bddt &y)
{
// NOLINTNEXTLINE(build/deprecated)
assert(x.is_initialized() && y.is_initialized());
// NOLINTNEXTLINE(build/deprecated)
assert(x.node->mgr==y.node->mgr);
PRECONDITION_WITH_DIAGNOSTICS(
x.is_initialized() && y.is_initialized(),
"apply can only be called on initialized BDDs");
PRECONDITION_WITH_DIAGNOSTICS(
x.node->mgr == y.node->mgr,
"apply can only be called on BDDs with the same manager");

// dynamic programming
std::pair<unsigned, unsigned> key(x.node_number(), y.node_number());
Expand Down Expand Up @@ -273,10 +275,13 @@ mini_bddt mini_bdd_applyt::APP_non_rec(
auto &t=stack.top();
const mini_bddt &x=t.x;
const mini_bddt &y=t.y;
// NOLINTNEXTLINE(build/deprecated)
assert(x.is_initialized() && y.is_initialized());
// NOLINTNEXTLINE(build/deprecated)
assert(x.node->mgr==y.node->mgr);

INVARIANT(
x.is_initialized() && y.is_initialized(),
"apply can only be called on initialized BDDs");
INVARIANT(
x.node->mgr == y.node->mgr,
"apply can only be called on BDDs with the same manager");

switch(t.phase)
{
Expand All @@ -302,36 +307,42 @@ mini_bddt mini_bdd_applyt::APP_non_rec(
{
t.var=x.var();
t.phase=stack_elementt::phaset::FINISH;
// NOLINTNEXTLINE(build/deprecated)
assert(x.low().var()>t.var);
// NOLINTNEXTLINE(build/deprecated)
assert(y.low().var()>t.var);
// NOLINTNEXTLINE(build/deprecated)
assert(x.high().var()>t.var);
// NOLINTNEXTLINE(build/deprecated)
assert(y.high().var()>t.var);

INVARIANT(
x.low().var() > t.var, "applying won't break variable order");
INVARIANT(
y.low().var() > t.var, "applying won't break variable order");
INVARIANT(
x.high().var() > t.var, "applying won't break variable order");
INVARIANT(
y.high().var() > t.var, "applying won't break variable order");

stack.push(stack_elementt(t.lr, x.low(), y.low()));
stack.push(stack_elementt(t.hr, x.high(), y.high()));
}
else if(x.var()<y.var())
{
t.var=x.var();
t.phase=stack_elementt::phaset::FINISH;
// NOLINTNEXTLINE(build/deprecated)
assert(x.low().var()>t.var);
// NOLINTNEXTLINE(build/deprecated)
assert(x.high().var()>t.var);

INVARIANT(
x.low().var() > t.var, "applying won't break variable order");
INVARIANT(
x.high().var() > t.var, "applying won't break variable order");

stack.push(stack_elementt(t.lr, x.low(), y));
stack.push(stack_elementt(t.hr, x.high(), y));
}
else /* x.var() > y.var() */
{
t.var=y.var();
t.phase=stack_elementt::phaset::FINISH;
// NOLINTNEXTLINE(build/deprecated)
assert(y.low().var()>t.var);
// NOLINTNEXTLINE(build/deprecated)
assert(y.high().var()>t.var);

INVARIANT(
y.low().var() > t.var, "applying won't break variable order");
INVARIANT(
y.high().var() > t.var, "applying won't break variable order");

stack.push(stack_elementt(t.lr, x, y.low()));
stack.push(stack_elementt(t.hr, x, y.high()));
}
Expand All @@ -350,8 +361,8 @@ mini_bddt mini_bdd_applyt::APP_non_rec(
}
}

// NOLINTNEXTLINE(build/deprecated)
assert(u.is_initialized());
POSTCONDITION_WITH_DIAGNOSTICS(
u.is_initialized(), "the resulting BDD is initialized");

return u;
}
Expand All @@ -378,8 +389,8 @@ mini_bddt mini_bddt::operator^(const mini_bddt &other) const

mini_bddt mini_bddt::operator!() const
{
// NOLINTNEXTLINE(build/deprecated)
assert(is_initialized());
PRECONDITION_WITH_DIAGNOSTICS(
is_initialized(), "BDD has to be initialized for negation");
return node->mgr->True()^*this;
}

Expand Down Expand Up @@ -421,12 +432,13 @@ mini_bddt mini_bdd_mgrt::mk(
const mini_bddt &low,
const mini_bddt &high)
{
PRECONDITION_WITH_DIAGNOSTICS(
var <= var_table.size(), "cannot make a BDD for an unknown variable");
PRECONDITION_WITH_DIAGNOSTICS(
low.var() > var, "low-edge would break variable ordering");
// NOLINTNEXTLINE(build/deprecated)
assert(var<=var_table.size());
// NOLINTNEXTLINE(build/deprecated)
assert(low.var()>var);
// NOLINTNEXTLINE(build/deprecated)
assert(high.var()>var);
PRECONDITION_WITH_DIAGNOSTICS(
high.var() > var, "high-edge would break variable ordering");

if(low.node_number()==high.node_number())
return low;
Expand Down Expand Up @@ -525,8 +537,9 @@ mini_bddt restrictt::RES(const mini_bddt &u)
{
// replace 'var' in 'u' by constant 'value'

// NOLINTNEXTLINE(build/deprecated)
assert(u.is_initialized());
PRECONDITION_WITH_DIAGNOSTICS(
u.is_initialized(),
"restricting variables can only be done in initialized BDDs");
mini_bdd_mgrt *mgr=u.node->mgr;

mini_bddt t;
Expand Down
22 changes: 11 additions & 11 deletions src/solvers/miniBDD/miniBDD.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <cassert>
#include <util/invariant.h>

// inline functions

Expand All @@ -18,7 +18,7 @@ inline mini_bddt::mini_bddt(class mini_bdd_nodet *_node):node(_node)

inline mini_bddt &mini_bddt::operator=(const mini_bddt &x)
{
assert(&x!=this);
PRECONDITION_WITH_DIAGNOSTICS(&x != this, "cannot assign itself");
clear();

node=x.node;
Expand All @@ -35,45 +35,45 @@ inline mini_bddt::~mini_bddt()

inline bool mini_bddt::is_constant() const
{
assert(is_initialized());
PRECONDITION_WITH_DIAGNOSTICS(is_initialized(), "BDD has to be initialized");
return node->node_number<=1;
}

inline bool mini_bddt::is_true() const
{
assert(is_initialized());
PRECONDITION_WITH_DIAGNOSTICS(is_initialized(), "BDD has to be initialized");
return node->node_number==1;
}

inline bool mini_bddt::is_false() const
{
assert(is_initialized());
PRECONDITION_WITH_DIAGNOSTICS(is_initialized(), "BDD has to be initialized");
return node->node_number==0;
}

inline unsigned mini_bddt::var() const
{
assert(is_initialized());
PRECONDITION_WITH_DIAGNOSTICS(is_initialized(), "BDD has to be initialized");
return node->var;
}

inline unsigned mini_bddt::node_number() const
{
assert(is_initialized());
PRECONDITION_WITH_DIAGNOSTICS(is_initialized(), "BDD has to be initialized");
return node->node_number;
}

inline const mini_bddt &mini_bddt::low() const
{
assert(is_initialized());
assert(node->node_number>=2);
PRECONDITION_WITH_DIAGNOSTICS(is_initialized(), "BDD has to be initialized");
PRECONDITION_WITH_DIAGNOSTICS(node->node_number >= 2, "only non-terminal nodes have out-going edges");
return node->low;
}

inline const mini_bddt &mini_bddt::high() const
{
assert(is_initialized());
assert(node->node_number>=2);
PRECONDITION_WITH_DIAGNOSTICS(is_initialized(), "BDD has to be initialized");
PRECONDITION_WITH_DIAGNOSTICS(node->node_number >= 2, "only non-terminal nodes have out-going edges");
return node->high;
}

Expand Down