Implement sum(..) and sum_and(..).
Fixes #231. * NEWS: Mention of implementation of sum, sum_and. * bin/autfilt.cc: Add --sum, --sum-or and --sum-and options. * python/spot/impl.i: Add bindings for sum, sum_and. * spot/twaalgos/Makefile.am: Add sum.cc, sum.hh. * spot/twaalgos/sum.cc: Implement sum, sum_and. * spot/twaalgos/sum.hh: Declaration of sum, sum_and. * tests/Makefile.am: Add sum tests. * tests/core/explsum.test: Test the sum of two automatons, false or false, unsatisfied mark propagation, handling of univ. transitions. * tests/python/sum.py: Check that two automatons that does not share their bdd dict are not accepted, then run tests over the sum of randomly generated LTL formulas.
This commit is contained in:
Thomas Medioni
parent
5793cf32f9
commit
194c199232
9 changed files with 615 additions and 0 deletions
|
|
@ -78,6 +78,7 @@ twaalgos_HEADERS = \
|
|||
stats.hh \
|
||||
stripacc.hh \
|
||||
stutter.hh \
|
||||
sum.hh \
|
||||
tau03.hh \
|
||||
tau03opt.hh \
|
||||
totgba.hh \
|
||||
|
|
@ -136,6 +137,7 @@ libtwaalgos_la_SOURCES = \
|
|||
stats.cc \
|
||||
stripacc.cc \
|
||||
stutter.cc \
|
||||
sum.cc \
|
||||
tau03.cc \
|
||||
tau03opt.cc \
|
||||
totgba.cc \
|
||||
|
|
|
|||
182
spot/twaalgos/sum.cc
Normal file
182
spot/twaalgos/sum.cc
Normal file
|
|
@ -0,0 +1,182 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2017 Laboratoire de Recherche et Développement
|
||||
// de l'Epita (LRDE).
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
// Spot is free software; you can redistribute it and/or modify it
|
||||
// under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
// License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#include <spot/twaalgos/sum.hh>
|
||||
#include <spot/twa/twagraph.hh>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
|
||||
namespace spot
|
||||
{
|
||||
namespace
|
||||
{
|
||||
// Helper function that connects a new initial state to the automaton,
|
||||
// in replacement of graph_init
|
||||
static
|
||||
void connect_init_state(const twa_graph_ptr& res,
|
||||
const const_twa_graph_ptr& graph,
|
||||
unsigned init,
|
||||
unsigned graph_init,
|
||||
unsigned offset = 0U)
|
||||
{
|
||||
std::map<unsigned, bdd> edges;
|
||||
std::vector<unsigned> dst;
|
||||
for (auto& e : graph->out(graph_init))
|
||||
{
|
||||
for (auto& d : graph->univ_dests(e))
|
||||
dst.push_back(d + offset);
|
||||
if (dst.size() > 1)
|
||||
res->new_univ_edge(init, dst.begin(), dst.end(), e.cond, 0U);
|
||||
else
|
||||
edges[dst[0]] |= e.cond;
|
||||
dst.clear();
|
||||
}
|
||||
for (auto& p : edges)
|
||||
res->new_edge(init, p.first, p.second);
|
||||
}
|
||||
|
||||
// Helper function that copies the states of graph into res, adding
|
||||
// offset to the state ID, mark to the current mark of the edges,
|
||||
// and setting the number of states to num_sets
|
||||
static
|
||||
void copy_union(const twa_graph_ptr& res,
|
||||
const const_twa_graph_ptr& graph,
|
||||
acc_cond::mark_t mark = 0U,
|
||||
unsigned offset = 0U)
|
||||
{
|
||||
auto state_offset = res->num_states();
|
||||
|
||||
res->new_states(graph->num_states());
|
||||
|
||||
std::vector<unsigned> dst;
|
||||
for (auto& e : graph->edges())
|
||||
{
|
||||
for (auto& d : graph->univ_dests(e))
|
||||
dst.push_back(d + state_offset);
|
||||
|
||||
res->new_univ_edge(e.src + state_offset,
|
||||
dst.begin(), dst.end(),
|
||||
e.cond,
|
||||
(e.acc << offset)| mark);
|
||||
dst.clear();
|
||||
}
|
||||
}
|
||||
|
||||
// Helper function that perform the sum of the automaton in left and the
|
||||
// automaton in right, using is_sum true for sum_or and is_sum false
|
||||
// as sum_and
|
||||
static
|
||||
twa_graph_ptr sum_aux(const const_twa_graph_ptr& left,
|
||||
const const_twa_graph_ptr& right,
|
||||
unsigned left_state,
|
||||
unsigned right_state,
|
||||
bool is_sum)
|
||||
{
|
||||
if (left->get_dict() != right->get_dict())
|
||||
throw std::runtime_error("sum: left and right automata should "
|
||||
"share their bdd_dict");
|
||||
auto res = make_twa_graph(left->get_dict());
|
||||
res->copy_ap_of(left);
|
||||
res->copy_ap_of(right);
|
||||
|
||||
auto unsatl = left->acc().unsat_mark();
|
||||
acc_cond::mark_t markl = 0U;
|
||||
acc_cond::mark_t markr = 0U;
|
||||
auto left_acc = left->get_acceptance();
|
||||
auto left_num_sets = left->num_sets();
|
||||
if (!unsatl.first)
|
||||
{
|
||||
markl.set(0);
|
||||
left_num_sets = 1;
|
||||
left_acc = acc_cond::acc_code::buchi();
|
||||
}
|
||||
else
|
||||
{
|
||||
markr |= unsatl.second;
|
||||
}
|
||||
|
||||
auto unsatr = right->acc().unsat_mark();
|
||||
auto right_acc = right->get_acceptance();
|
||||
auto right_num_sets = right->num_sets();
|
||||
if (!unsatr.first)
|
||||
{
|
||||
markr.set(left_num_sets);
|
||||
right_num_sets = 1;
|
||||
right_acc = acc_cond::acc_code::buchi();
|
||||
}
|
||||
else
|
||||
{
|
||||
markl |= (unsatr.second << left_num_sets);
|
||||
}
|
||||
res->set_acceptance(left_num_sets + right_num_sets,
|
||||
(right_acc << left_num_sets) |= left_acc);
|
||||
copy_union(res, left, markl);
|
||||
copy_union(res, right, markr, left_num_sets);
|
||||
|
||||
if (is_sum)
|
||||
{
|
||||
unsigned init = res->new_state();
|
||||
res->set_init_state(init);
|
||||
|
||||
connect_init_state(res, left, init, left_state);
|
||||
connect_init_state(res, right, init, right_state, left->num_states());
|
||||
}
|
||||
else
|
||||
{
|
||||
res->set_univ_init_state({ left_state,
|
||||
right_state + left->num_states() });
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
twa_graph_ptr sum(const const_twa_graph_ptr& left,
|
||||
const const_twa_graph_ptr& right,
|
||||
unsigned left_state,
|
||||
unsigned right_state)
|
||||
{
|
||||
return sum_aux(left, right, left_state, right_state, true);
|
||||
}
|
||||
|
||||
twa_graph_ptr sum(const const_twa_graph_ptr& left,
|
||||
const const_twa_graph_ptr& right)
|
||||
{
|
||||
return sum(left, right,
|
||||
left->get_init_state_number(),
|
||||
right->get_init_state_number());
|
||||
}
|
||||
|
||||
twa_graph_ptr sum_and(const const_twa_graph_ptr& left,
|
||||
const const_twa_graph_ptr& right,
|
||||
unsigned left_state,
|
||||
unsigned right_state)
|
||||
{
|
||||
return sum_aux(left, right, left_state, right_state, false);
|
||||
}
|
||||
twa_graph_ptr sum_and(const const_twa_graph_ptr& left,
|
||||
const const_twa_graph_ptr& right)
|
||||
{
|
||||
return sum_and(left,
|
||||
right,
|
||||
left->get_init_state_number(),
|
||||
right->get_init_state_number());
|
||||
}
|
||||
|
||||
}
|
||||
74
spot/twaalgos/sum.hh
Normal file
74
spot/twaalgos/sum.hh
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2017 Laboratoire de Recherche et
|
||||
// Développement de l'Epita (LRDE).
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
// Spot is free software; you can redistribute it and/or modify it
|
||||
// under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation; either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
// Spot is distributed in the hope that it will be useful, but WITHOUT
|
||||
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
|
||||
// License for more details.
|
||||
//
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <spot/misc/common.hh>
|
||||
#include <spot/twa/fwd.hh>
|
||||
|
||||
namespace spot
|
||||
{
|
||||
/// \brief Sum two twa into a new twa, performing the union of the two input
|
||||
/// automatons.
|
||||
///
|
||||
/// \param left Left term of the sum.
|
||||
/// \param right Right term of the sum.
|
||||
/// \return A spot::twa_graph containing the sum of \a left and \a right
|
||||
SPOT_API
|
||||
twa_graph_ptr sum(const const_twa_graph_ptr& left,
|
||||
const const_twa_graph_ptr& right);
|
||||
|
||||
/// \brief Sum two twa into a new twa, performing the union of the two input
|
||||
/// automatons.
|
||||
///
|
||||
/// \param left Left term of the sum.
|
||||
/// \param right Right term of the sum.
|
||||
/// \param left_state Initial state of the left term of the sum.
|
||||
/// \param right_state Initial state of the right term of the sum.
|
||||
/// \return A spot::twa_graph containing the sum of \a left and \a right
|
||||
SPOT_API
|
||||
twa_graph_ptr sum(const const_twa_graph_ptr& left,
|
||||
const const_twa_graph_ptr& right,
|
||||
unsigned left_state,
|
||||
unsigned right_state);
|
||||
|
||||
/// \brief Sum two twa into a new twa, using an universal initial transition,
|
||||
/// performing the intersection of the two languages of the input automatons.
|
||||
///
|
||||
/// \param left Left term of the sum.
|
||||
/// \param right Right term of the sum.
|
||||
/// \return A spot::twa_graph containing the sum of \a left and \a right
|
||||
SPOT_API
|
||||
twa_graph_ptr sum_and(const const_twa_graph_ptr& left,
|
||||
const const_twa_graph_ptr& right);
|
||||
|
||||
/// \brief Sum two twa into a new twa, using an universal initial transition,
|
||||
/// performing the intersection of the two languages of the input automatons.
|
||||
///
|
||||
/// \param left Left term of the sum.
|
||||
/// \param right Right term of the sum.
|
||||
/// \param left_state Initial state of the left term of the sum.
|
||||
/// \param right_state Initial state of the right term of the sum.
|
||||
/// \return A spot::twa_graph containing the sum of \a left and \a right
|
||||
SPOT_API
|
||||
twa_graph_ptr sum_and(const const_twa_graph_ptr& left,
|
||||
const const_twa_graph_ptr& right,
|
||||
unsigned left_state,
|
||||
unsigned right_state);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue