* src/tgbaalgos/gtec/gtec.cc (couvreur99_check_shy::check):
Reorganize this function so that syntactically there is only one loop over the successors, and not two. Call reintroduce the call to couvreur99_check_shy::state_index(), needed by SSP, and suppress that to index_and_insert introduced on 2004-12-29. Also split the "group" option in two: "group" and "group2". "group2" is the equivalent of the older "group", while the new "group" is weaker and faster. (couvreur99_check_shy::state_index): Change prototype as needed by the algorithm. * src/tgbaalgos/gtec/gtec.hh: Adjust. * src/tgbaalgos/gtec/nsheap.hh, src/tgbaalgos/gtec/nsheap.cc (index_and_insert): Remove. * iface/gspn/ssp.cc (couvreur99_check_shy_ssp::state_index): Adjust to new prototype. * bench/emptchk/README, bench/emptchk/algorithms: Adjust references to group/group2.
This commit is contained in:
parent
d9d4804bc9
commit
236742aed8
8 changed files with 197 additions and 214 deletions
|
|
@ -1,4 +1,4 @@
|
|||
// Copyright (C) 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
// Copyright (C) 2004, 2006 Laboratoire d'Informatique de Paris 6 (LIP6),
|
||||
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
|
||||
// et Marie Curie.
|
||||
//
|
||||
|
|
@ -89,12 +89,6 @@ namespace spot
|
|||
/// Add a new state \a s with index \a index
|
||||
virtual void insert(const state* s, int index) = 0;
|
||||
|
||||
/// \brief Get the index of a state, and insert that state if it is missing.
|
||||
///
|
||||
/// If a clone of \a s is already in the hash table, \a s will be deleted
|
||||
/// and replaced by the address of the clone used.
|
||||
virtual int& index_and_insert(const state*& s) = 0;
|
||||
|
||||
/// The number of stored states.
|
||||
virtual int size() const = 0;
|
||||
|
||||
|
|
@ -120,7 +114,6 @@ namespace spot
|
|||
virtual state_index_p find(const state* s);
|
||||
virtual state_index index(const state* s) const;
|
||||
virtual state_index_p index(const state* s);
|
||||
virtual int& index_and_insert(const state*& s);
|
||||
|
||||
virtual void insert(const state* s, int index);
|
||||
virtual int size() const;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue