Changeset 1756:b1f441f24d08 in lemon-0.x

Timestamp:

11/02/05 17:32:29 (18 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

GRAPH_TYPEDEFS and UNDIRGRAPH_TYPEDEFS macros added to graph_utils.h.

Files:

• benchmark/bench_tools.h (modified) (3 diffs)
• benchmark/bfs-bench.cc (modified) (4 diffs)
• benchmark/graph-bench.cc (modified) (1 diff)
• benchmark/hcube.cc (modified) (1 diff)
• lemon/graph_utils.h (modified) (1 diff)

benchmark/bench_tools.h

@@ -6 +6 @@
 #include<iostream>
 
+#include<lemon/graph_utils.h>
 #include<lemon/time_measure.h>
-
-///An experimental typedef factory
-#define GRAPH_TYPEDEF_FACTORY(Graph) \
-   typedef typename Graph::   Node      Node;\
-   typedef typename Graph::   NodeIt    NodeIt;\
-   typedef typename Graph::   Edge      Edge;\
-   typedef typename Graph::   EdgeIt    EdgeIt;\
-   typedef typename Graph:: InEdgeIt  InEdgeIt;\
-   typedef typename Graph::OutEdgeIt OutEdgeIt;
-
-#define GRAPH_TYPEDEF_FACTORY_NOTYPENAME(Graph) \
-   typedef Graph::   Node      Node;\
-   typedef Graph::   NodeIt    NodeIt;\
-   typedef Graph::   Edge      Edge;\
-   typedef Graph::   EdgeIt    EdgeIt;\
-   typedef Graph:: InEdgeIt  InEdgeIt;\
-   typedef Graph::OutEdgeIt OutEdgeIt;
- 
 
 ///A primitive primtest
@@ -94 +77 @@
 void addHyperCube(Graph &G,int dim,std::vector<typename Graph::Node> &nodes)
 {
-  GRAPH_TYPEDEF_FACTORY(Graph);
+  GRAPH_TYPEDEFS(typename Graph);
   
   std::vector<int> bits(dim+1);
@@ -110 +93 @@
 void addBiDirHyperCube(Graph &G,int dim,std::vector<typename Graph::Node>&nodes)
 {
-  GRAPH_TYPEDEF_FACTORY(Graph);
+  GRAPH_TYPEDEFS(typename Graph);
   
   std::vector<int> bits(dim+1);

benchmark/bfs-bench.cc

@@ -32 +32 @@
 void bfsStlQueue(Graph &G,typename Graph::Node source)
 {
-  GRAPH_TYPEDEF_FACTORY(Graph);
+  GRAPH_TYPEDEFS(typename Graph);
 
   using namespace std;
@@ -57 +57 @@
 void bfsOwnQueue(Graph &G,typename Graph::Node source)
 {
-  GRAPH_TYPEDEF_FACTORY(Graph);
+  GRAPH_TYPEDEFS(typename Graph);
 
   using namespace std;
@@ -85 +85 @@
 void iteratorBench(Graph &G)
 {
-  GRAPH_TYPEDEF_FACTORY(Graph);
+  GRAPH_TYPEDEFS(typename Graph);
 
   int i=0;
@@ -98 +98 @@
   typedef SmartGraph Graph;
 
-  ///\bug GRAPH_TYPEDEF_FACTORY(Graph);
-  GRAPH_TYPEDEF_FACTORY_NOTYPENAME(Graph);
+  GRAPH_TYPEDEFS(Graph);
 
   Graph G;

benchmark/graph-bench.cc

@@ -15 +15 @@
 void makeFullGraph(int n, int rat, int p)
 {
-  GRAPH_TYPEDEF_FACTORY(Graph);
+  GRAPH_TYPEDEFS(typename Graph);
 
   Graph G;

benchmark/hcube.cc

@@ -37 +37 @@
   typedef SmartGraph Graph;
 
-  ///\bug GRAPH_TYPEDEF_FACTORY(Graph);
-  GRAPH_TYPEDEF_FACTORY_NOTYPENAME(Graph);
+  GRAPH_TYPEDEFS(Graph);
 
   Graph G;

lemon/graph_utils.h

@@ -41 +41 @@
   /// @{
 
+  ///Creates convenience typedefs for the graph types and iterators
+
+  ///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.
+  ///\note If \c G it a template parameter, it should be used in this way.
+  ///\code
+  ///  GRAPH_TYPEDEFS(typename G)
+  ///\endcode
+  ///
+  ///\warning There are no typedefs for the graph maps because of the lack of
+  ///template typedefs in C++.
+#define GRAPH_TYPEDEFS(Graph)                   \
+  typedef Graph::     Node      Node;           \
+    typedef Graph::   NodeIt    NodeIt;         \
+    typedef Graph::   Edge      Edge;           \
+    typedef Graph::   EdgeIt    EdgeIt;         \
+    typedef Graph:: InEdgeIt  InEdgeIt;         \
+    typedef Graph::OutEdgeIt OutEdgeIt;
+  
+  ///Creates convenience typedefs for the undirected graph types and iterators
+
+  ///This \c \#define creates the same convenience typedefs as defined by
+  ///\ref GRAPH_TYPEDEFS(Graph) and three more, namely it creates
+  ///\c UndirEdge, \c UndirEdgeIt, \c IncEdgeIt,
+  ///
+  ///\note If \c G it a template parameter, it should be used in this way.
+  ///\code
+  ///  UNDIRGRAPH_TYPEDEFS(typename G)
+  ///\endcode
+  ///
+  ///\warning There are no typedefs for the graph maps because of the lack of
+  ///template typedefs in C++.
+#define UNDIRGRAPH_TYPEDEFS(Graph)                      \
+  GRAPH_TYPEDEFS(Graph)                                 \
+    typedef Graph:: UndirEdge   UndirEdge;              \
+    typedef Graph:: UndirEdgeIt UndirEdgeIt;            \
+    typedef Graph:: IncEdgeIt   IncEdgeIt;
+
+
   /// \brief Function to count the items in the graph.
   ///