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

Fix some Doxygen errors.

Browse source 
* src/kripke/kripkeexplicit.hh: Reindent, and fix
some comments.
This commit is contained in:
Alexandre Duret-Lutz 2011-11-28 13:37:14 +01:00
parent 11bb4c7789
commit 799ab14300
2 changed files with 112 additions and 109 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2011-11-28 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Fix some Doxygen errors.
* src/kripke/kripkeexplicit.hh: Reindent, and fix
some comments.
2011-11-13 Alexandre Duret-Lutz <adl@lrde.epita.fr> 2011-11-13 Alexandre Duret-Lutz <adl@lrde.epita.fr>
Add more nodes when resizing BDD table. Add more nodes when resizing BDD table.

214
src/kripke/kripkeexplicit.hh
View file

@ -35,60 +35,60 @@ namespace spot
/// \brief Concrete class for kripke states. /// \brief Concrete class for kripke states.
class state_kripke : public state class state_kripke : public state
{ {
friend class kripke_explicit; friend class kripke_explicit;
friend class kripke_explicit_succ_iterator; friend class kripke_explicit_succ_iterator;
private: private:
state_kripke(); state_kripke();
/// \brief Compare two states. /// \brief Compare two states.
/// ///
/// This method returns an integer less than, equal to, or greater /// This method returns an integer less than, equal to, or greater
/// than zero if \a this is found, respectively, to be less than, equal /// than zero if \a this is found, respectively, to be less than, equal
/// to, or greater than \a other according to some implicit total order. /// to, or greater than \a other according to some implicit total order.
/// ///
/// For moment, this method only compare the adress on the heap of the /// For moment, this method only compare the adress on the heap of the
/// twice pointers. /// twice pointers.
virtual int compare (const state* other) const; virtual int compare (const state* other) const;
/// \brief Hash a state /// \brief Hash a state
/// virtual size_t hash() const;
/// \FIXME For moment : Only there to can instantiate state_kripke.
virtual size_t hash() const;
/// \brief Duplicate a state. /// \brief Duplicate a state.
virtual state_kripke* clone() const; virtual state_kripke* clone() const;
/// \brief Add a condition to the conditions already in the state. /// \brief Add a condition to the conditions already in the state.
/// \param f The condition to add. /// \param f The condition to add.
void add_conditions(bdd f); void add_conditions(bdd f);
/// \brief Add a new successor in the list. /// \brief Add a new successor in the list.
/// \param add_me The state to add. /// \param succ The successor state to add.
void add_succ(state_kripke*); void add_succ(state_kripke* succ);
virtual bdd virtual bdd
as_bdd() const as_bdd() const
{ {
return bdd_; return bdd_;
} }
/// \brief Release a state. /// \brief Release a state.
/// ///
virtual void destroy() const virtual void
{ destroy() const
} {
}
virtual ~state_kripke () virtual
{ ~state_kripke ()
} {
}
//////////////////////////////// ////////////////////////////////
// Management for succ_iterator // Management for succ_iterator
const std::list<state_kripke*>& get_succ() const; const std::list<state_kripke*>& get_succ() const;
bdd bdd_; bdd bdd_;
std::list<state_kripke*> succ_; std::list<state_kripke*> succ_;
}; };
@ -96,21 +96,20 @@ namespace spot
/// \brief Implement iterator pattern on successor of a state_kripke. /// \brief Implement iterator pattern on successor of a state_kripke.
class kripke_explicit_succ_iterator : public kripke_succ_iterator class kripke_explicit_succ_iterator : public kripke_succ_iterator
{ {
public: public:
kripke_explicit_succ_iterator(const state_kripke*, kripke_explicit_succ_iterator(const state_kripke*, bdd);
bdd);
~kripke_explicit_succ_iterator(); ~kripke_explicit_succ_iterator();
virtual void first(); virtual void first();
virtual void next(); virtual void next();
virtual bool done() const; virtual bool done() const;
virtual state_kripke* current_state() const; virtual state_kripke* current_state() const;
private: private:
const state_kripke* s_; const state_kripke* s_;
std::list<state_kripke*>::const_iterator it_; std::list<state_kripke*>::const_iterator it_;
}; };
@ -118,77 +117,74 @@ namespace spot
/// \brief Kripke Structure. /// \brief Kripke Structure.
class kripke_explicit : public kripke class kripke_explicit : public kripke
{ {
public: public:
kripke_explicit(bdd_dict*); kripke_explicit(bdd_dict*);
kripke_explicit(bdd_dict*, state_kripke*); kripke_explicit(bdd_dict*, state_kripke*);
~kripke_explicit(); ~kripke_explicit();
bdd_dict* get_dict() const; bdd_dict* get_dict() const;
state_kripke* get_init_state() const; state_kripke* get_init_state() const;
/// \brief Allow to get an iterator on the state we passed in parameter. /// \brief Allow to get an iterator on the state we passed in
kripke_explicit_succ_iterator* succ_iter(const spot::state* local_state, /// parameter.
const spot::state* global_state = 0, kripke_explicit_succ_iterator*
const tgba* global_automaton = 0) const; succ_iter(const spot::state* local_state,
const spot::state* global_state = 0,
const tgba* global_automaton = 0) const;
/// \function state_condition /// \brief Get the condition on the state
/// \brief Get the condition on the state, designed by the adress, bdd state_condition(const state* s) const;
/// or by his name. /// \brief Get the condition on the state
bdd state_condition(const state* s) const; bdd state_condition(const std::string) const;
bdd state_condition(const std::string) const;
/// \brief Return the name of the state. /// \brief Return the name of the state.
std::string format_state(const state*) const; std::string format_state(const state*) const;
/// \brief Create state, if it does not already exists.
///
/// Used by the parser.
void add_state(std::string);
/// \brief Check if the state already exist, and create it if not. /// \brief Add a transition between two states.
/// used by the parser for more simplicity. void add_transition(std::string source,
void add_state(std::string); std::string dest);
/// \function add_transition /// \brief Add a BDD condition to the state
/// \brief Add a transition between two state. ///
/// Allow to do this with the two adress, or just the source adress, /// \param add the condition.
void add_transition(std::string source, /// \param on_me where add the condition.
std::string dest); void add_conditions(bdd add,
std::string on_me);
/// \function add_conditions /// \brief Add a formula to the state corresponding to the name.
/// \brief Add a condition in bdd format to the state, ///
/// name by his name or his address. /// \param f the formula to add.
/// \param add the condition. /// \param on_me the state where to add.
/// \param on_me where add the condition. void add_condition(const ltl::formula* f,
void add_conditions(bdd add, std::string on_me);
std::string on_me);
/// \brief Add a formula to the state corresponding to the name. /// \brief Return map between states and their names.
/// \param on_me The state where add. const std::map<const state_kripke*, std::string>&
/// \param f the formula to add. sn_get() const;
void add_condition(const ltl::formula* f,
std::string on_me);
const std::map<const state_kripke*, std::string>& private:
sn_get() const; /// \brief Add a state in the two maps.
void add_state(std::string, state_kripke*);
private: void add_conditions(bdd add,
/// \brief Add a state in the two map. state_kripke* on_me);
void add_state(std::string, state_kripke*);
void add_conditions(bdd add, void add_transition(std::string source,
state_kripke* on_me); const state_kripke* dest);
/// or with the two name. void add_transition(state_kripke* source,
void add_transition(state_kripke* source, const state_kripke* dest);
const state_kripke* dest);
void add_transition(std::string source,
const state_kripke* dest);
bdd_dict* dict_;
state_kripke* init_;
std::map<const std::string, state_kripke*> ns_nodes_;
bdd_dict* dict_; std::map<const state_kripke*, std::string> sn_nodes_;
state_kripke* init_;
std::map<const std::string, state_kripke*> ns_nodes_;
std::map<const state_kripke*, std::string> sn_nodes_;
}; };
} }
#endif /* !SPOT_KRIPKEEXPLICIT_HH_ */ #endif /* !SPOT_KRIPKEEXPLICIT_HH_ */