Moved IAR and the new version of to_parity in toparity.cc
* python/spot/__init__.py: Use keyword arguments in to_parity() * python/spot/impl.i: remove useless includes. * spot/twaalgos/car.cc, spot/twaalgos/car.hh, spot/twaalgos/rabin2parity.cc, spot/twaalgos/rabin2parity.hh, tests/Makefile.am, spot/twaalgos/Makefile.am: content moved to toparity. * spot/twaalgos/postproc.cc: Use the new version of to_parity in postprocessor::run. * spot/twaalgos/toparity.cc, spot/twaalgos/toparity.hh: Add the content of rabin2parity and car. * tests/python/car.py, tests/python/toparity.py: Moved all tests from car.py to toparity.py. * tests/python/except.py: Change iar() to iar_old().
This commit is contained in:
parent
dddc7920e4
commit
75990063f0
14 changed files with 2027 additions and 2105 deletions
|
|
@ -1,6 +1,6 @@
|
|||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2018 Laboratoire de Recherche et Développement
|
||||
// de l'Epita.
|
||||
// Copyright (C) 2012-2020 Laboratoire de Recherche et Développement
|
||||
// de l'Epita (LRDE).
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
|
|
@ -23,11 +23,91 @@
|
|||
|
||||
namespace spot
|
||||
{
|
||||
// The version that combines CAR, IAR and multiple optimizations.
|
||||
struct car_option
|
||||
{
|
||||
bool search_ex = true;
|
||||
bool use_last = true;
|
||||
bool force_order = true;
|
||||
bool partial_degen = true;
|
||||
bool acc_clean = true;
|
||||
bool parity_equiv = true;
|
||||
bool parity_prefix = true;
|
||||
bool rabin_to_buchi = true;
|
||||
bool reduce_col_deg = false;
|
||||
bool propagate_col = true;
|
||||
bool pretty_print = false;
|
||||
};
|
||||
|
||||
|
||||
|
||||
/// \ingroup twa_acc_transform
|
||||
/// \brief Take an automaton with any acceptance condition and return an
|
||||
/// equivalent parity automaton.
|
||||
///
|
||||
/// The parity condition of the returned automaton is max even or
|
||||
/// max odd.
|
||||
/// If \a search_ex is true, when we move several elements, we
|
||||
/// try to find an order such that the new permutation already exists.
|
||||
/// If \a partial_degen is true, we apply a partial degeneralization to remove
|
||||
// occurences of Fin | Fin and Inf & Inf.
|
||||
/// If \a scc_acc_clean is true, we remove for each SCC the colors that don't
|
||||
// appear.
|
||||
/// If \a parity_equiv is true, we check if there exists a permutations of
|
||||
// colors such that the acceptance
|
||||
/// condition is a partity condition.
|
||||
/// If \a use_last is true, we use the most recent state when looking for an
|
||||
// existing state.
|
||||
/// If \a pretty_print is true, we give a name to the states describing the
|
||||
// state of the aut_ and the permutation.
|
||||
|
||||
SPOT_API twa_graph_ptr
|
||||
remove_false_transitions(const twa_graph_ptr a);
|
||||
|
||||
SPOT_API twa_graph_ptr
|
||||
to_parity(const twa_graph_ptr &aut, const car_option options = car_option());
|
||||
|
||||
|
||||
// Old version of CAR
|
||||
|
||||
/// \ingroup twa_acc_transform
|
||||
/// \brief Take an automaton with any acceptance condition and return an
|
||||
/// equivalent parity automaton.
|
||||
///
|
||||
/// The parity condition of the returned automaton is max even.
|
||||
SPOT_API twa_graph_ptr
|
||||
to_parity(const const_twa_graph_ptr& aut, bool pretty_print=false);
|
||||
}
|
||||
to_parity_old(const const_twa_graph_ptr& aut, bool pretty_print=false);
|
||||
|
||||
// Old version of IAR
|
||||
/// \ingroup twa_acc_transform
|
||||
/// \brief Turn a Rabin-like or Streett-like automaton into a parity automaton
|
||||
/// based on the index appearence record (IAR)
|
||||
///
|
||||
/// If the input automaton has n states and k pairs, the output automaton has
|
||||
/// at most k!*n states and 2k+1 colors. If the input automaton is
|
||||
/// deterministic, the output automaton is deterministic as well, which is the
|
||||
/// intended use case for this function. If the input automaton is
|
||||
/// non-deterministic, the result is still correct, but way larger than an
|
||||
/// equivalent Büchi automaton.
|
||||
/// If the input automaton is Rabin-like (resp. Streett-like), the output
|
||||
/// automaton has max odd (resp. min even) acceptance condition.
|
||||
/// Details on the algorithm can be found in:
|
||||
/// https://arxiv.org/pdf/1701.05738.pdf (published at TACAS 2017)
|
||||
///
|
||||
/// Throws an std::runtime_error if the input is neither Rabin-like nor
|
||||
/// Street-like.
|
||||
SPOT_API
|
||||
twa_graph_ptr
|
||||
iar_old(const const_twa_graph_ptr& aut, bool pretty_print = false);
|
||||
|
||||
/// \ingroup twa_acc_transform
|
||||
/// \brief Turn a Rabin-like or Streett-like automaton into a parity automaton
|
||||
/// based on the index appearence record (IAR)
|
||||
///
|
||||
/// Returns nullptr if the input automaton is neither Rabin-like nor
|
||||
/// Streett-like, and calls spot::iar() otherwise.
|
||||
SPOT_API
|
||||
twa_graph_ptr
|
||||
iar_maybe_old(const const_twa_graph_ptr& aut, bool pretty_print = false);
|
||||
|
||||
} // namespace spot
|
||||
Loading…
Add table
Add a link
Reference in a new issue