Changeset 654:8fd893331298 in lemon-0.x

Timestamp:

05/21/04 12:18:30 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

The new for macros are: h_for, h_for_inc, h_for_glob, h_for_inc_glob.

Location:

src

Files:

• hugo/for_each_macros.h (modified) (7 diffs)
• work/marci/makefile (modified) (1 diff)

src/hugo/for_each_macros.h

@@ -20 +20 @@
   /// ...
   /// Graph::NodeIt n;
-  /// FOR_EACH_GLOB(n, g) {
+  /// h_for_glob(n, g) {
   /// ...
   /// }
   /// Graph::EdgeIt e;
-  /// FOR_EACH_GLOB(e, g) {
+  /// h_for_glob(e, g) {
   /// ...
   /// }
   /// \endcode
   /// Note that the iterated variables \c n and \c e are global ones. 
+#define h_for_glob(e, g) for((g).first((e)); (g).valid((e)); (g).next((e)))
+
+/// \deprecated
 #define FOR_EACH_GLOB(e, g) for((g).first((e)); (g).valid((e)); (g).next((e)))
 
@@ -38 +41 @@
   /// Graph::Node v;
   /// Graph::OutEdgeIt e;
-  /// FOR_EACH_INC_GLOB(e, g, v) {
+  /// h_for_inc_glob(e, g, v) {
   /// ...
   /// }
@@ -45 +48 @@
   /// ...
   /// BGraph::ClassNodeIt n;
-  /// FOR_EACH_INC_GLOB(BGraph::ClassNodeIt, n, h, h.S_CLASS) {
+  /// h_for_inc_glob(BGraph::ClassNodeIt, n, h, h.S_CLASS) {
   /// ...
   /// }
   /// \endcode
   /// Note that iterated variables \c e and \c n are global ones. 
+#define h_for_inc_glob(e, g, v) for((g).first((e), (v)); (g).valid((e)); (g).next((e)))
+
+/// \deprecated
 #define FOR_EACH_INC_GLOB(e, g, v) for((g).first((e), (v)); (g).valid((e)); (g).next((e)))
   
@@ -125 +131 @@
   /// Graph g;
   /// ...
-  /// FOR_EACH_LOC(Graph::NodeIt, n, g) {
+  /// h_for(Graph::NodeIt, n, g) {
   /// ...
   /// }
-  /// FOR_EACH_LOC(Graph::EdgeIt, e, g) {
+  /// h_for(Graph::EdgeIt, e, g) {
   /// ...
   /// }
   /// \endcode
   /// Note that the iterated variables \c n and \c e are local ones. 
+#define h_for(Ittype, e, g) for(Ittype e=loopFirst(Ittype(), (g)); (g).valid(e); (g).next(e))
+  
+/// \deprecated
 #define FOR_EACH_LOC(Ittype, e, g) for(Ittype e=loopFirst(Ittype(), (g)); (g).valid(e); (g).next(e))
-  
+
   /// This macro provides a comfortable interface for iterating with HUGO 
   /// iterators.
@@ -141 +150 @@
   /// ...
   /// Graph::Node v;
-  /// FOR_EACH_INC_LOC(Graph::OutEdgeIt, e, g, v) {
+  /// h_for_inc(Graph::OutEdgeIt, e, g, v) {
   /// ...
   /// }
@@ -147 +156 @@
   /// BGraph h;
   /// ...
-  /// FOR_EACH_INC_LOC(BGraph::ClassNodeIt, n, h, h.S_CLASS) {
+  /// h_for_inc(BGraph::ClassNodeIt, n, h, h.S_CLASS) {
   /// ...
   /// }
   /// \endcode
   /// Note that the iterated variables \c e and \c n are local ones. 
+#define h_for_inc(Ittype, e, g, v) for(Ittype e=loopFirst(Ittype(), (g), (v)); (g).valid(e); (g).next(e))
+  
+/// \deprecated
 #define FOR_EACH_INC_LOC(Ittype, e, g, v) for(Ittype e=loopFirst(Ittype(), (g), (v)); (g).valid(e); (g).next(e))
   
@@ -159 +171 @@
 // #define FOR_EACH_OUTEDGE_LOC(e, g, v) for((g).first((e), (v)); (g).valid((e)); (g).next((e)))
 
-
 } //namespace hugo
 

src/work/marci/makefile

@@ -5 +5 @@
 
 LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo
-BINARIES = proba6 max_flow_demo iterator_bfs_demo macro_test lg_vs_sg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try bipartite_matching_try_3 top_sort_test max_flow_1
+BINARIES = max_flow_demo iterator_bfs_demo macro_test lg_vs_sg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try bipartite_matching_try_3 top_sort_test max_flow_1
 #gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda