alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

product: rename the one-the-fly version as otf_product

Browse source 
This avoid compiler errors about ambiguous calls and make sure we are
calling the intended algorithms everywhere (this wasn't the case).

* src/tgba/tgbaproduct.hh (product, product_at): Rename as...
(otf_product, otf_product_at): ... this.
* iface/ltsmin/modelcheck.cc, src/bin/autfilt.cc, src/bin/ltlfilt.cc,
src/tgbaalgos/minimize.cc, src/tgbaalgos/powerset.cc,
src/tgbatest/ltl2tgba.cc, src/tgbatest/checkpsl.cc,
src/tgbatest/complementation.cc, src/tgbatest/ltlprod.cc: Adjust
callers.
This commit is contained in:
Alexandre Duret-Lutz 2015-01-08 22:48:13 +01:00
parent a9748804e4
commit 94577d6519
10 changed files with 41 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/tgbaalgos/minimize.cc
View file

@ -1,6 +1,6 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2010, 2011, 2012, 2013, 2014 Laboratoire de Recherche
// et Développement de l'Epita (LRDE).
// Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015 Laboratoire de
// Recherche et Développement de l'Epita (LRDE).
//
// This file is part of Spot, a model checking library.
//
@ -36,7 +36,7 @@
#include "ltlast/allnodes.hh"
#include "misc/hash.hh"
#include "misc/bddlt.hh"
#include "tgba/tgbaproduct.hh"
#include "tgbaalgos/product.hh"
#include "tgbaalgos/powerset.hh"
#include "tgbaalgos/gtec/gtec.hh"
#include "tgbaalgos/safety.hh"
@ -216,7 +216,7 @@ namespace spot
bool
wdba_scc_is_accepting(const const_tgba_digraph_ptr& det_a, unsigned scc_n,
const const_tgba_ptr& orig_a, scc_info& sm,
const const_tgba_digraph_ptr& orig_a, scc_info& sm,
power_map& pm)
{
@ -247,7 +247,6 @@ namespace spot
assert(++i == loop.end());
loop_a->set_init_state(0U);
const state* loop_a_init = loop_a->get_init_state();
// Check if the loop is accepting in the original automaton.
bool accepting = false;
@ -257,17 +256,16 @@ namespace spot
pm.states_of(det_a->state_number(start));
for (auto& it: ps)
{
// Contrustruct a product between
// LOOP_A, and ORIG_A starting in *IT.
// FIXME: This could be sped up a lot!
if (!product_at(loop_a, orig_a, loop_a_init, it)->is_empty())
// Construct a product between LOOP_A and ORIG_A starting in
// *IT. FIXME: This could be sped up a lot!
if (!product(loop_a, orig_a, 0U,
orig_a->state_number(it))->is_empty())
{
accepting = true;
break;
}
}
loop_a_init->destroy();
return accepting;
}