Changeset 1910:f95eea8c34b0 in lemon-0.x for lemon/bits/default_map.h

Timestamp:

01/26/06 17:24:40 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Bipartite => Bp
Upper => A
Lower => B

+ some bug fix

File:

• lemon/bits/default_map.h (modified) (12 diffs)

lemon/bits/default_map.h

@@ -3 +3 @@
  *
  * Copyright (C) 2006 Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
- * (Egervary Research Group on Combinatorial Optimization, EGRES).
+ * (Egervary Research Groin on Combinatorial Optimization, EGRES).
  *
  * Permission to use, modify and distribute this software is granted
@@ -22 +22 @@
 #include <lemon/bits/vector_map.h>
 
-///\ingroup graphmapfactory
+///\ingroin graphmapfactory
 ///\file
 ///\brief Graph maps that construct and destruct
@@ -353 +353 @@
 
   template <typename _Base>
-  class MappableUBipartiteGraphExtender : public _Base {
+  class MappableBpUGraphExtender : public _Base {
   public:
 
     typedef _Base Parent;
-    typedef MappableUBipartiteGraphExtender Graph;
+    typedef MappableBpUGraphExtender Graph;
 
     typedef typename Parent::Node Node;
-    typedef typename Parent::UpperNode UpperNode;
-    typedef typename Parent::LowerNode LowerNode;
+    typedef typename Parent::ANode ANode;
+    typedef typename Parent::BNode BNode;
     typedef typename Parent::Edge Edge;
     typedef typename Parent::UEdge UEdge;
     
     template <typename _Value>
-    class UpperNodeMap 
-      : public IterableMapExtender<DefaultMap<Graph, UpperNode, _Value> > {
-    public:
-      typedef MappableUBipartiteGraphExtender Graph;
-      typedef IterableMapExtender<DefaultMap<Graph, UpperNode, _Value> > 
+    class ANodeMap 
+      : public IterableMapExtender<DefaultMap<Graph, ANode, _Value> > {
+    public:
+      typedef MappableBpUGraphExtender Graph;
+      typedef IterableMapExtender<DefaultMap<Graph, ANode, _Value> > 
       Parent;
     
-      UpperNodeMap(const Graph& _g) 
-        : Parent(_g) {}
-      UpperNodeMap(const Graph& _g, const _Value& _v) 
-        : Parent(_g, _v) {}
-    
-      UpperNodeMap& operator=(const UpperNodeMap& cmap) {
-        return operator=<UpperNodeMap>(cmap);
+      ANodeMap(const Graph& _g) 
+        : Parent(_g) {}
+      ANodeMap(const Graph& _g, const _Value& _v) 
+        : Parent(_g, _v) {}
+    
+      ANodeMap& operator=(const ANodeMap& cmap) {
+        return operator=<ANodeMap>(cmap);
       }
     
@@ -387 +387 @@
       /// The given parameter should be conform to the ReadMap
       /// concept and could be indiced by the current item set of
-      /// the UpperNodeMap. In this case the value for each item
+      /// the ANodeMap. In this case the value for each item
       /// is assigned by the value of the given ReadMap. 
       template <typename CMap>
-      UpperNodeMap& operator=(const CMap& cmap) {
-        checkConcept<concept::ReadMap<UpperNode, _Value>, CMap>();
-        const typename Parent::Graph* graph = Parent::getGraph();
-        UpperNode it;
-        for (graph->first(it); it != INVALID; graph->next(it)) {
-          Parent::set(it, cmap[it]);
-        }
-        return *this;
-      }
-    
-    };
-
-    template <typename _Value>
-    class LowerNodeMap 
-      : public IterableMapExtender<DefaultMap<Graph, LowerNode, _Value> > {
-    public:
-      typedef MappableUBipartiteGraphExtender Graph;
-      typedef IterableMapExtender<DefaultMap<Graph, LowerNode, _Value> > 
+      ANodeMap& operator=(const CMap& cmap) {
+        checkConcept<concept::ReadMap<ANode, _Value>, CMap>();
+        const typename Parent::Graph* graph = Parent::getGraph();
+        ANode it;
+        for (graph->first(it); it != INVALID; graph->next(it)) {
+          Parent::set(it, cmap[it]);
+        }
+        return *this;
+      }
+    
+    };
+
+    template <typename _Value>
+    class BNodeMap 
+      : public IterableMapExtender<DefaultMap<Graph, BNode, _Value> > {
+    public:
+      typedef MappableBpUGraphExtender Graph;
+      typedef IterableMapExtender<DefaultMap<Graph, BNode, _Value> > 
       Parent;
     
-      LowerNodeMap(const Graph& _g) 
-        : Parent(_g) {}
-      LowerNodeMap(const Graph& _g, const _Value& _v) 
-        : Parent(_g, _v) {}
-    
-      LowerNodeMap& operator=(const LowerNodeMap& cmap) {
-        return operator=<LowerNodeMap>(cmap);
+      BNodeMap(const Graph& _g) 
+        : Parent(_g) {}
+      BNodeMap(const Graph& _g, const _Value& _v) 
+        : Parent(_g, _v) {}
+    
+      BNodeMap& operator=(const BNodeMap& cmap) {
+        return operator=<BNodeMap>(cmap);
       }
     
@@ -424 +424 @@
       /// The given parameter should be conform to the ReadMap
       /// concept and could be indiced by the current item set of
-      /// the LowerNodeMap. In this case the value for each item
+      /// the BNodeMap. In this case the value for each item
       /// is assigned by the value of the given ReadMap. 
       template <typename CMap>
-      LowerNodeMap& operator=(const CMap& cmap) {
-        checkConcept<concept::ReadMap<LowerNode, _Value>, CMap>();
-        const typename Parent::Graph* graph = Parent::getGraph();
-        LowerNode it;
+      BNodeMap& operator=(const CMap& cmap) {
+        checkConcept<concept::ReadMap<BNode, _Value>, CMap>();
+        const typename Parent::Graph* graph = Parent::getGraph();
+        BNode it;
         for (graph->first(it); it != INVALID; graph->next(it)) {
           Parent::set(it, cmap[it]);
@@ -444 +444 @@
     class NodeMapBase : public Parent::NodeNotifier::ObserverBase {
     public:
-      typedef MappableUBipartiteGraphExtender Graph;
+      typedef MappableBpUGraphExtender Graph;
 
       typedef Node Key;
@@ -450 +450 @@
 
       /// The reference type of the map;
-      typedef typename LowerNodeMap<_Value>::Reference Reference;
+      typedef typename BNodeMap<_Value>::Reference Reference;
       /// The pointer type of the map;
-      typedef typename LowerNodeMap<_Value>::Pointer Pointer;
+      typedef typename BNodeMap<_Value>::Pointer Pointer;
       
       /// The const value type of the map.
       typedef const Value ConstValue;
       /// The const reference type of the map;
-      typedef typename LowerNodeMap<_Value>::ConstReference ConstReference;
+      typedef typename BNodeMap<_Value>::ConstReference ConstReference;
       /// The pointer type of the map;
-      typedef typename LowerNodeMap<_Value>::ConstPointer ConstPointer;
+      typedef typename BNodeMap<_Value>::ConstPointer ConstPointer;
 
       typedef True ReferenceMapTag;
 
       NodeMapBase(const Graph& _g) 
-        : graph(&_g), lowerMap(_g), upperMap(_g) {
+        : graph(&_g), bNodeMap(_g), aNodeMap(_g) {
         Parent::NodeNotifier::ObserverBase::attach(_g.getNotifier(Node()));
       }
       NodeMapBase(const Graph& _g, const _Value& _v) 
-        : graph(&_g), lowerMap(_g, _v), 
-          upperMap(_g, _v) {
+        : graph(&_g), bNodeMap(_g, _v), 
+          aNodeMap(_g, _v) {
         Parent::NodeNotifier::ObserverBase::attach(_g.getNotifier(Node()));
       }
@@ -480 +480 @@
     
       ConstReference operator[](const Key& node) const {
-        if (Parent::upper(node)) {
-          return upperMap[node];
+        if (Parent::aNode(node)) {
+          return aNodeMap[node];
         } else {
-          return lowerMap[node];
+          return bNodeMap[node];
         }
       } 
 
       Reference operator[](const Key& node) {
-        if (Parent::upper(node)) {
-          return upperMap[node];
+        if (Parent::aNode(node)) {
+          return aNodeMap[node];
         } else {
-          return lowerMap[node];
+          return bNodeMap[node];
         }
       }
 
       void set(const Key& node, const Value& value) {
-        if (Parent::upper(node)) {
-          upperMap.set(node, value);
+        if (Parent::aNode(node)) {
+          aNodeMap.set(node, value);
         } else {
-          lowerMap.set(node, value);
+          bNodeMap.set(node, value);
         }
       }
@@ -514 +514 @@
     private:
       const Graph* graph;
-      LowerNodeMap<_Value> lowerMap;
-      UpperNodeMap<_Value> upperMap;
+      BNodeMap<_Value> bNodeMap;
+      ANodeMap<_Value> aNodeMap;
     };
     
@@ -524 +524 @@
       : public IterableMapExtender<NodeMapBase<_Value> > {
     public:
-      typedef MappableUBipartiteGraphExtender Graph;
+      typedef MappableBpUGraphExtender Graph;
       typedef IterableMapExtender< NodeMapBase<_Value> > Parent;
     
@@ -562 +562 @@
       : public IterableMapExtender<DefaultMap<Graph, Edge, _Value> > {
     public:
-      typedef MappableUBipartiteGraphExtender Graph;
+      typedef MappableBpUGraphExtender Graph;
       typedef IterableMapExtender<DefaultMap<Graph, Edge, _Value> > Parent;
     
@@ -590 +590 @@
       : public IterableMapExtender<DefaultMap<Graph, UEdge, _Value> > {
     public:
-      typedef MappableUBipartiteGraphExtender Graph;
+      typedef MappableBpUGraphExtender Graph;
       typedef IterableMapExtender<DefaultMap<Graph, UEdge, _Value> > 
       Parent;