Changeset 987:87f7c54892df in lemon-0.x for src/work/alpar

Timestamp:

11/13/04 18:07:10 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Naming changes:

• ValueType? -> Value
• KeyType? -> Key
• ReferenceType? ->Reference
• PointerType? -> Pointer

Location:

src/work/alpar

Files:

• boolmap_iter.cc (modified) (2 diffs)
• dijkstra.h (modified) (8 diffs)
• f_ed_ka.h (modified) (2 diffs)
• rw_nonref_map.cc (modified) (4 diffs)

src/work/alpar/boolmap_iter.cc

@@ -14 +14 @@
   typedef typename GG::Edge Edge;
   
-  typedef Edge KeyType;
-  typedef bool ValueType;
+  typedef Edge Key;
+  typedef bool Value;
   
   friend class RefType;
@@ -68 +68 @@
     RefType(BoolIterEdgeMap &_M,Edge _e) : M(_M), e(_e) { }
     
-    operator ValueType() const 
+    operator Value() const 
     {
       return M.isTrue(e);
       
     }
-    ValueType operator = (ValueType v) const
+    Value operator = (Value v) const
     {
       if(v) M.setTrue(e); 

src/work/alpar/dijkstra.h

@@ -47 +47 @@
     typedef LM LengthMap;
     //The type of the length of the edges.
-    typedef typename LM::ValueType ValueType;
+    typedef typename LM::Value Value;
     ///The heap type used by Dijkstra algorithm.
 
@@ -55 +55 @@
     ///\sa Dijkstra
     typedef BinHeap<typename Graph::Node,
-                    typename LM::ValueType,
+                    typename LM::Value,
                     typename GR::template NodeMap<int>,
-                    std::less<ValueType> > Heap;
+                    std::less<Value> > Heap;
 
     ///\brief The type of the map that stores the last
@@ -91 +91 @@
     ///It must meet the \ref concept::WriteMap "WriteMap" concept.
     ///
-    typedef typename Graph::template NodeMap<typename LM::ValueType> DistMap;
+    typedef typename Graph::template NodeMap<typename LM::Value> DistMap;
     ///Instantiates a DistMap.
  
@@ -110 +110 @@
   ///
   ///The type of the length is determined by the
-  ///\ref concept::ReadMap::ValueType "ValueType" of the length map.
+  ///\ref concept::ReadMap::Value "Value" of the length map.
   ///
   ///It is also possible to change the underlying priority heap.
@@ -159 +159 @@
     
     ///The type of the length of the edges.
-    typedef typename TR::LengthMap::ValueType ValueType;
+    typedef typename TR::LengthMap::Value Value;
     ///The type of the map that stores the edge lengths.
     typedef typename TR::LengthMap LengthMap;
@@ -388 +388 @@
         
         Node v=heap.top(); 
-        ValueType oldvalue=heap[v];
+        Value oldvalue=heap[v];
         heap.pop();
         distance->set(v, oldvalue);
@@ -421 +421 @@
     ///\warning If node \c v in unreachable from the root the return value
     ///of this funcion is undefined.
-    ValueType dist(Node v) const { return (*distance)[v]; }
+    Value dist(Node v) const { return (*distance)[v]; }
 
     ///Returns the 'previous edge' of the shortest path tree.
@@ -498 +498 @@
     typedef typename TR::LengthMap LengthMap;
     ///The type of the length of the edges.
-    typedef typename LengthMap::ValueType ValueType;
+    typedef typename LengthMap::Value Value;
     ///\brief The type of the map that stores the last
     ///edges of the shortest paths.

src/work/alpar/f_ed_ka.h

@@ -14 +14 @@
 namespace lemon {
   template <typename Graph, typename FlowMap, typename CapacityMap>
-  typename FlowMap::ValueType maxFlow(Graph &G,
+  typename FlowMap::Value maxFlow(Graph &G,
                                       FlowMap &f,
                                       CapacityMap &c,
@@ -26 +26 @@
     typedef typename Graph::OutEdgeIt OutEdgeIt;
     typedef typename Graph::InEdgeIt InEdgeIt;
-    typedef typename FlowMap::ValueType T;
+    typedef typename FlowMap::Value T;
     
     T flow_val = 0;

src/work/alpar/rw_nonref_map.cc

@@ -11 +11 @@
   typedef typename GG::Edge Edge;
   
-  typedef Edge KeyType;
-  typedef TT ValueType;
+  typedef Edge Key;
+  typedef TT Value;
   
   class RefType 
@@ -21 +21 @@
     RefType(Graph &_G,Edge _e) : G(_G), e(_e) { }
     
-    operator ValueType() const 
+    operator Value() const 
     {
-      ValueType tmp;
+      Value tmp;
       std::cout << G.id(G.source(e)) << "->"
                 << G.id(G.target(e)) << ": ";
@@ -29 +29 @@
       return tmp;
     }
-    ValueType operator = (ValueType v) const
+    Value operator = (Value v) const
     {
       std::cout << G.id(G.source(e)) << "->"
@@ -48 +48 @@
 {
 public:
-  typedef K KeyType;
-  typedef T ValueType;
+  typedef K Key;
+  typedef T Value;
   
   class RefType 
   {
-    ValueType val;
+    Value val;
   public:
-    RefType(ValueType v) : val(v) { }   
-    operator ValueType() const { return val; }
-    ValueType operator = (ValueType v) const { return val; }
+    RefType(Value v) : val(v) { }   
+    operator Value() const { return val; }
+    Value operator = (Value v) const { return val; }
   };
   
 private:
-  ValueType val;
+  Value val;
 public:
-  NullMap(ValueType v) : val(v) { }
-  RefType operator[] (KeyType e) const { return RefType(v);}  
+  NullMap(Value v) : val(v) { }
+  RefType operator[] (Key e) const { return RefType(v);}  
 };