Changeset 2331:e389580e3348 in lemon-0.x for lemon

Timestamp:

12/18/06 15:35:33 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3117

Message:

Easier inverse than m.inverse()[a] => m(a)

File:

• lemon/graph_utils.h (modified) (7 diffs)

lemon/graph_utils.h

@@ -1583 +1583 @@
     /// \brief Constructor.
     ///
-    /// Constructor for creating id map.
+    /// Constructor of the map.
     explicit IdMap(const Graph& _graph) : graph(&_graph) {}
 
     /// \brief Gives back the \e id of the item.
     ///
-    /// Gives back the immutable and unique \e id of the map.
+    /// Gives back the immutable and unique \e id of the item.
     int operator[](const Item& item) const { return graph->id(item);}
 
+    /// \brief Gives back the item by its id.
+    ///
+    /// Gives back the item by its id.
+    Item operator()(int id) { return graph->fromId(id, Item()); }
 
   private:
@@ -1619 +1623 @@
       /// 
       Item operator[](int id) const { return graph->fromId(id, Item());}
+
     private:
       const Graph* graph;
@@ -1745 +1750 @@
     }
 
+    /// \brief Gives back the item by its value.
+    ///
+    /// Gives back the item by its value.
+    Key operator()(const Value& key) const {
+      typename Container::const_iterator it = invMap.find(key);
+      return it != invMap.end() ? it->second : INVALID;
+    }
+
   protected:
 
@@ -1808 +1821 @@
       /// what was last assigned to the value.
       Value operator[](const Key& key) const {
-        typename Container::const_iterator it = inverted.invMap.find(key);
-        return it->second;
+        return inverted(key);
       }
       
@@ -1967 +1979 @@
       return Map::operator[](item);
     }
+
+    /// \brief Gives back the item by its descriptor.
+    ///
+    /// Gives back th item by its descriptor.
+    Item operator()(int id) const {
+      return invMap[id];
+    }
     
   private:
@@ -1996 +2015 @@
       /// that the descriptor belongs to currently.
       Value operator[](const Key& key) const {
-        return inverted.invMap[key];
+        return inverted(key);
       }
 
@@ -2003 +2022 @@
       /// Returns the size of the map.
       unsigned int size() const {
-        return inverted.invMap.size();
+        return inverted.size();
       }