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

Store the scc_map_ as a vector instead of a std::map. There is no

Browse source 
point in using a map since the SCC are numbered in sequence.

* src/tgbaalgos/scc.hh (scc_map::relabel_component): Return the
number of the SCC instead of taking it as argument.
(scc_map::scc_num_): Delete this variable.  scc_map_.size() gives
the same information.
(scc_map::scc_map_type): Define using std::vector instead of
std::map.
* src/tgbaalgos/scc.cc: Adjust all uses.
This commit is contained in:
Alexandre Duret-Lutz 2009-05-28 13:32:36 +02:00
parent 07ead6134e
commit 96a7a49c52
3 changed files with 45 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/tgbaalgos/scc.hh
View file

@ -23,6 +23,7 @@
#include <map>
#include <stack>
#include <vector>
#include "tgba/tgba.hh"
#include <iosfwd>
#include "misc/hash.hh"
@ -65,7 +66,7 @@ namespace spot
scc_map(const tgba* aut);
void build_map();
void relabel_component(int n);
int relabel_component();
int scc_of_state(const state* s) const;
const cond_set& cond_set_of(int n) const;
@ -74,7 +75,7 @@ namespace spot
const tgba* get_aut() const;
int scc_count() const;
unsigned scc_count() const;
int initial() const;
@ -110,8 +111,6 @@ namespace spot
state_ptr_hash, state_ptr_equal> hash_type;
hash_type h_; // Map of visited states.
int num_; // Number of visited nodes.
int scc_num_; // Opposite of the number of
// maximal SCC constructed.
typedef std::pair<const spot::state*, tgba_succ_iterator*> pair_state_iter;
std::stack<pair_state_iter> todo_; // DFS stack. Holds (STATE,
// ITERATOR) pairs where
@ -122,8 +121,10 @@ namespace spot
// but STATE should not because
// it is used as a key in H.
typedef std::map<int, scc> scc_map_type;
typedef std::vector<scc> scc_map_type;
scc_map_type scc_map_; // Map of constructed maximal SCC.
// SCC number "n" in H_ corresponds to entry
// "-n-1" in SCC_MAP_.
};
scc_stats build_scc_stats(const tgba* a);