Changeset 776:f2994a2b10b2 in lemon-0.x

Timestamp:

08/31/04 15:40:07 (21 years ago)

Author:

Hegyi Péter

Branch:

default

Phase:

public

Convert:

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

Message:

minlengthpaths_test.cc is already hugo++ comform and is compilable

Location:

src

Files:

• hugo/bin_heap.h (modified) (1 diff)
• hugo/dijkstra.h (modified) (1 diff)
• hugo/mincostflows.h (modified) (3 diffs)
• hugo/minlengthpaths.h (modified) (2 diffs)
• test/dijkstra_heap_test.cc (modified) (4 diffs)
• test/dijkstra_test.cc (modified) (2 diffs)

src/hugo/bin_heap.h

@@ -34 +34 @@
  * Ehhez nagyon fontos, hogy az atadott property map inicializalva legyen
  * minden szobajovo kulcs ertekre, -1 -es ertekkel!
- * Es ilyen esetben a kulcsokrol lekerdezheto az allapotuk a state metodussal:
+ * Es ilyen esetben a kulcsokrol lekerdezheto az allapotuk a state
+ metodussal:
  * (nem jart meg a kupacban PRE_HEAP=-1, epp a kupacban van IN_HEAP=0,
  *  mar kikerult a kupacbol POST_HEAP=-2).

src/hugo/dijkstra.h

@@ -243 +243 @@
         for(OutEdgeIt e(*G,v); e!=INVALID; ++e) {
           Node w=G->head(e); 
-          
           switch(heap.state(w)) {
           case HeapType::PRE_HEAP:

src/hugo/mincostflows.h

@@ -117 +117 @@
       total_length = 0;
       
-      FOR_EACH_LOC(typename Graph::EdgeIt, e, G){
+      for(typename Graph::EdgeIt e=loopFirst(typename Graph::EdgeIt(), (G)); e!=INVALID; ++e){
         flow.set(e,0);
       }
 
       //Initialize the potential to zero
-      FOR_EACH_LOC(typename Graph::NodeIt, n, G){
+      for(typename Graph::NodeIt n=loopFirst(typename Graph::NodeIt(), (G)); n!=INVALID; ++n){
         potential.set(n,0);
       }
@@ -145 +145 @@
         
         //We have to change the potential
-        FOR_EACH_LOC(typename ResGraphType::NodeIt, n, res_graph){
+        //#define FOR_EACH_LOC(Ittype, e, g) for(Ittype e=loopFirst(Ittype(), (g)); (g).valid(e); (g).next(e))
+        //FOR_EACH_LOC(typename ResGraphType::NodeIt, n, res_graph){
+        for(typename ResGraphType::NodeIt n=loopFirst(typename ResGraphType::NodeIt(), (res_graph)); n!=INVALID; ++n){
           potential[n] += dijkstra.distMap()[n];
         }
@@ -196 +198 @@
       Length mod_pot;
       Length fl_e;
-      FOR_EACH_LOC(typename Graph::EdgeIt, e, G){
+        //#define FOR_EACH_LOC(Ittype, e, g) for(Ittype e=loopFirst(Ittype(), (g)); (g).valid(e); (g).next(e))
+        //FOR_EACH_LOC(typename Graph::EdgeIt, e, G){
+        for(typename Graph::EdgeIt e=loopFirst(typename Graph::EdgeIt(), (G)); e!=INVALID; ++e){
         //C^{\Pi}_{i,j}
         mod_pot = length[e]-potential[G.head(e)]+potential[G.tail(e)];

src/hugo/minlengthpaths.h

@@ -84 +84 @@
       EdgeIntMap reversed(G); 
 
-      FOR_EACH_LOC(typename Graph::EdgeIt, e, G){
+      //FOR_EACH_LOC(typename Graph::EdgeIt, e, G){
+      for(typename Graph::EdgeIt e=loopFirst(typename Graph::EdgeIt(), (G)); e!=INVALID; ++e){
         reversed[e] = mincost_flow.getFlow()[e];
       }
@@ -101 +102 @@
           
           while (!reversed[e]){
-            G.next(e);
+            ++e;
           }
           n = G.head(e);

src/test/dijkstra_heap_test.cc

@@ -57 +57 @@
 
   EdgeIt e;
-  for(G.first(e); G.valid(e); G.next(e)) {
+  for(G.first(e); e!=INVALID; ++e) {
     Node u=G.tail(e);
     Node v=G.head(e);
@@ -70 +70 @@
 
   NodeIt v;
-  for(G.first(v); G.valid(v); G.next(v)) {
+  for(G.first(v); v!=INVALID; ++v) {
     if ( dijkstra_test.reached(v) ) {
       Edge e=dijkstra_test.pred(v);
@@ -106 +106 @@
   error2=0;
 
-  for(G.first(e); G.valid(e); G.next(e)) {
+  for(G.first(e); e!=INVALID; ++e) {
     Node u=G.tail(e);
     Node v=G.head(e);
@@ -118 +118 @@
   }
 
-  for(G.first(v); G.valid(v); G.next(v)) {
+  for(G.first(v); v!=INVALID; ++v) {
     if ( dijkstra_test2.reached(v) ) {
       Edge e=dijkstra_test2.pred(v);

src/test/dijkstra_test.cc

@@ -76 +76 @@
 
 
-  for(EdgeIt e(G); e==INVALID; ++e) {
+  for(EdgeIt e(G); e!=INVALID; ++e) {
     Node u=G.tail(e);
     Node v=G.head(e);
@@ -87 +87 @@
 
   ///\bug This works only for integer lengths
-  for(NodeIt v(G); v==INVALID; ++v)
+  for(NodeIt v(G); v!=INVALID; ++v)
     if ( dijkstra_test.reached(v) ) {
       Edge e=dijkstra_test.pred(v);