Changeset 1910:f95eea8c34b0 in lemon-0.x for lemon/full_graph.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/full_graph.h (modified) (9 diffs)

lemon/full_graph.h

@@ -404 +404 @@
 
 
-  class FullUBipartiteGraphBase {
+  class FullBpUGraphBase {
   protected:
 
-    int _upperNodeNum;
-    int _lowerNodeNum;
+    int _aNodeNum;
+    int _bNodeNum;
 
     int _edgeNum;
@@ -416 +416 @@
     class NodeSetError : public LogicError {
       virtual const char* exceptionName() const { 
-        return "lemon::FullUBipartiteGraph::NodeSetError";
+        return "lemon::FullBpUGraph::NodeSetError";
       }
     };
   
     class Node {
-      friend class FullUBipartiteGraphBase;
+      friend class FullBpUGraphBase;
     protected:
       int id;
@@ -435 +435 @@
 
     class Edge {
-      friend class FullUBipartiteGraphBase;
+      friend class FullBpUGraphBase;
     protected:
       int id;
@@ -448 +448 @@
     };
 
-    void construct(int upperNodeNum, int lowerNodeNum) {
-      _upperNodeNum = upperNodeNum;
-      _lowerNodeNum = lowerNodeNum;
-      _edgeNum = upperNodeNum * lowerNodeNum;
-    }
-
-    void firstUpper(Node& node) const {
-      node.id = 2 * _upperNodeNum - 2;
+    void construct(int aNodeNum, int bNodeNum) {
+      _aNodeNum = aNodeNum;
+      _bNodeNum = bNodeNum;
+      _edgeNum = aNodeNum * bNodeNum;
+    }
+
+    void firstANode(Node& node) const {
+      node.id = 2 * _aNodeNum - 2;
       if (node.id < 0) node.id = -1; 
     }
-    void nextUpper(Node& node) const {
+    void nextANode(Node& node) const {
       node.id -= 2;
       if (node.id < 0) node.id = -1; 
     }
 
-    void firstLower(Node& node) const {
-      node.id = 2 * _lowerNodeNum - 1;
-    }
-    void nextLower(Node& node) const {
+    void firstBNode(Node& node) const {
+      node.id = 2 * _bNodeNum - 1;
+    }
+    void nextBNode(Node& node) const {
       node.id -= 2;
     }
 
     void first(Node& node) const {
-      if (_upperNodeNum > 0) {
-        node.id = 2 * _upperNodeNum - 2;
+      if (_aNodeNum > 0) {
+        node.id = 2 * _aNodeNum - 2;
       } else {
-        node.id = 2 * _lowerNodeNum - 1;
+        node.id = 2 * _bNodeNum - 1;
       }
     }
@@ -480 +480 @@
       node.id -= 2;
       if (node.id == -2) {
-        node.id = 2 * _lowerNodeNum - 1;
+        node.id = 2 * _bNodeNum - 1;
       }
     }
@@ -491 +491 @@
     }
 
-    void firstDown(Edge& edge, const Node& node) const {
+    void firstOut(Edge& edge, const Node& node) const {
       LEMON_ASSERT((node.id & 1) == 0, NodeSetError());
-      edge.id = (node.id >> 1) * _lowerNodeNum;
-    }
-    void nextDown(Edge& edge) const {
+      edge.id = (node.id >> 1) * _bNodeNum;
+    }
+    void nextOut(Edge& edge) const {
       ++(edge.id);
-      if (edge.id % _lowerNodeNum == 0) edge.id = -1;
-    }
-
-    void firstUp(Edge& edge, const Node& node) const {
+      if (edge.id % _bNodeNum == 0) edge.id = -1;
+    }
+
+    void firstIn(Edge& edge, const Node& node) const {
       LEMON_ASSERT((node.id & 1) == 1, NodeSetError());
       edge.id = (node.id >> 1);
     }
-    void nextUp(Edge& edge) const {
-      edge.id += _lowerNodeNum;
+    void nextIn(Edge& edge) const {
+      edge.id += _bNodeNum;
       if (edge.id >= _edgeNum) edge.id = -1;
     }
@@ -516 +516 @@
     }
     int maxNodeId() const {
-      return _upperNodeNum > _lowerNodeNum ? 
-        _upperNodeNum * 2 - 2 : _lowerNodeNum * 2 - 1;
+      return _aNodeNum > _bNodeNum ? 
+        _aNodeNum * 2 - 2 : _bNodeNum * 2 - 1;
     }
   
@@ -530 +530 @@
     }
   
-    static int upperId(const Node& node) {
+    static int aNodeId(const Node& node) {
       return node.id >> 1;
     }
-    static Node fromUpperId(int id, Node) {
+    static Node fromANodeId(int id, Node) {
       return Node(id << 1);
     }
-    int maxUpperId() const {
-      return _upperNodeNum;
-    }
-
-    static int lowerId(const Node& node) {
+    int maxANodeId() const {
+      return _aNodeNum;
+    }
+
+    static int bNodeId(const Node& node) {
       return node.id >> 1;
     }
-    static Node fromLowerId(int id) {
+    static Node fromBNodeId(int id) {
       return Node((id << 1) + 1);
     }
-    int maxLowerId() const {
-      return _lowerNodeNum;
-    }
-
-    Node upperNode(const Edge& edge) const {
-      return Node((edge.id / _lowerNodeNum) << 1);
-    }
-    Node lowerNode(const Edge& edge) const {
-      return Node(((edge.id % _lowerNodeNum) << 1) + 1);
-    }
-
-    static bool upper(const Node& node) {
+    int maxBNodeId() const {
+      return _bNodeNum;
+    }
+
+    Node aNode(const Edge& edge) const {
+      return Node((edge.id / _bNodeNum) << 1);
+    }
+    Node bNode(const Edge& edge) const {
+      return Node(((edge.id % _bNodeNum) << 1) + 1);
+    }
+
+    static bool aNode(const Node& node) {
       return (node.id & 1) == 0;
     }
 
-    static bool lower(const Node& node) {
+    static bool bNode(const Node& node) {
       return (node.id & 1) == 1;
     }
 
-    static Node upperNode(int index) {
+    static Node aNode(int index) {
       return Node(index << 1);
     }
 
-    static Node lowerNode(int index) {
+    static Node bNode(int index) {
       return Node((index << 1) + 1);
     }
@@ -576 +576 @@
 
 
-  typedef StaticMappableUBipartiteGraphExtender<
-    IterableUBipartiteGraphExtender<
-    AlterableUBipartiteGraphExtender<
-    UBipartiteGraphExtender <
-    FullUBipartiteGraphBase> > > >
-  ExtendedFullUBipartiteGraphBase;
-
-
-  class FullUBipartiteGraph : 
-    public ExtendedFullUBipartiteGraphBase {
-  public:
-    typedef ExtendedFullUBipartiteGraphBase Parent;
-    FullUBipartiteGraph(int upperNodeNum, int lowerNodeNum) {
-      Parent::construct(upperNodeNum, lowerNodeNum);
+  typedef StaticMappableBpUGraphExtender<
+    IterableBpUGraphExtender<
+    AlterableBpUGraphExtender<
+    BpUGraphExtender <
+    FullBpUGraphBase> > > >
+  ExtendedFullBpUGraphBase;
+
+
+  /// \ingroup graphs
+  ///
+  /// \brief An undirected full bipartite graph class.
+  ///
+  /// This is a simple and fast bipartite undirected full graph implementation.
+  /// It is completely static, so you can neither add nor delete either
+  /// edges or nodes.
+  ///
+  /// \sa FullGraph
+  ///
+  /// \author Balazs Dezso
+  class FullBpUGraph : 
+    public ExtendedFullBpUGraphBase {
+  public:
+    typedef ExtendedFullBpUGraphBase Parent;
+    FullBpUGraph(int aNodeNum, int bNodeNum) {
+      Parent::construct(aNodeNum, bNodeNum);
     }
   };