[Lemon-commits] [lemon_svn] deba: r1303 - hugo/branches/graph_factory/src/lemon

[Lemon SVN]

Author: deba
Date: Fri Oct 22 17:35:01 2004
New Revision: 1303

Modified:
   hugo/branches/graph_factory/src/lemon/bfs.h
   hugo/branches/graph_factory/src/lemon/dfs.h
   hugo/branches/graph_factory/src/lemon/full_graph.h
   hugo/branches/graph_factory/src/lemon/graph_utils.h
   hugo/branches/graph_factory/src/lemon/smart_graph.h

Log:
itemNum -> countItems change


Modified: hugo/branches/graph_factory/src/lemon/bfs.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/bfs.h	(original)
+++ hugo/branches/graph_factory/src/lemon/bfs.h	Fri Oct 22 17:35:01 2004
@@ -195,7 +195,7 @@
 	pred_node->set(u,INVALID);
       }
       
-      int N= nodeNum(*G);
+      int N = countNodes(*G);
       std::vector<typename Graph::Node> Q(N);
       int Qh=0;
       int Qt=0;

Modified: hugo/branches/graph_factory/src/lemon/dfs.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/dfs.h	(original)
+++ hugo/branches/graph_factory/src/lemon/dfs.h	Fri Oct 22 17:35:01 2004
@@ -193,7 +193,7 @@
 	pred_node->set(u,INVALID);
       }
       
-      int N = nodeNum(*G);
+      int N = countNodes(*G);
       std::vector<typename Graph::OutEdgeIt> Q(N);
 
       int Qh=0;

Modified: hugo/branches/graph_factory/src/lemon/full_graph.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/full_graph.h	(original)
+++ hugo/branches/graph_factory/src/lemon/full_graph.h	Fri Oct 22 17:35:01 2004
@@ -207,12 +207,12 @@
   };
 
   template <>
-  int nodeNum<FullGraph>(const FullGraph& graph) {
+  int countNodes<FullGraph>(const FullGraph& graph) {
     return graph.nodeNum();
   }
 
   template <>
-  int edgeNum<FullGraph>(const FullGraph& graph) {
+  int countEdges<FullGraph>(const FullGraph& graph) {
     return graph.edgeNum();
   }
 

Modified: hugo/branches/graph_factory/src/lemon/graph_utils.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/graph_utils.h	(original)
+++ hugo/branches/graph_factory/src/lemon/graph_utils.h	Fri Oct 22 17:35:01 2004
@@ -27,7 +27,7 @@
 namespace lemon {
 
   template <typename Graph, typename ItemIt>
-  inline int itemNum(const Graph& graph) {
+  inline int countItems(const Graph& graph) {
     int num = 0;
     for (ItemIt it(graph); it != INVALID; ++it) {
       ++num;
@@ -36,18 +36,18 @@
   }
 
   template <typename Graph>
-  inline int nodeNum(const Graph& graph) {
-    return itemNum<Graph, typename Graph::NodeIt>(graph);
+  inline int countNodes(const Graph& graph) {
+    return countItems<Graph, typename Graph::NodeIt>(graph);
   }
 
   template <typename Graph>
-  inline int edgeNum(const Graph& graph) {
-    return itemNum<Graph, typename Graph::EdgeIt>(graph);
+  inline int countEdges(const Graph& graph) {
+    return countItems<Graph, typename Graph::EdgeIt>(graph);
   }
 
   template <typename Graph>
-  inline int symEdgeNum(const Graph& graph) {
-    return itemNum<Graph, typename Graph::SymEdgeIt>(graph);
+  inline int countSymEdges(const Graph& graph) {
+    return countItems<Graph, typename Graph::SymEdgeIt>(graph);
   }
 
 }

Modified: hugo/branches/graph_factory/src/lemon/smart_graph.h
==============================================================================
--- hugo/branches/graph_factory/src/lemon/smart_graph.h	(original)
+++ hugo/branches/graph_factory/src/lemon/smart_graph.h	Fri Oct 22 17:35:01 2004
@@ -253,12 +253,12 @@
 
 
   template <>
-  int nodeNum<SmartGraph>(const SmartGraph& graph) {
+  int countNodes<SmartGraph>(const SmartGraph& graph) {
     return graph.nodeNum();
   }
 
   template <>
-  int edgeNum<SmartGraph>(const SmartGraph& graph) {
+  int countEdges<SmartGraph>(const SmartGraph& graph) {
     return graph.edgeNum();
   }