Changeset 2031:080d51024ac5 in lemon-0.x for lemon/graph_utils.h

Timestamp:

04/03/06 11:45:23 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Correcting the structure of the graph's and adaptor's map.
The template assign operators and map iterators can be used for adaptors also.

Some bugfix in the adaptors

New class SwapBpUGraphAdaptor which swaps the two nodeset of the graph.

File:

• lemon/graph_utils.h (modified) (7 diffs)

lemon/graph_utils.h

@@ -49 +49 @@
   ///This \c \#define creates convenience typedefs for the following types
   ///of \c Graph: \c Node,  \c NodeIt, \c Edge, \c EdgeIt, \c InEdgeIt,
-  ///\c OutEdgeIt,  \c BoolNodeMap,  \c IntNodeMap,  \c DoubleNodeMap,
-  ///\c BoolEdgeMap, \c IntEdgeMap,  \c DoubleEdgeMap.  
+  ///\c OutEdgeIt
   ///\note If \c G it a template parameter, it should be used in this way.
   ///\code
@@ -65 +64 @@
     typedef Graph:: InEdgeIt  InEdgeIt;                 \
     typedef Graph::OutEdgeIt OutEdgeIt;                 
-//     typedef Graph::template NodeMap<bool> BoolNodeMap;              
-//     typedef Graph::template NodeMap<int> IntNodeMap;        
-//     typedef Graph::template NodeMap<double> DoubleNodeMap;  
-//     typedef Graph::template EdgeMap<bool> BoolEdgeMap;              
-//     typedef Graph::template EdgeMap<int> IntEdgeMap;        
-//     typedef Graph::template EdgeMap<double> DoubleEdgeMap;
-  
+
   ///Creates convenience typedefs for the undirected graph types and iterators
 
@@ -77 +70 @@
   ///\ref GRAPH_TYPEDEFS(Graph) and three more, namely it creates
   ///\c UEdge, \c UEdgeIt, \c IncEdgeIt,
-  ///\c BoolUEdgeMap, \c IntUEdgeMap,  \c DoubleUEdgeMap.  
   ///
   ///\note If \c G it a template parameter, it should be used in this way.
@@ -94 +86 @@
 //     typedef Graph::template UEdgeMap<int> IntUEdgeMap;
 //     typedef Graph::template UEdgeMap<double> DoubleUEdgeMap;
-  
-
+
+  ///\brief Creates convenience typedefs for the bipartite undirected graph 
+  ///types and iterators
+
+  ///This \c \#define creates the same convenience typedefs as defined by
+  ///\ref UGRAPH_TYPEDEFS(Graph) and two more, namely it creates
+  ///\c ANodeIt, \c BNodeIt, 
+  ///
+  ///\note If \c G it a template parameter, it should be used in this way.
+  ///\code
+  ///  BPUGRAPH_TYPEDEFS(typename G)
+  ///\endcode
+  ///
+  ///\warning There are no typedefs for the graph maps because of the lack of
+  ///template typedefs in C++.
+#define BPUGRAPH_TYPEDEFS(Graph)            \
+  UGRAPH_TYPEDEFS(Graph)                    \
+    typedef Graph::ANodeIt ANodeIt;         \
+    typedef Graph::BNodeIt BNodeIt;
 
   /// \brief Function to count the items in the graph.
@@ -431 +440 @@
         if (u != v) {
           if (e == INVALID) {
-            g.firstInc(e, u, b);
+            g.firstInc(e, b, u);
           } else {
             b = g.source(e) == u;
@@ -441 +450 @@
         } else {
           if (e == INVALID) {
-            g.firstInc(e, u, b);
+            g.firstInc(e, b, u);
           } else {
             b = true;
@@ -486 +495 @@
   ///\endcode
   template <typename Graph>
-  inline typename Graph::UEdge findEdge(const Graph &g,
-                                        typename Graph::Node u, 
-                                        typename Graph::Node v,
-                                        typename Graph::UEdge prev = INVALID) {
-    return _graph_utils_bits::FindUEdgeSelector<Graph>::find(g, u, v, prev);
+  inline typename Graph::UEdge findUEdge(const Graph &g,
+                                         typename Graph::Node u, 
+                                         typename Graph::Node v,
+                                         typename Graph::UEdge p = INVALID) {
+    return _graph_utils_bits::FindUEdgeSelector<Graph>::find(g, u, v, p);
   }