Commit 752d4afc authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

* src/tgba/bdddict.hh (bdd_dict) <fv_map, vf_map, ref_set,

vr_map, free_annonymous_list_of_type>: Redeclare as std::map,
instead of Sgi::hash_map.  It proved to be faster.
* src/tgbaalgos/ltl2tgba_fm.cc (translate_dict) <fv_map, vf_map>:
Use the same definition as in bdd_dict.
* tgbaalgos/reachiter.hh, tgbaalgos/replayrun.cc: Explicitly
include misc/hash.hh.
parent b0a51a06
2004-12-15 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/tgba/bdddict.hh (bdd_dict) <fv_map, vf_map, ref_set,
vr_map, free_annonymous_list_of_type>: Redeclare as std::map,
instead of Sgi::hash_map. It proved to be faster.
* src/tgbaalgos/ltl2tgba_fm.cc (translate_dict) <fv_map, vf_map>:
Use the same definition as in bdd_dict.
* tgbaalgos/reachiter.hh, tgbaalgos/replayrun.cc: Explicitly
include misc/hash.hh.
Adjust Swig rules for Swig 1.3.24 (and probably 1.3.23 too).
Compiling the runtime in a separate modules is no longer required,
and actually it does not work anymore...
......
......@@ -22,9 +22,9 @@
#ifndef SPOT_TGBA_BDDDICT_HH
# define SPOT_TGBA_BDDDICT_HH
#include "misc/hash.hh"
#include <list>
#include <set>
#include <map>
#include <iosfwd>
#include <bdd.h>
#include "ltlast/formula.hh"
......@@ -43,10 +43,9 @@ namespace spot
~bdd_dict();
/// Formula-to-BDD-variable maps.
typedef Sgi::hash_map<const ltl::formula*, int,
ptr_hash<ltl::formula> > fv_map;
typedef std::map<const ltl::formula*, int> fv_map;
/// BDD-variable-to-formula maps.
typedef Sgi::hash_map<int, const ltl::formula*> vf_map;
typedef std::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
......@@ -164,8 +163,8 @@ namespace spot
protected:
/// BDD-variable reference counts.
typedef Sgi::hash_set<const void*, ptr_hash<void> > ref_set;
typedef Sgi::hash_map<int, ref_set> vr_map;
typedef std::set<const void*> ref_set;
typedef std::map<int, ref_set> vr_map;
vr_map var_refs;
void unregister_variable(vr_map::iterator& cur, const void* me);
......@@ -187,8 +186,7 @@ namespace spot
#endif
/// List of unused anonymous variable number for each automaton.
typedef Sgi::hash_map<const void*, annon_free_list,
ptr_hash<void> > free_annonymous_list_of_type;
typedef std::map<const void*, annon_free_list> free_annonymous_list_of_type;
free_annonymous_list_of_type free_annonymous_list_of;
private:
......
......@@ -72,11 +72,8 @@ namespace spot
bdd_dict* dict;
/// Formula-to-BDD-variable maps.
typedef Sgi::hash_map<const formula*, int,
ptr_hash<formula> > fv_map;
/// BDD-variable-to-formula maps.
typedef Sgi::hash_map<int, const formula*> vf_map;
typedef bdd_dict::fv_map fv_map;
typedef bdd_dict::vf_map vf_map;
fv_map next_map; ///< Maps "Next" variables to BDD variables
vf_map next_formula_map; ///< Maps BDD variables to "Next" variables
......
......@@ -22,7 +22,7 @@
#ifndef SPOT_TGBAALGOS_REACHITER_HH
# define SPOT_TGBAALGOS_REACHITER_HH
#include <map>
#include "misc/hash.hh"
#include "tgba/tgba.hh"
#include <stack>
#include <deque>
......
......@@ -19,6 +19,7 @@
// Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
#include "misc/hash.hh"
#include "replayrun.hh"
#include "tgba/tgba.hh"
#include "emptiness.hh"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment