LEMON/LEMON-official Changeset - r619:be6646ac5d89

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r619:be6646ac5d89

« 611:eda12d

620:37216c »

r619:be6646ac5d89

Sat, 04 Apr 2009 08:30:58

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

DescriptorMap->RangeIdMap, InvertableMap->CrossRefMap (#160)

0 2 0

default

2 files changed with 44 insertions and 45 deletions:

lemon/maps.h

test/graph_utils_test.cc

↑ Collapse diff ↑

lemon/maps.h

Show inline comments

@@ -1834,3 +1834,3 @@
 		  ///
-		  /// \see DescriptorMap
+		  /// \see RangeIdMap
 		  template <typename GR, typename K>
@@ -1900,3 +1900,3 @@
-		  /// \brief General invertable graph map type.
+		  /// \brief General cross reference graph map type.
@@ -1917,3 +1917,3 @@
 		  template <typename GR, typename K, typename V>
-		  class InvertableMap
+		  class CrossRefMap
 		    : protected ItemSetTraits<GR, K>::template Map<V>::Type {
@@ -1929,9 +1929,9 @@
-		    /// The graph type of InvertableMap.
+		    /// The graph type of CrossRefMap.
 		    typedef GR Graph;
-		    /// The key type of InvertableMap (\c Node, \c Arc or \c Edge).
+		    /// The key type of CrossRefMap (\c Node, \c Arc or \c Edge).
 		    typedef K Item;
-		    /// The key type of InvertableMap (\c Node, \c Arc or \c Edge).
+		    /// The key type of CrossRefMap (\c Node, \c Arc or \c Edge).
 		    typedef K Key;
-		    /// The value type of InvertableMap.
+		    /// The value type of CrossRefMap.
 		    typedef V Value;
@@ -1940,4 +1940,4 @@
 		    ///
 		    /// Construct a new InvertableMap for the given graph.
 		    explicit InvertableMap(const Graph& graph) : Map(graph) {}
 		    /// Construct a new CrossRefMap for the given graph.
 		    explicit CrossRefMap(const Graph& graph) : Map(graph) {}
@@ -1950,3 +1950,3 @@
 		      : public std::iterator<std::forward_iterator_tag, Value> {
-		      friend class InvertableMap;
+		      friend class CrossRefMap;
 		    private:
@@ -2074,3 +2074,3 @@
 		      /// Constructor of the InverseMap.
-		      explicit InverseMap(const InvertableMap& inverted)
+		      explicit InverseMap(const CrossRefMap& inverted)
 		        : _inverted(inverted) {}
@@ -2078,5 +2078,5 @@
 		      /// The value type of the InverseMap.
-		      typedef typename InvertableMap::Key Value;
+		      typedef typename CrossRefMap::Key Value;
 		      /// The key type of the InverseMap.
-		      typedef typename InvertableMap::Value Key;
+		      typedef typename CrossRefMap::Value Key;
@@ -2091,3 +2091,3 @@
 		    private:
-		      const InvertableMap& _inverted;
+		      const CrossRefMap& _inverted;
 		    };
@@ -2103,7 +2103,7 @@
 		  /// \brief Provides a mutable, continuous and unique descriptor for each
 		  /// item in a graph.
 		  /// \brief Provides continuous and unique ID for the
 		  /// items of a graph.
 		  ///
 		  /// DescriptorMap provides a unique and continuous (but mutable)
 		  /// descriptor (id) for each item of the same type (\c Node, \c Arc or
 		  /// RangeIdMap provides a unique and continuous
 		  /// ID for each item of a given type (\c Node, \c Arc or
 		  /// \c Edge) in a graph. This id is
@@ -2112,5 +2112,4 @@
 		  ///    between 0 and \c n-1, where \c n is the number of the items of
 		  ///    this type (\c Node, \c Arc or \c Edge). So the id of an item can
 		  ///    change if you delete an other item of the same type, i.e. this
-		  ///    id is mutable.
+		  ///    this type (\c Node, \c Arc or \c Edge).
 		  ///  - So, the ids can change when deleting an item of the same type.
 		  ///
@@ -2127,3 +2126,3 @@
 		  template <typename GR, typename K>
-		  class DescriptorMap
+		  class RangeIdMap
 		    : protected ItemSetTraits<GR, K>::template Map<int>::Type {
@@ -2133,9 +2132,9 @@
 		  public:
-		    /// The graph type of DescriptorMap.
+		    /// The graph type of RangeIdMap.
 		    typedef GR Graph;
-		    /// The key type of DescriptorMap (\c Node, \c Arc or \c Edge).
+		    /// The key type of RangeIdMap (\c Node, \c Arc or \c Edge).
 		    typedef K Item;
-		    /// The key type of DescriptorMap (\c Node, \c Arc or \c Edge).
+		    /// The key type of RangeIdMap (\c Node, \c Arc or \c Edge).
 		    typedef K Key;
-		    /// The value type of DescriptorMap.
+		    /// The value type of RangeIdMap.
 		    typedef int Value;
@@ -2144,4 +2143,4 @@
 		    ///
 		    /// Constructor for descriptor map.
 		    explicit DescriptorMap(const Graph& gr) : Map(gr) {
 		    /// Constructor.
 		    explicit RangeIdMap(const Graph& gr) : Map(gr) {
 		      Item it;
@@ -2246,5 +2245,5 @@
-		    /// \brief Gives back the \e descriptor of the item.
+		    /// \brief Gives back the \e RangeId of the item
 		    ///
-		    /// Gives back the mutable and unique \e descriptor of the map.
+		    /// Gives back the \e RangeId of the item.
 		    int operator[](const Item& item) const {
@@ -2253,5 +2252,5 @@
 		    /// \brief Gives back the item by its descriptor.
 		    ///
-		    /// Gives back th item by its descriptor.
+		    /// \brief Gives back the item belonging to a \e RangeId
 		    ///
 		    /// Gives back the item belonging to a \e RangeId.
 		    Item operator()(int id) const {
@@ -2267,5 +2266,5 @@
-		    /// \brief The inverse map type of DescriptorMap.
+		    /// \brief The inverse map type of RangeIdMap.
 		    ///
-		    /// The inverse map type of DescriptorMap.
+		    /// The inverse map type of RangeIdMap.
 		    class InverseMap {
@@ -2275,3 +2274,3 @@
 		      /// Constructor of the InverseMap.
-		      explicit InverseMap(const DescriptorMap& inverted)
+		      explicit InverseMap(const RangeIdMap& inverted)
 		        : _inverted(inverted) {}
@@ -2280,5 +2279,5 @@
 		      /// The value type of the InverseMap.
-		      typedef typename DescriptorMap::Key Value;
+		      typedef typename RangeIdMap::Key Value;
 		      /// The key type of the InverseMap.
-		      typedef typename DescriptorMap::Value Key;
+		      typedef typename RangeIdMap::Value Key;
@@ -2300,3 +2299,3 @@
 		    private:
-		      const DescriptorMap& _inverted;
+		      const RangeIdMap& _inverted;
 		    };

test/graph_utils_test.cc

Show inline comments

@@ -40,4 +40,4 @@
+		    }
 		    DescriptorMap<Digraph, Node> nodes(digraph);
 		    typename DescriptorMap<Digraph, Node>::InverseMap invNodes(nodes);
 		    RangeIdMap<Digraph, Node> nodes(digraph);
 		    typename RangeIdMap<Digraph, Node>::InverseMap invNodes(nodes);
 		    for (int i = 0; i < 100; ++i) {
@@ -48,3 +48,3 @@
 		    typename Digraph::template ArcMap<bool> found(digraph, false);
-		    DescriptorMap<Digraph, Arc> arcs(digraph);
+		    RangeIdMap<Digraph, Arc> arcs(digraph);
 		    for (NodeIt src(digraph); src != INVALID; ++src) {
@@ -115,4 +115,4 @@
+		  }
 		  DescriptorMap<Graph, Node> nodes(graph);
 		  typename DescriptorMap<Graph, Node>::InverseMap invNodes(nodes);
 		  RangeIdMap<Graph, Node> nodes(graph);
 		  typename RangeIdMap<Graph, Node>::InverseMap invNodes(nodes);
 		  for (int i = 0; i < 100; ++i) {
@@ -123,3 +123,3 @@
 		  typename Graph::template EdgeMap<int> found(graph, 0);
-		  DescriptorMap<Graph, Edge> edges(graph);
+		  RangeIdMap<Graph, Edge> edges(graph);
 		  for (NodeIt src(graph); src != INVALID; ++src) {

0 comments (0 inline)

RhodeCode

Login to your account