Changeset 977:48962802d168 in lemon-0.x for src/lemon/graph_utils.h

Timestamp:

11/10/04 21:14:32 (19 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

• enable_if imported from BOOST
• count{Nodes,Edges} implemented via graph tags
• some #include bugs fixed

File:

• src/lemon/graph_utils.h (modified) (6 diffs)

src/lemon/graph_utils.h

@@ -21 +21 @@
 
 #include <lemon/invalid.h>
+#include <lemon/utility.h>
 
 ///\ingroup gutils
@@ -36 +37 @@
 /// @{
 
-  // counters in the graph
   /// \brief Function to count the items in the graph.
   ///
@@ -44 +44 @@
 
   template <typename Graph, typename ItemIt>
-  inline int countItems(const Graph& _g) {
+  inline int countItems(const Graph& g) {
     int num = 0;
-    for (ItemIt it(_g); it != INVALID; ++it) {
+    for (ItemIt it(g); it != INVALID; ++it) {
       ++num;
     }
     return num;
+  }
+
+  // Node counting:
+
+  template <typename Graph>
+  inline
+  typename enable_if<typename Graph::NodeNumTag, int>::type
+  _countNodes(const Graph &g) {
+    return g.nodeNum();
+  }
+
+  template <typename Graph>
+  inline int _countNodes(Wrap<Graph> w) {
+    return countItems<Graph, typename Graph::NodeIt>(w.value);
   }
 
@@ -57 +71 @@
   /// The complexity of the function is O(n) but for some
   /// graph structure it is specialized to run in O(1).
-
-  template <typename Graph>
-  inline int countNodes(const Graph& _g) {
-    return countItems<Graph, typename Graph::NodeIt>(_g);
+  ///
+  /// \todo refer how to specialize it
+
+  template <typename Graph>
+  inline int countNodes(const Graph& g) {
+    return _countNodes<Graph>(g);
+  }
+
+  // Edge counting:
+
+  template <typename Graph>
+  inline
+  typename enable_if<typename Graph::EdgeNumTag, int>::type
+  _countEdges(const Graph &g) {
+    return g.edgeNum();
+  }
+
+  template <typename Graph>
+  inline int _countEdges(Wrap<Graph> w) {
+    return countItems<Graph, typename Graph::EdgeIt>(w.value);
   }
 
@@ -68 +98 @@
   /// The complexity of the function is O(e) but for some
   /// graph structure it is specialized to run in O(1).
-  template <typename Graph>
-  inline int countEdges(const Graph& _g) {
-    return countItems<Graph, typename Graph::EdgeIt>(_g);
+
+  template <typename Graph>
+  inline int countEdges(const Graph& g) {
+    return _countEdges<Graph>(g);
   }
 
@@ -82 +113 @@
     return countItems<Graph, typename Graph::SymEdgeIt>(_g);
   }
+
 
   template <typename Graph, typename DegIt>