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

* src/ltlast/formula.hh (hash, dump, dump_, hash_key_): New members.

Browse source 
(formula_ptr_less_than, formula_ptr_hash): New class.
* src/ltlast/atomic_prop.cc, src/ltlast/binop.cc,
src/ltlast/constant.cc, src/ltlast/formula.cc,
src/ltlast/multop.cc, src/ltlast/unop.cc: Adjust to handle dump_.
* src/ltlvisit/apcollect.cc, src/ltlvisit/apcollect.hh:
Sort the set using formula_ptr_less_than.
* src/ltlvisit/dump.cc: Simplify using ->dump().
* src/tgbaalgos/ltl2tgba_fm.cc: Sort all maps to get deterministic
results.
This commit is contained in:
Alexandre Duret-Lutz 2005-01-20 17:33:55 +00:00
parent 8a5e31f00e
commit 5069a565b6
12 changed files with 153 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/tgbaalgos/ltl2tgba_fm.cc
View file

@ -1,4 +1,4 @@
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// Copyright (C) 2003, 2004, 2005 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systčmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie.
//
@ -533,7 +533,7 @@ namespace spot
}
private:
typedef Sgi::hash_map<const formula*, bool, ptr_hash<formula> > pfl_map;
typedef Sgi::hash_map<const formula*, bool, formula_ptr_hash> pfl_map;
pfl_map pfl_;
};
@ -613,7 +613,7 @@ namespace spot
}
typedef std::map<bdd, bdd, bdd_less_than> prom_map;
typedef Sgi::hash_map<const formula*, prom_map, ptr_hash<formula> > dest_map;
typedef Sgi::hash_map<const formula*, prom_map, formula_ptr_hash> dest_map;
static void
fill_dests(translate_dict& d, dest_map& dests, bdd label, const formula* dest)
@ -649,8 +649,9 @@ namespace spot
formula* f2 = negative_normal_form(f1);
destroy(f1);
std::set<const formula*> formulae_seen;
std::set<const formula*> formulae_to_translate;
typedef std::set<const formula*, formula_ptr_less_than> set_type;
set_type formulae_seen;
set_type formulae_to_translate;
translate_dict d(dict);
formula_canonizer fc(d);