* mln/core/concept/object_id.hh: move... * mln/util/object_id.hh: ... here. Add a missing operator<. * mln/util/graph_ids.hh: update include path. --- milena/ChangeLog | 9 ++ milena/mln/core/concept/object_id.hh | 220 ---------------------------------- milena/mln/util/graph_ids.hh | 2 +- milena/mln/util/object_id.hh | 213 ++++++++++++++++++++++++++++++++ 4 files changed, 223 insertions(+), 221 deletions(-) delete mode 100644 milena/mln/core/concept/object_id.hh create mode 100644 milena/mln/util/object_id.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 4430b6c..10648a0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,4 +1,13 @@ 2009-05-07 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; + + Move object_id.hh to mln/util and add a missing operator< + + * mln/core/concept/object_id.hh: move... + * mln/util/object_id.hh: ... here. Add a missing operator<. + + * mln/util/graph_ids.hh: update include path. + +2009-05-07 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; Move debug::colorize to labeling::colorize. diff --git a/milena/mln/core/concept/object_id.hh b/milena/mln/core/concept/object_id.hh deleted file mode 100644 index e8102df..0000000 --- a/milena/mln/core/concept/object_id.hh +++ /dev/null @@ -1,220 +0,0 @@ -// Copyright (C) 2009 EPITA Research and Development Laboratory -// (LRDE) -// -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. -// -// As a special exception, you may use this file as part of a free -// software library without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to -// produce an executable, this file does not by itself cause the -// resulting executable to be covered by the GNU General Public -// License. -// reasons why the executable file might be covered by the GNU General -// Public License. - - -#ifndef MLN_CORE_CONCEPT_OBJECT_ID_HH -# define MLN_CORE_CONCEPT_OBJECT_ID_HH - -/// \file mln/core/concept/object_id.hh -/// -/// Base class of an object id. - - -# include <mln/core/concept/object.hh> -# include <mln/value/concept/integer.hh> -# include <mln/metal/abort.hh> - -namespace mln -{ - - - /// Object category. - template <typename E> - struct Object_Id; - - template <> - struct Object_Id<void> - { - }; - - - - /// Base class of an object id. - /// \tparam Tag the tag type - /// \tparam Equiv the equivalent value. - template <typename Tag, typename V> - class object_id : public value::Integer< object_id<Tag, V> > - { - public: - /// The underlying type id. - typedef V value_t; - typedef unsigned equiv; - typedef V enc; - - /// Constructors - /// @{ - object_id(); - - template <typename V2> - object_id(const V2& id); - - template <typename Tag2, typename V2> - object_id(const object_id<Tag2,V2>& other); - /// @} - - template <typename V2> - object_id<Tag,V>& operator=(const V2& e); - - const V& value() const; - V& value(); - - operator unsigned() const; - - bool is_valid() const; - void invalidate(); - - unsigned to_equiv() const; - - protected: - V id_; - }; - - - template <typename Tag, typename V> - bool - operator==(const object_id<Tag,V>& lhs, const object_id<Tag,V>& rhs); - - template <typename Tag, typename V, typename V2> - bool - operator==(const object_id<Tag,V>& lhs, const Value<V2>& rhs); - - -# ifndef MLN_INCLUDE_ONLY - - - template <typename Tag, typename V> - inline - object_id<Tag,V>::object_id() - : id_(mln_max(V)) - { - } - - template <typename Tag, typename V> - template <typename V2> - inline - object_id<Tag,V>::object_id(const V2& id) - : id_(id) - { - mlc_converts_to(V2,V)::check(); - } - - template <typename Tag, typename V> - template <typename Tag2, typename V2> - inline - object_id<Tag,V>::object_id(const object_id<Tag2,V2>& id) - { - typedef object_id<Tag2,V2> id_t; - mlc_abort(id_t)::check(); - } - - template <typename Tag, typename V> - template <typename V2> - inline - object_id<Tag,V>& - object_id<Tag,V>::operator=(const V2& v) - { - mlc_converts_to(V2,V)::check(); - - id_ = v; - return *this; - } - - template <typename Tag, typename V> - inline - V& - object_id<Tag,V>::value() - { - return id_; - } - - template <typename Tag, typename V> - inline - const V& - object_id<Tag,V>::value() const - { - return id_; - } - - template <typename Tag, typename V> - inline - object_id<Tag,V>::operator unsigned() const - { - return id_; - } - - - template <typename Tag, typename V> - inline - bool - object_id<Tag,V>::is_valid() const - { - return id_ != mln_max(V); - } - - template <typename Tag, typename V> - inline - void - object_id<Tag,V>::invalidate() - { - id_ = mln_max(V); - } - - template <typename Tag, typename V> - inline - unsigned - object_id<Tag,V>::to_equiv() const - { - return id_; - } - - - - - template <typename Tag, typename V> - inline - bool - operator==(const object_id<Tag,V>& lhs, const object_id<Tag,V>& rhs) - { - return lhs.value() == rhs.value(); - } - - template <typename Tag, typename V, typename V2> - inline - bool - operator==(const object_id<Tag,V>& lhs, const Value<V2>& rhs) - { - return lhs.value() == exact(rhs).to_equiv(); - } - -# endif // ! MLN_INCLUDE_ONLY - - -} // end of namespace mln - -#endif // ! MLN_CORE_CONCEPT_OBJECT_ID_HH - diff --git a/milena/mln/util/graph_ids.hh b/milena/mln/util/graph_ids.hh index df3e981..2f9eab5 100644 --- a/milena/mln/util/graph_ids.hh +++ b/milena/mln/util/graph_ids.hh @@ -33,7 +33,7 @@ /// /// Definition of graph element ids. -# include <mln/core/concept/object_id.hh> +# include <mln/util/object_id.hh> namespace mln diff --git a/milena/mln/util/object_id.hh b/milena/mln/util/object_id.hh new file mode 100644 index 0000000..b3ea879 --- /dev/null +++ b/milena/mln/util/object_id.hh @@ -0,0 +1,213 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. +// reasons why the executable file might be covered by the GNU General +// Public License. + + +#ifndef MLN_UTIL_OBJECT_ID_HH +# define MLN_UTIL_OBJECT_ID_HH + +/// \file mln/core/concept/object_id.hh +/// +/// Base class of an object id. + + +# include <mln/core/concept/object.hh> +# include <mln/value/concept/integer.hh> +# include <mln/metal/abort.hh> + +namespace mln +{ + + namespace util + { + + /// Base class of an object id. + /// \tparam Tag the tag type + /// \tparam Equiv the equivalent value. + template <typename Tag, typename V> + class object_id : public value::Integer< object_id<Tag, V> > + { + public: + /// The underlying type id. + typedef V value_t; + typedef unsigned equiv; + typedef V enc; + + /// Constructors + /// @{ + object_id(); + + template <typename V2> + object_id(const V2& id); + + template <typename Tag2, typename V2> + object_id(const object_id<Tag2,V2>& other); + /// @} + + template <typename V2> + object_id<Tag,V>& operator=(const V2& e); + + const V& value() const; + V& value(); + + operator unsigned() const; + + bool is_valid() const; + void invalidate(); + + unsigned to_equiv() const; + + protected: + V id_; + }; + + + template <typename Tag, typename V> + bool + operator==(const object_id<Tag,V>& lhs, const object_id<Tag,V>& rhs); + + template <typename Tag, typename V, typename V2> + bool + operator<(const object_id<Tag,V>& lhs, const object_id<Tag,V>& rhs); + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename Tag, typename V> + inline + object_id<Tag,V>::object_id() + : id_(mln_max(V)) + { + } + + template <typename Tag, typename V> + template <typename V2> + inline + object_id<Tag,V>::object_id(const V2& id) + : id_(id) + { + mlc_converts_to(V2,V)::check(); + } + + template <typename Tag, typename V> + template <typename Tag2, typename V2> + inline + object_id<Tag,V>::object_id(const object_id<Tag2,V2>& id) + { + typedef object_id<Tag2,V2> id_t; + mlc_abort(id_t)::check(); + } + + template <typename Tag, typename V> + template <typename V2> + inline + object_id<Tag,V>& + object_id<Tag,V>::operator=(const V2& v) + { + mlc_converts_to(V2,V)::check(); + + id_ = v; + return *this; + } + + template <typename Tag, typename V> + inline + V& + object_id<Tag,V>::value() + { + return id_; + } + + template <typename Tag, typename V> + inline + const V& + object_id<Tag,V>::value() const + { + return id_; + } + + template <typename Tag, typename V> + inline + object_id<Tag,V>::operator unsigned() const + { + return id_; + } + + + template <typename Tag, typename V> + inline + bool + object_id<Tag,V>::is_valid() const + { + return id_ != mln_max(V); + } + + template <typename Tag, typename V> + inline + void + object_id<Tag,V>::invalidate() + { + id_ = mln_max(V); + } + + template <typename Tag, typename V> + inline + unsigned + object_id<Tag,V>::to_equiv() const + { + return id_; + } + + + + + template <typename Tag, typename V> + inline + bool + operator==(const object_id<Tag,V>& lhs, const object_id<Tag,V>& rhs) + { + return lhs.value() == rhs.value(); + } + + template <typename Tag, typename V> + inline + bool + operator<(const object_id<Tag,V>& lhs, const object_id<Tag,V>& rhs) + { + return lhs.value() < rhs.value(); + } + + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::util + +} // end of namespace mln + +#endif // ! MLN_UTIL_OBJECT_ID_HH + -- 1.6.1.2