Fixes to pass sanity checks.
* src/ta/taproduct.cc, src/ta/tgtaproduct.cc, src/ta/tgtaproduct.hh, src/taalgos/emptinessta.cc, src/tgbatest/ltl2ta.test: 80 columns. * src/ta/tgta.hh, src/ta/tgtaproduct.hh, src/taalgos/emptinessta.hh, src/taalgos/tgba2ta.hh: Fix include gards. * src/taalgos/tgba2ta.hh: Remove superfluous includes. * src/taalgos/tgba2ta.cc: Add missing include. * src/tgbatest/ltl2tgba.cc: Fix use of bdd_true().
This commit is contained in:
Alexandre Duret-Lutz
parent
dcc809ff4a
commit
67bbe6a6c7
10 changed files with 87 additions and 91 deletions
|
|
@ -1,5 +1,5 @@
|
|||
// Copyright (C) 2010, 2011 Laboratoire de Recherche et Développement
|
||||
// de l'Epita (LRDE).
|
||||
// Copyright (C) 2010, 2011, 2012 Laboratoire de Recherche et
|
||||
// Développement de l'Epita (LRDE).
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
|
|
@ -60,7 +60,7 @@ namespace spot
|
|||
// * h: a hash of all visited nodes, with their order,
|
||||
// (it is called "Hash" in Couvreur's paper)
|
||||
numbered_state_heap* h =
|
||||
numbered_state_heap_hash_map_factory::instance()->build(); ///< Heap of visited states.
|
||||
numbered_state_heap_hash_map_factory::instance()->build();
|
||||
|
||||
// * num: the number of visited nodes. Used to set the order of each
|
||||
// visited node,
|
||||
|
|
@ -216,7 +216,9 @@ namespace spot
|
|||
(a_->is_hole_state_in_ta_component(curr))
|
||||
&& a_->is_livelock_accepting_state(curr);
|
||||
|
||||
//may be Buchi accepting scc or livelock accepting scc (contains a livelock accepting state that have no successors in TA)
|
||||
// May be Buchi accepting scc or livelock accepting scc
|
||||
// (contains a livelock accepting state that have no
|
||||
// successors in TA).
|
||||
scc.top().is_accepting = (a_->is_accepting_state(curr)
|
||||
&& (!succ->is_stuttering_transition()
|
||||
|| a_->is_livelock_accepting_state(curr)))
|
||||
|
|
@ -308,26 +310,28 @@ namespace spot
|
|||
if (is_accepting_sscc)
|
||||
{
|
||||
trace
|
||||
<< "PASS 1: SUCCESS : a_->is_livelock_accepting_state(curr): "
|
||||
<< a_->is_livelock_accepting_state(curr) << std::endl;
|
||||
<< "PASS 1: SUCCESS : a_->is_livelock_accepting_state(curr): "
|
||||
<< a_->is_livelock_accepting_state(curr) << std::endl;
|
||||
trace
|
||||
<< "PASS 1: scc.top().condition : " << bdd_format_accset(
|
||||
a_->get_dict(), scc.top().condition) << std::endl;
|
||||
<< "PASS 1: scc.top().condition : "
|
||||
<< bdd_format_accset(a_->get_dict(), scc.top().condition)
|
||||
<< std::endl;
|
||||
trace
|
||||
<< "PASS 1: a_->all_acceptance_conditions() : "
|
||||
<< (a_->all_acceptance_conditions()) << std::endl;
|
||||
<< (a_->all_acceptance_conditions()) << std::endl;
|
||||
trace
|
||||
<< "PASS 1 CYCLE and (scc.top().condition == a_->all_acceptance_conditions()) : "
|
||||
<< (scc.top().condition
|
||||
== a_->all_acceptance_conditions()) << std::endl;
|
||||
<< ("PASS 1 CYCLE and (scc.top().condition == "
|
||||
"a_->all_acceptance_conditions()) : ")
|
||||
<< (scc.top().condition
|
||||
== a_->all_acceptance_conditions()) << std::endl;
|
||||
|
||||
trace
|
||||
<< "PASS 1: bddtrue : " << (a_->all_acceptance_conditions()
|
||||
== bddtrue) << std::endl;
|
||||
== bddtrue) << std::endl;
|
||||
|
||||
trace
|
||||
<< "PASS 1: bddfalse : " << (a_->all_acceptance_conditions()
|
||||
== bddfalse) << std::endl;
|
||||
== bddfalse) << std::endl;
|
||||
|
||||
clear(h, todo, ta_init_it_);
|
||||
return true;
|
||||
|
|
@ -418,7 +422,7 @@ namespace spot
|
|||
// * h: a hash of all visited nodes, with their order,
|
||||
// (it is called "Hash" in Couvreur's paper)
|
||||
numbered_state_heap* h =
|
||||
numbered_state_heap_hash_map_factory::instance()->build(); ///< Heap of visited states.
|
||||
numbered_state_heap_hash_map_factory::instance()->build();
|
||||
|
||||
// * num: the number of visited nodes. Used to set the order of each
|
||||
// visited node,
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
// Copyright (C) 2008 Laboratoire de Recherche et Development de
|
||||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2008, 2012 Laboratoire de Recherche et Dévelopment de
|
||||
// l'Epita (LRDE).
|
||||
// Copyright (C) 2003, 2004, 2005, 2006 Laboratoire d'Informatique de
|
||||
// Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
|
||||
// Université Pierre et Marie Curie.
|
||||
// Paris 6 (LIP6), département Systèmes Répartis Coopératifs (SRC),
|
||||
// Université Pierre et Marie Curie.
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
|
|
@ -21,8 +22,8 @@
|
|||
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
// 02111-1307, USA.
|
||||
|
||||
#ifndef SPOT_TAALGOS_EMPTINESS_HH
|
||||
# define SPOT_TAALGOS_EMPTINESS_HH
|
||||
#ifndef SPOT_TAALGOS_EMPTINESSTA_HH
|
||||
# define SPOT_TAALGOS_EMPTINESSTA_HH
|
||||
|
||||
#include "ta/taproduct.hh"
|
||||
#include "misc/optionmap.hh"
|
||||
|
|
@ -161,4 +162,4 @@ namespace spot
|
|||
/// \ingroup ta_emptiness_check
|
||||
}
|
||||
|
||||
#endif // SPOT_TAALGOS_EMPTINESS_HH
|
||||
#endif // SPOT_TAALGOS_EMPTINESSTA_HH
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
// Copyright (C) 2010, 2011 Laboratoire de Recherche et Developpement
|
||||
// de l Epita (LRDE).
|
||||
// -*- coding utf-8 -*-
|
||||
// Copyright (C) 2010, 2011, 2012 Laboratoire de Recherche et
|
||||
// Développement de l'Epita (LRDE).
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
|
|
@ -30,6 +31,7 @@
|
|||
#include "ltlast/atomic_prop.hh"
|
||||
#include "ltlast/constant.hh"
|
||||
#include "tgba/formula2bdd.hh"
|
||||
#include "tgba/tgbatba.hh"
|
||||
#include "misc/bddop.hh"
|
||||
#include <cassert>
|
||||
#include "ltlvisit/tostring.hh"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
// Copyright (C) 2010 Laboratoire de Recherche et Developpement
|
||||
// de l Epita (LRDE).
|
||||
// -*- coding: utf-8 -*-
|
||||
// Copyright (C) 2010, 2012 Laboratoire de Recherche et Développement
|
||||
// de l'Epita (LRDE).
|
||||
//
|
||||
// This file is part of Spot, a model checking library.
|
||||
//
|
||||
|
|
@ -18,17 +19,10 @@
|
|||
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||||
// 02111-1307, USA.
|
||||
|
||||
#ifndef SPOT_TGBAALGOS_SBA2TA_HH
|
||||
# define SPOT_TGBAALGOS_SBA2TA_HH
|
||||
#ifndef SPOT_TAALGOS_TGBA2TA_HH
|
||||
# define SPOT_TAALGOS_TGBA2TA_HH
|
||||
|
||||
#include "misc/hash.hh"
|
||||
#include <list>
|
||||
#include <map>
|
||||
#include <set>
|
||||
#include "tgba/tgbatba.hh"
|
||||
#include "ltlast/formula.hh"
|
||||
#include <cassert>
|
||||
#include "misc/bddlt.hh"
|
||||
#include "tgba/tgba.hh"
|
||||
#include "ta/taexplicit.hh"
|
||||
#include "ta/tgtaexplicit.hh"
|
||||
|
||||
|
|
@ -59,7 +53,7 @@ namespace spot
|
|||
///
|
||||
/// \param degeneralized When false, the returned automaton is a generalized
|
||||
/// form of TA, called GTA (Generalized Testing Automaton).
|
||||
/// Like TGBA, GTA use Generalized Büchi acceptance
|
||||
/// Like TGBA, GTA use Generalized Büchi acceptance
|
||||
/// conditions intead of Buchi-accepting states: there are several acceptance
|
||||
/// sets (of transitions), and a path is accepted if it traverses
|
||||
/// at least one transition of each set infinitely often or if it contains a
|
||||
|
|
@ -100,11 +94,11 @@ namespace spot
|
|||
/// \param atomic_propositions_set The set of atomic propositions used in the
|
||||
/// input TGBA \a tgba_to_convert
|
||||
///
|
||||
/// \return A spot::tgta_explicit (spot::tgta) that recognizes the same
|
||||
/// \return A spot::tgta_explicit (spot::tgta) that recognizes the same
|
||||
/// language as the TGBA \a tgba_to_convert.
|
||||
tgta_explicit*
|
||||
tgba_to_tgta(const tgba* tgba_to_convert, bdd atomic_propositions_set);
|
||||
|
||||
}
|
||||
|
||||
#endif // SPOT_TGBAALGOS_SBA2TA_HH
|
||||
#endif // SPOT_TAALGOS_TGBA2TA_HH
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue