This helps working around missing C functions like strcasecmp that do not exist everywhere (e.g. on Cygwin), and for which lib/ supplies a replacement. Unfortunately we do not have such build in our current continuous integration suite, so we cannot easily detect files where such config.h inclusion would be useful. Therefore this patch simply makes it mandatory to include config.h in *.cc files. Including this in public *.hh file is currently forbidden. * spot/gen/automata.cc, spot/gen/formulas.cc, spot/kripke/fairkripke.cc, spot/kripke/kripke.cc, spot/ltsmin/ltsmin.cc, spot/misc/game.cc, spot/parseaut/fmterror.cc, spot/parsetl/fmterror.cc, spot/parsetl/parsetl.yy, spot/priv/bddalloc.cc, spot/priv/freelist.cc, spot/priv/satcommon.cc, spot/priv/trim.cc, spot/priv/weight.cc, spot/ta/ta.cc, spot/ta/taexplicit.cc, spot/ta/taproduct.cc, spot/ta/tgtaexplicit.cc, spot/ta/tgtaproduct.cc, spot/taalgos/dot.cc, spot/taalgos/emptinessta.cc, spot/taalgos/minimize.cc, spot/taalgos/reachiter.cc, spot/taalgos/statessetbuilder.cc, spot/taalgos/stats.cc, spot/taalgos/tgba2ta.cc, spot/tl/apcollect.cc, spot/tl/contain.cc, spot/tl/declenv.cc, spot/tl/defaultenv.cc, spot/tl/dot.cc, spot/tl/exclusive.cc, spot/tl/hierarchy.cc, spot/tl/length.cc, spot/tl/ltlf.cc, spot/tl/mark.cc, spot/tl/mutation.cc, spot/tl/nenoform.cc, spot/tl/print.cc, spot/tl/randomltl.cc, spot/tl/relabel.cc, spot/tl/remove_x.cc, spot/tl/simplify.cc, spot/tl/snf.cc, spot/tl/unabbrev.cc, spot/twa/acc.cc, spot/twa/bdddict.cc, spot/twa/bddprint.cc, spot/twa/formula2bdd.cc, spot/twa/taatgba.cc, spot/twa/twa.cc, spot/twa/twagraph.cc, spot/twa/twaproduct.cc, spot/twaalgos/aiger.cc, spot/twaalgos/alternation.cc, spot/twaalgos/are_isomorphic.cc, spot/twaalgos/bfssteps.cc, spot/twaalgos/canonicalize.cc, spot/twaalgos/cleanacc.cc, spot/twaalgos/cobuchi.cc, spot/twaalgos/complement.cc, spot/twaalgos/complete.cc, spot/twaalgos/compsusp.cc, spot/twaalgos/couvreurnew.cc, spot/twaalgos/cycles.cc, spot/twaalgos/degen.cc, spot/twaalgos/determinize.cc, spot/twaalgos/dot.cc, spot/twaalgos/dtbasat.cc, spot/twaalgos/dtwasat.cc, spot/twaalgos/dualize.cc, spot/twaalgos/emptiness.cc, spot/twaalgos/gtec/ce.cc, spot/twaalgos/gtec/gtec.cc, spot/twaalgos/gtec/sccstack.cc, spot/twaalgos/gtec/status.cc, spot/twaalgos/gv04.cc, spot/twaalgos/hoa.cc, spot/twaalgos/iscolored.cc, spot/twaalgos/isdet.cc, spot/twaalgos/isunamb.cc, spot/twaalgos/isweakscc.cc, spot/twaalgos/langmap.cc, spot/twaalgos/lbtt.cc, spot/twaalgos/ltl2taa.cc, spot/twaalgos/ltl2tgba_fm.cc, spot/twaalgos/magic.cc, spot/twaalgos/mask.cc, spot/twaalgos/minimize.cc, spot/twaalgos/neverclaim.cc, spot/twaalgos/parity.cc, spot/twaalgos/postproc.cc, spot/twaalgos/powerset.cc, spot/twaalgos/product.cc, spot/twaalgos/rabin2parity.cc, spot/twaalgos/randomgraph.cc, spot/twaalgos/randomize.cc, spot/twaalgos/reachiter.cc, spot/twaalgos/relabel.cc, spot/twaalgos/remfin.cc, spot/twaalgos/remprop.cc, spot/twaalgos/sbacc.cc, spot/twaalgos/sccfilter.cc, spot/twaalgos/sccinfo.cc, spot/twaalgos/se05.cc, spot/twaalgos/sepsets.cc, spot/twaalgos/simulation.cc, spot/twaalgos/split.cc, spot/twaalgos/stats.cc, spot/twaalgos/strength.cc, spot/twaalgos/stripacc.cc, spot/twaalgos/stutter.cc, spot/twaalgos/sum.cc, spot/twaalgos/tau03.cc, spot/twaalgos/tau03opt.cc, spot/twaalgos/totgba.cc, spot/twaalgos/toweak.cc, spot/twaalgos/translate.cc, spot/twaalgos/word.cc, tests/core/acc.cc, tests/core/bitvect.cc, tests/core/checkpsl.cc, tests/core/checkta.cc, tests/core/consterm.cc, tests/core/emptchk.cc, tests/core/equalsf.cc, tests/core/graph.cc, tests/core/ikwiad.cc, tests/core/intvcmp2.cc, tests/core/intvcomp.cc, tests/core/kind.cc, tests/core/kripkecat.cc, tests/core/length.cc, tests/core/ltlrel.cc, tests/core/ngraph.cc, tests/core/parity.cc, tests/core/randtgba.cc, tests/core/readltl.cc, tests/core/reduc.cc, tests/core/safra.cc, tests/core/sccif.cc, tests/core/syntimpl.cc, tests/core/taatgba.cc, tests/core/tostring.cc, tests/core/trival.cc, tests/core/twagraph.cc, tests/ltsmin/modelcheck.cc, spot/parseaut/scanaut.ll, spot/parsetl/scantl.ll: Include config.h. * spot/gen/Makefile.am, spot/graph/Makefile.am, spot/kripke/Makefile.am, spot/ltsmin/Makefile.am, spot/parseaut/Makefile.am, spot/parsetl/Makefile.am, spot/priv/Makefile.am, spot/ta/Makefile.am, spot/taalgos/Makefile.am, spot/tl/Makefile.am, spot/twa/Makefile.am, spot/twaalgos/Makefile.am, spot/twaalgos/gtec/Makefile.am, tests/Makefile.am: Add the -I lib/ flags. * tests/sanity/includes.test: Catch missing config.h in *.cc, and diagnose config.h in *.hh. * tests/sanity/style.test: Better diagnostics.
163 lines
5.7 KiB
C++
163 lines
5.7 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2014-2018 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 "config.h"
|
|
#include <spot/twaalgos/product.hh>
|
|
#include <spot/twa/twagraph.hh>
|
|
#include <spot/twaalgos/complete.hh>
|
|
#include <deque>
|
|
#include <unordered_map>
|
|
#include <spot/misc/hash.hh>
|
|
|
|
namespace spot
|
|
{
|
|
namespace
|
|
{
|
|
typedef std::pair<unsigned, unsigned> product_state;
|
|
|
|
struct product_state_hash
|
|
{
|
|
size_t
|
|
operator()(product_state s) const noexcept
|
|
{
|
|
return wang32_hash(s.first ^ wang32_hash(s.second));
|
|
}
|
|
};
|
|
|
|
static
|
|
twa_graph_ptr product_aux(const const_twa_graph_ptr& left,
|
|
const const_twa_graph_ptr& right,
|
|
unsigned left_state,
|
|
unsigned right_state,
|
|
bool and_acc)
|
|
{
|
|
if (!(left->is_existential() && right->is_existential()))
|
|
throw std::runtime_error
|
|
("product() does not support alternating automata");
|
|
std::unordered_map<product_state, unsigned, product_state_hash> s2n;
|
|
std::deque<std::pair<product_state, unsigned>> todo;
|
|
|
|
if (left->get_dict() != right->get_dict())
|
|
throw std::runtime_error("product: 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 left_num = left->num_sets();
|
|
auto right_acc = right->get_acceptance() << left_num;
|
|
if (and_acc)
|
|
right_acc &= left->get_acceptance();
|
|
else
|
|
right_acc |= left->get_acceptance();
|
|
res->set_acceptance(left_num + right->num_sets(), right_acc);
|
|
|
|
auto v = new product_states;
|
|
res->set_named_prop("product-states", v);
|
|
|
|
auto new_state =
|
|
[&](unsigned left_state, unsigned right_state) -> unsigned
|
|
{
|
|
product_state x(left_state, right_state);
|
|
auto p = s2n.emplace(x, 0);
|
|
if (p.second) // This is a new state
|
|
{
|
|
p.first->second = res->new_state();
|
|
todo.emplace_back(x, p.first->second);
|
|
assert(p.first->second == v->size());
|
|
v->emplace_back(x);
|
|
}
|
|
return p.first->second;
|
|
};
|
|
|
|
res->set_init_state(new_state(left_state, right_state));
|
|
if (right_acc.is_f())
|
|
// Do not bother doing any work if the resulting acceptance is
|
|
// false.
|
|
return res;
|
|
while (!todo.empty())
|
|
{
|
|
auto top = todo.front();
|
|
todo.pop_front();
|
|
for (auto& l: left->out(top.first.first))
|
|
for (auto& r: right->out(top.first.second))
|
|
{
|
|
auto cond = l.cond & r.cond;
|
|
if (cond == bddfalse)
|
|
continue;
|
|
auto dst = new_state(l.dst, r.dst);
|
|
res->new_edge(top.second, dst, cond,
|
|
l.acc | (r.acc << left_num));
|
|
// If right is deterministic, we can abort immediately!
|
|
}
|
|
}
|
|
|
|
// The product of two non-deterministic automata could be
|
|
// deterministic. Likewise for non-complete automata.
|
|
if (left->prop_universal() && right->prop_universal())
|
|
res->prop_universal(true);
|
|
if (left->prop_complete() && right->prop_complete())
|
|
res->prop_complete(true);
|
|
if (left->prop_stutter_invariant() && right->prop_stutter_invariant())
|
|
res->prop_stutter_invariant(true);
|
|
if (left->prop_inherently_weak() && right->prop_inherently_weak())
|
|
res->prop_inherently_weak(true);
|
|
if (left->prop_weak() && right->prop_weak())
|
|
res->prop_weak(true);
|
|
if (left->prop_terminal() && right->prop_terminal())
|
|
res->prop_terminal(true);
|
|
res->prop_state_acc(left->prop_state_acc() && right->prop_state_acc());
|
|
return res;
|
|
}
|
|
}
|
|
|
|
twa_graph_ptr product(const const_twa_graph_ptr& left,
|
|
const const_twa_graph_ptr& right,
|
|
unsigned left_state,
|
|
unsigned right_state)
|
|
{
|
|
return product_aux(left, right, left_state, right_state, true);
|
|
}
|
|
|
|
twa_graph_ptr product(const const_twa_graph_ptr& left,
|
|
const const_twa_graph_ptr& right)
|
|
{
|
|
return product(left, right,
|
|
left->get_init_state_number(),
|
|
right->get_init_state_number());
|
|
}
|
|
|
|
twa_graph_ptr product_or(const const_twa_graph_ptr& left,
|
|
const const_twa_graph_ptr& right,
|
|
unsigned left_state,
|
|
unsigned right_state)
|
|
{
|
|
return product_aux(complete(left),
|
|
complete(right),
|
|
left_state, right_state, false);
|
|
}
|
|
|
|
twa_graph_ptr product_or(const const_twa_graph_ptr& left,
|
|
const const_twa_graph_ptr& right)
|
|
{
|
|
return product_or(left, right,
|
|
left->get_init_state_number(),
|
|
right->get_init_state_number());
|
|
}
|
|
|
|
}
|