Changeset 1158:29961fa390a3 in lemon-0.x for src/lemon/concept

Timestamp:

02/20/05 02:02:07 (19 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

Graph and UndirGraph? concept modifications.

• For incidence iterators ({In,Out,Inc}EdgeIt?) there is now baseNode and runningNode functions in graph interface
• For Edge in undir graphs: Edge(UndirGraph? const &, UndirEdge?, Node) constructor. Same for IncEdgeIt?
• Edge(UndirEdge?, bool) constructor is no more in the public interface. (But we need it in the developpers interface).

Location:

src/lemon/concept

Files:

• graph_component.h (modified) (1 diff)
• undir_graph.h (modified) (6 diffs)

src/lemon/concept/graph_component.h

@@ -626 +626 @@
           Edge e = it1;
           e = it2;
-        }
-
-        Edge& edge;
-        Node& node;
-        Graph& graph;
+
+          const_constraits();
+        }
+
+        void const_constraits() {
+          Node n = graph.baseNode(it);
+          n = graph.runningNode(it);
+        }
+
+        Edge edge;
+        Node node;
+        Graph graph;
+        _GraphIncIterator it;
       };
     };

src/lemon/concept/undir_graph.h

@@ -37 +37 @@
     /// Skeleton class which describes an edge with direction in \ref
     /// UndirGraph "undirected graph".
-    template <typename UndirEdge>
-    class UndirGraphEdge : public UndirEdge {
+    template <typename UndirGraph>
+    class UndirGraphEdge : public UndirGraph::UndirEdge {
+      typedef typename UndirGraph::UndirEdge UndirEdge;
+      typedef typename UndirGraph::Node Node;
     public:
 
@@ -50 +52 @@
       UndirGraphEdge(Invalid) {}
 
-      /// \brief Constructs a directed version of an undirected edge
-      ///
-      /// \param forward If \c true the direction of the contructed edge
-      /// is the same as the inherent direction of the \c undir_edge; if
-      /// \c false --- the opposite.
-      UndirGraphEdge(UndirEdge undir_edge, bool forward) {
+      /// \brief Directed edge from undirected edge and a source node.
+      ///
+      /// Constructs a directed edge from undirected edge and a source node.
+      ///
+      /// \note You have to specify the graph for this constructor.
+      UndirGraphEdge(const UndirGraph &g,
+                     UndirEdge undir_edge, Node n) {
         ignore_unused_variable_warning(undir_edge);
-        ignore_unused_variable_warning(forward);
+        ignore_unused_variable_warning(g);
+        ignore_unused_variable_warning(n);
       }
 
@@ -74 +78 @@
       struct Constraints {
         void constraints() {
+          const_constraints();
+        }
+        void const_constraints() const {
           /// \bug This should be is_base_and_derived ...
           UndirEdge ue = e;
           ue = e;
-          Edge forward(ue, true);
-          Edge backward(ue, false);
-
-          ignore_unused_variable_warning(forward);
-          ignore_unused_variable_warning(backward);
+
+          Edge e_with_source(graph,ue,n);
+          ignore_unused_variable_warning(e_with_source);
         }
         Edge e;
+        UndirEdge ue;
+        UndirGraph graph;
+        Node n;
       };
     };
@@ -100 +108 @@
           checkConcept<BaseIterableGraphComponent, Graph>();
           checkConcept<GraphItem<>, UndirEdge>();
-          checkConcept<UndirGraphEdge<UndirEdge>, Edge>();
+          checkConcept<UndirGraphEdge<Graph>, Edge>();
 
           graph.first(ue);
@@ -235 +243 @@
       /// Type describing an UndirEdge with direction
 #ifndef DOXYGEN
-      typedef UndirGraphEdge<UndirEdge> Edge;
+      typedef UndirGraphEdge<UndirGraph> Edge;
 #else
       typedef UndirGraphEdge Edge;
@@ -431 +439 @@
 
 
+      /// Base node of the iterator
+      ///
+      /// Returns the base node (the source in this case) of the iterator
+      Node baseNode(OutEdgeIt e) const {
+        return source(e);
+      }
+      /// Running node of the iterator
+      ///
+      /// Returns the running node (the target in this case) of the
+      /// iterator
+      Node runningNode(OutEdgeIt e) const {
+        return target(e);
+      }
+
+      /// Base node of the iterator
+      ///
+      /// Returns the base node (the target in this case) of the iterator
+      Node baseNode(InEdgeIt e) const {
+        return target(e);
+      }
+      /// Running node of the iterator
+      ///
+      /// Returns the running node (the source in this case) of the
+      /// iterator
+      Node runningNode(InEdgeIt e) const {
+        return source(e);
+      }
+
+      /// Base node of the iterator
+      ///
+      /// Returns the base node of the iterator
+      Node baseNode(IncEdgeIt e) const {
+        return INVALID;
+      }
+      /// Running node of the iterator
+      ///
+      /// Returns the running node of the iterator
+      Node runningNode(IncEdgeIt e) const {
+        return INVALID;
+      }
+
+
       template <typename Graph>
       struct Constraints {