06d3bc67ea
The previous code was sometime doing the work of remove_fin() in addition to complementing the acceptance conditions. This separate the two operations clearly. Also the specialized code for complementing weak automata is now a specialized code for remove_fin() on weak automata. * src/twaalgos/dtgbacomp.hh, src/twaalgos/dtgbacomp.cc: Rename as ... * src/twaalgos/complement.hh, src/twaalgos/complement.cc: ... these. * src/twaalgos/Makefile.am: Adjust. * src/twaalgos/complement.hh (dtgba_complement): Rename as ... (dtwa_complement): ... this, and restrict the purpose to completion and accetance complementation. Further acceptance simplification can be done with remove_fin() and to_generalized_buchi(). * src/twaalgos/remfin.cc (remove_fin): Specialize handling of weak automata using the code that was originally in dtgba_complement(). Also mark the output as state-based when the input has to Inf. * src/twaalgos/postproc.cc, src/twaalgos/postproc.hh: Make sure scc_filter is always called after to_generalized_buchi(). * bench/stutter/stutter_invariance_randomgraph.cc, src/bin/ltlcross.cc, src/tests/ikwiad.cc, src/twaalgos/minimize.cc, src/twaalgos/powerset.cc, src/twaalgos/stutter.cc: Adjust usage. * src/tests/dstar.test, src/tests/ltl2dstar4.test, src/tests/remfin.test: Adjust expected outputs. * wrap/python/spot_impl.i: Export dtwa_complement().
132 lines
3.4 KiB
C++
132 lines
3.4 KiB
C++
// -*- coding: utf-8 -*-
|
|
// Copyright (C) 2014, 2015 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 "misc/timer.hh"
|
|
#include "tl/apcollect.hh"
|
|
#include "twaalgos/complement.hh"
|
|
#include "twaalgos/remfin.hh"
|
|
#include "twaalgos/randomgraph.hh"
|
|
#include "twaalgos/dot.hh"
|
|
#include "twaalgos/product.hh"
|
|
#include "twaalgos/stutter.hh"
|
|
#include "twaalgos/stats.hh"
|
|
#include "twa/twagraph.hh"
|
|
#include "twa/bdddict.hh"
|
|
#include "misc/random.hh"
|
|
#include <cstdio>
|
|
#include <cstring>
|
|
#include <vector>
|
|
|
|
constexpr unsigned algo_max = 8;
|
|
|
|
int
|
|
main(int argc, char** argv)
|
|
{
|
|
if (argc != 3)
|
|
{
|
|
std::cerr << "usage: " << argv[0] << " density n_ap\n";
|
|
exit(2);
|
|
}
|
|
float d = strtof(argv[1], nullptr);
|
|
if (d < 0.0 || d > 1.0)
|
|
{
|
|
std::cerr << "density should be between 0 and 1";
|
|
exit(2);
|
|
}
|
|
unsigned props_n = strtoul(argv[2], nullptr, 10);
|
|
|
|
|
|
spot::bdd_dict_ptr dict = spot::make_bdd_dict();
|
|
constexpr unsigned n = 10;
|
|
|
|
// random ap set
|
|
auto ap = spot::create_atomic_prop_set(props_n);
|
|
// ap set as bdd
|
|
bdd apdict = bddtrue;
|
|
for (auto& i: ap)
|
|
apdict &= bdd_ithvar(dict->register_proposition(i, &ap));
|
|
|
|
std::vector<unsigned char> disable_algo(algo_max);
|
|
unsigned algo_count = algo_max;
|
|
unsigned seed = 0;
|
|
|
|
spot::stat_printer stats(std::cout, ",%s,%t,%e,%S,%n");
|
|
|
|
for (unsigned states_n = 1; states_n <= 50; ++states_n)
|
|
{
|
|
// generate n random automata
|
|
for (unsigned i = 0; i < n; ++i)
|
|
{
|
|
spot::twa_graph_ptr a;
|
|
do
|
|
{
|
|
spot::srand(++seed);
|
|
a = spot::random_graph(states_n, d, &ap, dict, 2, 0.1, 0.5,
|
|
true);
|
|
}
|
|
while (a->is_empty());
|
|
auto na = spot::remove_fin(spot::dtwa_complement(a));
|
|
|
|
std::cout << d << ',' << props_n << ',' << seed;
|
|
stats.print(a);
|
|
stats.print(na);
|
|
|
|
bool prev = true;
|
|
for (int algo = 1; algo <= 8; ++algo)
|
|
{
|
|
std::cout << ',';
|
|
if (disable_algo[algo - 1])
|
|
continue;
|
|
|
|
auto dup_a = spot::make_twa_graph(a, spot::twa::prop_set::all());
|
|
auto dup_na = spot::make_twa_graph(na,
|
|
spot::twa::prop_set::all());
|
|
|
|
spot::stopwatch sw;
|
|
sw.start();
|
|
bool res = spot::is_stutter_invariant(std::move(dup_a),
|
|
std::move(dup_na),
|
|
apdict, algo);
|
|
auto time = sw.stop();
|
|
std::cout << time;
|
|
if (algo > 1 && res != prev)
|
|
{
|
|
std::cerr << "\nerror: algorithms " << algo - 1
|
|
<< " (" << prev << ") and " << algo << " ("
|
|
<< res << ") disagree on seed "
|
|
<< seed << "\n";
|
|
exit(2);
|
|
}
|
|
if (time >= 30.0)
|
|
{
|
|
disable_algo[algo - 1] = 1;
|
|
--algo_count;
|
|
}
|
|
prev = res;
|
|
}
|
|
std::cout << ',' << prev << '\n';;
|
|
if (algo_count == 0)
|
|
break;
|
|
}
|
|
if (algo_count == 0)
|
|
break;
|
|
}
|
|
dict->unregister_all_my_variables(&ap);
|
|
return 0;
|
|
}
|