Changeset 2076:10681ee9d8ae in lemon-0.x for lemon/smart_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/smart_graph.h (modified) (11 diffs)

lemon/smart_graph.h

@@ -120 +120 @@
     static int id(Edge e) { return e.n; }
 
+    /// \brief Returns the node from its \c id.
+    ///
+    /// Returns the node from its \c id. If there is not node
+    /// with the given id the effect of the function is undefinied.
     static Node nodeFromId(int id) { return Node(id);}
 
+    /// \brief Returns the edge from its \c id.
+    ///
+    /// Returns the edge from its \c id. If there is not edge
+    /// with the given id the effect of the function is undefinied.
     static Edge edgeFromId(int id) { return Edge(id);}
 
@@ -351 +359 @@
   /**************** Undirected List Graph ****************/
 
-  typedef UGraphExtender<UGraphBaseExtender<SmartGraphBase> >
+  typedef UGraphExtender<UndirGraphExtender<SmartGraphBase> >
   ExtendedSmartUGraphBase;
 
@@ -389 +397 @@
     };
 
-    struct EdgeT {
+    struct UEdgeT {
       int aNode, next_out;
       int bNode, next_in;
@@ -397 +405 @@
     std::vector<NodeT> bNodes;
 
-    std::vector<EdgeT> edges;
+    std::vector<UEdgeT> edges;
 
   public:
@@ -415 +423 @@
     };
 
-    class Edge {
+    class UEdge {
       friend class SmartBpUGraphBase;
     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;}
     };
 
@@ -459 +467 @@
     }
   
-    void first(Edge& edge) const {
+    void first(UEdge& edge) const {
       edge.id = edges.size() - 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 = aNodes[node.id >> 1].first;
     }
-    void nextOut(Edge& edge) const {
+    void nextFromANode(UEdge& edge) const {
       edge.id = edges[edge.id].next_out;
     }
 
-    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 = bNodes[node.id >> 1].first;
     }
-    void nextIn(Edge& edge) const {
+    void nextFromBNode(UEdge& edge) const {
       edge.id = edges[edge.id].next_in;
     }
@@ -493 +501 @@
     }
   
-    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 edges.size();
     }
@@ -523 +531 @@
     }
 
-    Node aNode(const Edge& edge) const {
+    Node aNode(const UEdge& edge) const {
       return Node(edges[edge.id].aNode);
     }
-    Node bNode(const Edge& edge) const {
+    Node bNode(const UEdge& edge) const {
       return Node(edges[edge.id].bNode);
     }
@@ -552 +560 @@
     }
 
-    Edge addEdge(const Node& source, const Node& target) {
+    UEdge addEdge(const Node& source, const Node& target) {
       LEMON_ASSERT(((source.id ^ target.id) & 1) == 1, NodeSetError());
-      EdgeT edgeT;
+      UEdgeT edgeT;
       if ((source.id & 1) == 0) {
         edgeT.aNode = source.id;
@@ -567 +575 @@
       bNodes[edgeT.bNode >> 1].first = edges.size();
       edges.push_back(edgeT);
-      return Edge(edges.size() - 1);
+      return UEdge(edges.size() - 1);
     }
 
@@ -582 +590 @@
 
     typedef True EdgeNumTag;
-    int edgeNum() const { return edges.size(); }
+    int uEdgeNum() const { return edges.size(); }
 
   };
 
 
-  typedef BpUGraphExtender< BpUGraphBaseExtender<
-    SmartBpUGraphBase> > ExtendedSmartBpUGraphBase;
+  typedef BpUGraphExtender<SmartBpUGraphBase> ExtendedSmartBpUGraphBase;
 
   /// \ingroup graphs