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

Rewrite all std::map<const formula*, ...> as

Browse source 
Sgi::hash_map<const formula*, ...>.

* src/misc/hash.hh: New file.
* src/misc/Makefile.am (misc_HEADERS): Add it.
* src/ltlvisit/dotty.cc (dotty_visitor::map): Use a hash_map instead
of a map.
* src/tgba/bdddict.hh (bdd_dict::fv_map, bdd_dict::vf_map,
bdd_dict::ref_set, bdd_dict::var_map): Define as hash_map or
hash_set.
* src/tgbaalgos/ltl2tgba_fm.cc (translate_dict::fv_map,
translate_dict::vf_map): Likewise.
* src/tgba/tgbabddconcretefactory.hh
(tgba_bdd_concrete_factory::acc_map_): Likewise.
* src/tgba/tgbatba.hh, src/tgbaalgos/reachiter.hh: Include <map>.
This commit is contained in:
Alexandre Duret-Lutz 2003-08-28 16:59:11 +00:00
parent 51094329d8
commit 1955150999
9 changed files with 76 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/tgba/bdddict.hh
View file

@ -1,7 +1,7 @@
#ifndef SPOT_TGBA_BDDDICT_HH
# define SPOT_TGBA_BDDDICT_HH
#include <map>
#include "misc/hash.hh"
#include <list>
#include <set>
#include <iostream>
@ -21,9 +21,10 @@ namespace spot
~bdd_dict();
/// Formula-to-BDD-variable maps.
typedef std::map<const ltl::formula*, int> fv_map;
typedef Sgi::hash_map<const ltl::formula*, int,
ptr_hash<ltl::formula> > fv_map;
/// BDD-variable-to-formula maps.
typedef std::map<int, const ltl::formula*> vf_map;
typedef Sgi::hash_map<int, const ltl::formula*> vf_map;
fv_map now_map; ///< Maps formulae to "Now" BDD variables
vf_map now_formula_map; ///< Maps "Now" BDD variables to formulae
@ -111,8 +112,8 @@ namespace spot
protected:
/// BDD-variable reference counts.
typedef std::set<const void*> ref_set;
typedef std::map<int, ref_set> vr_map;
typedef Sgi::hash_set<const void*, ptr_hash<void> > ref_set;
typedef Sgi::hash_map<int, ref_set> vr_map;
vr_map var_refs;
private:

5
src/tgba/tgbabddconcretefactory.hh
View file

@ -1,9 +1,9 @@
#ifndef SPOT_TGBA_TGBABDDCONCRETEFACTORY_HH
# define SPOT_TGBA_TGBABDDCONCRETEFACTORY_HH
#include "misc/hash.hh"
#include "ltlast/formula.hh"
#include "tgbabddfactory.hh"
#include <map>
namespace spot
{
@ -64,7 +64,8 @@ namespace spot
private:
tgba_bdd_core_data data_; ///< Core data for the new automata.
typedef std::map<const ltl::formula*, bdd> acc_map_;
typedef Sgi::hash_map<const ltl::formula*, bdd,
ptr_hash<ltl::formula> > acc_map_;
acc_map_ acc_; ///< BDD associated to each accepting condition
};

1
src/tgba/tgbatba.hh
View file

@ -1,6 +1,7 @@
#ifndef SPOT_TGBA_TGBATBA_HH
# define SPOT_TGBA_TGBATBA_HH
#include <map>
#include "tgba.hh"
#include "misc/bddlt.hh"