The ltl prefix does not make a lot of sens anymore (since we support psl as well). ltlast/ and ltlenv/ were almost empty. And ltlvisit/ did not contain any visitor anymore. * src/ltlvisit/, src/ltlast/, src/ltlenv/: Merge into... * src/tl/: ...this. * NEWS: Mention the change. * README, bench/stutter/stutter_invariance_formulas.cc, bench/stutter/stutter_invariance_randomgraph.cc, configure.ac, doc/org/tut01.org, doc/org/tut02.org, doc/org/tut10.org, doc/tl/tl.tex, iface/ltsmin/ltsmin.hh, iface/ltsmin/modelcheck.cc, src/Makefile.am, src/bin/autfilt.cc, src/bin/common_output.cc, src/bin/common_output.hh, src/bin/common_r.hh, src/bin/common_trans.cc, src/bin/genltl.cc, src/bin/ltl2tgba.cc, src/bin/ltl2tgta.cc, src/bin/ltlcross.cc, src/bin/ltldo.cc, src/bin/ltlfilt.cc, src/bin/ltlgrind.cc, src/bin/randltl.cc, src/kripke/kripkeexplicit.hh, src/kripkeparse/public.hh, src/parseaut/public.hh, src/priv/accmap.hh, src/ta/taexplicit.hh, src/ta/tgtaexplicit.hh, src/tests/equalsf.cc, src/tests/ikwiad.cc, src/tests/length.cc, src/tests/ltlrel.cc, src/tests/randtgba.cc, src/tests/readltl.cc, src/tests/reduc.cc, src/tests/syntimpl.cc, src/tests/taatgba.cc, src/tests/tostring.cc, src/tests/twagraph.cc, src/twa/acc.hh, src/twa/bdddict.cc, src/twa/bdddict.hh, src/twa/bddprint.cc, src/twa/taatgba.cc, src/twa/taatgba.hh, src/twa/twa.hh, src/twa/twagraph.cc, src/twa/twagraph.hh, src/twa/twasafracomplement.cc, src/twaalgos/compsusp.cc, src/twaalgos/compsusp.hh, src/twaalgos/dtgbasat.cc, src/twaalgos/hoa.cc, src/twaalgos/isweakscc.cc, src/twaalgos/lbtt.cc, src/twaalgos/ltl2taa.cc, src/twaalgos/ltl2taa.hh, src/twaalgos/ltl2tgba_fm.cc, src/twaalgos/ltl2tgba_fm.hh, src/twaalgos/minimize.hh, src/twaalgos/neverclaim.cc, src/twaalgos/randomgraph.hh, src/twaalgos/relabel.hh, src/twaalgos/remprop.hh, src/twaalgos/stats.cc, src/twaalgos/stutter.cc, src/twaalgos/translate.hh, wrap/python/spot_impl.i, src/ltlparse/ltlparse.yy, src/ltlparse/public.hh: Adjust.
90 lines
2.4 KiB
C++
90 lines
2.4 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2014, 2015 Laboratoire de Recherche et Développement
|
|
// de l'Epita.
|
|
//
|
|
// 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 <iostream>
|
|
#include "twa/twagraph.hh"
|
|
#include "twaalgos/dot.hh"
|
|
#include "tl/defaultenv.hh"
|
|
|
|
void f1()
|
|
{
|
|
auto d = spot::make_bdd_dict();
|
|
auto tg = make_twa_graph(d);
|
|
bdd p1 = bdd_ithvar(tg->register_ap("p1"));
|
|
bdd p2 = bdd_ithvar(tg->register_ap("p2"));
|
|
tg->acc().add_sets(2);
|
|
|
|
for (auto f: tg->ap())
|
|
std::cout << f.ap_name() << '\n';
|
|
|
|
auto s1 = tg->new_state();
|
|
auto s2 = tg->new_state();
|
|
auto s3 = tg->new_state();
|
|
tg->new_edge(s1, s1, bddfalse, 0U);
|
|
tg->new_edge(s1, s2, p1, 0U);
|
|
tg->new_edge(s1, s3, p2, tg->acc().mark(1));
|
|
tg->new_edge(s2, s3, p1 & p2, tg->acc().mark(0));
|
|
tg->new_edge(s3, s1, p1 | p2, tg->acc().marks({0, 1}));
|
|
tg->new_edge(s3, s2, p1 >> p2, 0U);
|
|
tg->new_edge(s3, s3, bddtrue, tg->acc().marks({0, 1}));
|
|
|
|
spot::print_dot(std::cout, tg);
|
|
|
|
{
|
|
auto i = tg->get_graph().out_iteraser(s3);
|
|
++i;
|
|
i.erase();
|
|
i.erase();
|
|
assert(!i);
|
|
spot::print_dot(std::cout, tg);
|
|
}
|
|
|
|
{
|
|
auto i = tg->get_graph().out_iteraser(s3);
|
|
i.erase();
|
|
assert(!i);
|
|
spot::print_dot(std::cout, tg);
|
|
}
|
|
|
|
auto all = tg->acc().marks({0, 1});
|
|
tg->new_edge(s3, s1, p1 | p2, all);
|
|
tg->new_edge(s3, s2, p1 >> p2, 0U);
|
|
tg->new_edge(s3, s1, bddtrue, all);
|
|
|
|
std::cerr << tg->num_edges() << '\n';
|
|
assert(tg->num_edges() == 7);
|
|
|
|
spot::print_dot(std::cout, tg);
|
|
tg->merge_edges();
|
|
spot::print_dot(std::cout, tg);
|
|
|
|
std::cerr << tg->num_edges() << '\n';
|
|
assert(tg->num_edges() == 5);
|
|
|
|
// Add enough states so that the state vector is reallocated.
|
|
for (unsigned i = 0; i < 100; ++i)
|
|
tg->new_state();
|
|
spot::print_dot(std::cout, tg);
|
|
}
|
|
|
|
int main()
|
|
{
|
|
f1();
|
|
}
|