spot/src/tgba/tgbabddprod.cc
Alexandre Duret-Lutz ab09c18597 Make sure we can multiply two tgba_explicit.
* tgba/state.hh (state::translate, state::clone, state::as_bdd):
New virtual methods.
* tgba/stataebdd.cc (state::translate, state::clone): New methods.
* tgba/stataebdd.hh (state::translate, state::clone): New methods.
* tgba/tgbabddprod.cc (state_bdd_product::clone,
tgba_bdd_product_succ_iterator::~tgba_bdd_product_succ_iterator):
New methods.
(tgba_bdd_product_succ_iterator::first): Reset right_
if any of left_ or right_ is already done (i.e., is empty).
(tgba_bdd_product_succ_iterator::done): Return true
if right_ is NULL.
(tgba_bdd_product_succ_iterator::current_state,
tgba_bdd_product::get_init_state): Work	directory with `state's.
* tgba/tgbabddprod.hh (state_bdd_product::clone,
tgba_bdd_product_succ_iterator::~tgba_bdd_product_succ_iterator):
New methods.
* tgba/tgbabddtranslateproxy.cc
(tgba_bdd_translate_proxy_succ_iterator::
tgba_bdd_translate_proxy_succ_iterator): Work on any kind of iteraator.
(tgba_bdd_translate_proxy_succ_iterator::
~tgba_bdd_translate_proxy_succ_iterator): New method.
(tgba_bdd_translate_proxy_succ_iterator::current_state,
tgba_bdd_translate_proxy::get_init_state,
tgba_bdd_translate_proxy::succ_iter): Work on `state's and
`tgba_succ_iterator's directlry.
(tgba_bdd_translate_proxy::format_state): Delegate formating
to the proxied automata.
* tgba/tgbaexplicit.cc (state_explicit::clone): New method.
* src/tgba/tgbaexplicit.cc (tgba_explicit::get_condition,
tgba_explicit::get_promise): Call ltl::destroy on existing formulae.
* tgbatest/Makefile.am (check_PROGRAMS): Add explprod.
(explprod_SOURCES): New variable.
(TESTS): Add explprod.test.
(CLEANFILES): Add input1 and input2.
2003-06-16 15:18:20 +00:00

206 lines
4.3 KiB
C++

#include "tgbabddprod.hh"
#include "tgbabddtranslateproxy.hh"
#include "dictunion.hh"
#include <cassert>
namespace spot
{
////////////////////////////////////////////////////////////
// state_bdd_product
state_bdd_product::~state_bdd_product()
{
delete left_;
delete right_;
}
int
state_bdd_product::compare(const state* other) const
{
const state_bdd_product* o = dynamic_cast<const state_bdd_product*>(other);
assert(o);
int res = left_->compare(o->left());
if (res != 0)
return res;
return right_->compare(o->right());
}
state_bdd_product*
state_bdd_product::clone() const
{
return new state_bdd_product(*this);
}
////////////////////////////////////////////////////////////
// tgba_bdd_product_succ_iterator
tgba_bdd_product_succ_iterator::tgba_bdd_product_succ_iterator
(tgba_succ_iterator* left, tgba_succ_iterator* right)
: left_(left), right_(right)
{
}
tgba_bdd_product_succ_iterator::~tgba_bdd_product_succ_iterator()
{
delete left_;
if (right_)
delete right_;
}
void
tgba_bdd_product_succ_iterator::step_()
{
left_->next();
if (left_->done())
{
left_->first();
right_->next();
}
}
void
tgba_bdd_product_succ_iterator::next_non_false_()
{
while (!done())
{
bdd l = left_->current_condition();
bdd r = right_->current_condition();
bdd current_cond = l & r;
if (current_cond != bddfalse)
{
current_cond_ = current_cond;
return;
}
step_();
}
}
void
tgba_bdd_product_succ_iterator::first()
{
if (!right_)
return;
left_->first();
right_->first();
// If one of the two successor set is empty initially, we reset
// right_, so that done() can detect this situation easily. (We
// choose to reset right_ because this variable is already used by
// done().)
if (left_->done() || right_->done())
{
delete right_;
right_ = 0;
}
next_non_false_();
}
void
tgba_bdd_product_succ_iterator::next()
{
step_();
next_non_false_();
}
bool
tgba_bdd_product_succ_iterator::done()
{
return !right_ || right_->done();
}
state_bdd_product*
tgba_bdd_product_succ_iterator::current_state()
{
return new state_bdd_product(left_->current_state(),
right_->current_state());
}
bdd
tgba_bdd_product_succ_iterator::current_condition()
{
return current_cond_;
}
bdd tgba_bdd_product_succ_iterator::current_promise()
{
return left_->current_promise() & right_->current_promise();
}
////////////////////////////////////////////////////////////
// tgba_bdd_product
tgba_bdd_product::tgba_bdd_product(const tgba& left, const tgba& right)
: dict_(tgba_bdd_dict_union(left.get_dict(), right.get_dict()))
{
// Translate the left automaton if needed.
if (dict_.contains(left.get_dict()))
{
left_ = &left;
left_should_be_freed_ = false;
}
else
{
left_ = new tgba_bdd_translate_proxy(left, dict_);
left_should_be_freed_ = true;
}
// Translate the right automaton if needed.
if (dict_.contains(right.get_dict()))
{
right_ = &right;
right_should_be_freed_ = false;
}
else
{
right_ = new tgba_bdd_translate_proxy(right, dict_);
right_should_be_freed_ = true;
}
}
tgba_bdd_product::~tgba_bdd_product()
{
if (left_should_be_freed_)
delete left_;
if (right_should_be_freed_)
delete right_;
}
state*
tgba_bdd_product::get_init_state() const
{
return new state_bdd_product(left_->get_init_state(),
right_->get_init_state());
}
tgba_bdd_product_succ_iterator*
tgba_bdd_product::succ_iter(const state* state) const
{
const state_bdd_product* s = dynamic_cast<const state_bdd_product*>(state);
assert(s);
tgba_succ_iterator* li = left_->succ_iter(s->left());
tgba_succ_iterator* ri = right_->succ_iter(s->right());
return new tgba_bdd_product_succ_iterator(li, ri);
}
const tgba_bdd_dict&
tgba_bdd_product::get_dict() const
{
return dict_;
}
std::string
tgba_bdd_product::format_state(const state* state) const
{
const state_bdd_product* s = dynamic_cast<const state_bdd_product*>(state);
assert(s);
return (left_->format_state(s->left())
+ " * "
+ right_->format_state(s->right()));
}
}