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

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/marci

Files:

• augmenting_flow.h (modified) (1 diff)
• bfs_mm.h (modified) (4 diffs)
• bipartite_graph_wrapper.h (modified) (5 diffs)
• experiment/list_graph.h (modified) (2 diffs)
• graph_concept.h (modified) (2 diffs)
• leda/leda_graph_wrapper.h (modified) (4 diffs)

src/work/marci/augmenting_flow.h

@@ -113 +113 @@
       int* number_of_augmentations;
     public:
-      typedef Node KeyType;
-      typedef bool ValueType;
+      typedef Node Key;
+      typedef bool Value;
       TrickyReachedMap(IntMap& _map, int& _number_of_augmentations) : 
         map(&_map), number_of_augmentations(&_number_of_augmentations) { }

src/work/marci/bfs_mm.h

@@ -141 +141 @@
     /// Guess what?
     /// \deprecated 
-    typename ReachedMap::ValueType reached(const Node& n) const { 
+    typename ReachedMap::Value reached(const Node& n) const { 
       return (*reached_map)[n]; 
     }
@@ -243 +243 @@
     /// Guess what?
     /// \deprecated 
-    typename PredMap::ValueType pred(const Node& n) const { 
+    typename PredMap::Value pred(const Node& n) const { 
       return (*pred_map)[n]; 
     }
@@ -251 +251 @@
     /// Guess what?
     /// \deprecated 
-    typename PredNodeMap::ValueType predNode(const Node& n) const { 
+    typename PredNodeMap::Value predNode(const Node& n) const { 
       return (*pred_node_map)[n]; 
     }
@@ -259 +259 @@
     /// Guess what?
     /// \deprecated 
-    typename DistMap::ValueType dist(const Node& n) const { 
+    typename DistMap::Value dist(const Node& n) const { 
       return (*dist_map)[n]; 
     }

src/work/marci/bipartite_graph_wrapper.h

@@ -795 +795 @@
     template<typename NM> class NodeMapWrapper { 
     public:
-      typedef Node KeyType;
-      typedef typename NM::ValueType ValueType;
+      typedef Node Key;
+      typedef typename NM::Value Value;
     protected:
       NM* nm;
-      ValueType* s_value, t_value;
-    public:
-      NodeMapWrapper(NM& _nm, ValueType& _s_value, ValueType& _t_value) : 
+      Value* s_value, t_value;
+    public:
+      NodeMapWrapper(NM& _nm, Value& _s_value, Value& _t_value) : 
         nm(&_nm), s_value(&_s_value), t_value(&_t_value) { }
-      ValueType operator[](const Node& n) const { 
+      Value operator[](const Node& n) const { 
         switch (n.getSpec()) {
         case 0: 
@@ -814 +814 @@
         }
       }
-      void set(const Node& n, ValueType t) { 
+      void set(const Node& n, Value t) { 
         switch (n.getSpec()) {
         case 0: 
@@ -874 +874 @@
     class EdgeMapWrapper {
     public: 
-      typedef Edge KeyType;
-      typedef typename EM::ValueType ValueType;
+      typedef Edge Key;
+      typedef typename EM::Value Value;
     protected:
       EM* em;
@@ -881 +881 @@
     public:
       EdgeMapWrapper(EM& _em, NM& _nm) : em(&_em), nm(&_nm) { }
-      ValueType operator[](const Edge& e) const { 
+      Value operator[](const Edge& e) const { 
         switch (e.getSpec()) {
         case 0: 
@@ -892 +892 @@
         }
       }
-      void set(const Edge& e, ValueType t) { 
+      void set(const Edge& e, Value t) { 
         switch (e.getSpec()) {
         case 0: 

src/work/marci/experiment/list_graph.h

@@ -39 +39 @@
       std::vector<T> container;
     public:
-      typedef T ValueType;
-      typedef Node KeyType;
+      typedef T Value;
+      typedef Node Key;
       NodeMap(const ListGraph& _G) : G(_G), container(G.node_id) { }
       NodeMap(const ListGraph& _G, T a) : 
@@ -60 +60 @@
       std::vector<T> container;
     public:
-      typedef T ValueType;
-      typedef Edge KeyType;
+      typedef T Value;
+      typedef Edge Key;
       EdgeMap(const ListGraph& _G) : G(_G), container(G.edge_id) { }
       EdgeMap(const ListGraph& _G, T a) : 

src/work/marci/graph_concept.h

@@ -168 +168 @@
     {
     public:
-      typedef T ValueType;
-      typedef Node KeyType;
+      typedef T Value;
+      typedef Node Key;
 
       NodeMap(const GraphConcept& g) { }
@@ -206 +206 @@
     {
     public:
-      typedef T ValueType;
-      typedef Edge KeyType;
+      typedef T Value;
+      typedef Edge Key;
 
       EdgeMap(const GraphConcept& g) {}

src/work/marci/leda/leda_graph_wrapper.h

@@ -262 +262 @@
       leda_node_map<T> leda_stuff;
     public:
-      typedef T ValueType;
-      typedef Node KeyType;
+      typedef T Value;
+      typedef Node Key;
 
       NodeMap(const LedaGraphWrapper &G) : leda_stuff(*(G.l_graph)) {}
@@ -282 +282 @@
       leda_edge_map<T> leda_stuff;
     public:
-      typedef T ValueType;
-      typedef Edge KeyType;
+      typedef T Value;
+      typedef Edge Key;
 
       EdgeMap(const LedaGraphWrapper &G) : leda_stuff(*(G.l_graph)) {}
@@ -304 +304 @@
       leda_node_array<T>* leda_stuff;
     public:
-      typedef T ValueType;
-      typedef Node KeyType;
+      typedef T Value;
+      typedef Node Key;
 
       NodeMapWrapper(leda_node_array<T>& _leda_stuff) : 
@@ -326 +326 @@
       leda_edge_array<T>* leda_stuff;
     public:
-      typedef T ValueType;
-      typedef Edge KeyType;
+      typedef T Value;
+      typedef Edge Key;
 
       EdgeMapWrapper(leda_edge_array<T>& _leda_stuff) :