Changeset 2076:10681ee9d8ae in lemon-0.x for lemon/full_graph.h

Timestamp:

05/12/06 11:51:45 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Extenders modified

UGraphBaseExtender => UndirGraphExtender?
BpUGraphBaseExtender merged into BpUGraphExtender

File:

• lemon/full_graph.h (modified) (6 diffs)

lemon/full_graph.h

@@ -442 +442 @@
   };
 
-  typedef UGraphExtender<UGraphBaseExtender<FullUGraphBase> > 
+  typedef UGraphExtender<UndirGraphExtender<FullUGraphBase> > 
   ExtendedFullUGraphBase;
 
@@ -519 +519 @@
     };
 
-    class Edge {
+    class UEdge {
       friend class FullBpUGraphBase;
     protected:
       int id;
 
-      Edge(int _id) { id = _id;}
+      UEdge(int _id) { id = _id;}
     public:
-      Edge() {}
-      Edge (Invalid) { id = -1; }
-      bool operator==(const Edge i) const {return id==i.id;}
-      bool operator!=(const Edge i) const {return id!=i.id;}
-      bool operator<(const Edge i) const {return id<i.id;}
+      UEdge() {}
+      UEdge (Invalid) { id = -1; }
+      bool operator==(const UEdge i) const {return id==i.id;}
+      bool operator!=(const UEdge i) const {return id!=i.id;}
+      bool operator<(const UEdge i) const {return id<i.id;}
     };
 
@@ -569 +569 @@
     }
   
-    void first(Edge& edge) const {
+    void first(UEdge& edge) const {
       edge.id = _edgeNum - 1;
     }
-    void next(Edge& edge) const {
+    void next(UEdge& edge) const {
       --edge.id;
     }
 
-    void firstOut(Edge& edge, const Node& node) const {
+    void firstFromANode(UEdge& edge, const Node& node) const {
       LEMON_ASSERT((node.id & 1) == 0, NodeSetError());
       edge.id = (node.id >> 1) * _bNodeNum;
     }
-    void nextOut(Edge& edge) const {
+    void nextFromANode(UEdge& edge) const {
       ++(edge.id);
       if (edge.id % _bNodeNum == 0) edge.id = -1;
     }
 
-    void firstIn(Edge& edge, const Node& node) const {
+    void firstFromBNode(UEdge& edge, const Node& node) const {
       LEMON_ASSERT((node.id & 1) == 1, NodeSetError());
       edge.id = (node.id >> 1);
     }
-    void nextIn(Edge& edge) const {
+    void nextFromBNode(UEdge& edge) const {
       edge.id += _bNodeNum;
       if (edge.id >= _edgeNum) edge.id = -1;
@@ -605 +605 @@
     }
   
-    static int id(const Edge& edge) {
+    static int id(const UEdge& edge) {
       return edge.id;
     }
-    static Edge edgeFromId(int id) {
-      return Edge(id);
-    }
-    int maxEdgeId() const {
+    static UEdge uEdgeFromId(int id) {
+      return UEdge(id);
+    }
+    int maxUEdgeId() const {
       return _edgeNum - 1;
     }
@@ -635 +635 @@
     }
 
-    Node aNode(const Edge& edge) const {
+    Node aNode(const UEdge& edge) const {
       return Node((edge.id / _bNodeNum) << 1);
     }
-    Node bNode(const Edge& edge) const {
+    Node bNode(const UEdge& edge) const {
       return Node(((edge.id % _bNodeNum) << 1) + 1);
     }
@@ -664 +664 @@
 
     typedef True EdgeNumTag;
-    int edgeNum() const { return _edgeNum; }
+    int uEdgeNum() const { return _edgeNum; }
 
   };
 
 
-  typedef BpUGraphExtender< BpUGraphBaseExtender<
-    FullBpUGraphBase> > ExtendedFullBpUGraphBase;
+  typedef BpUGraphExtender<FullBpUGraphBase> ExtendedFullBpUGraphBase;