Changeset 80:629b9ca9184b in lemon-0.x

Timestamp:

02/16/04 17:27:49 (21 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Several bugfixes

File:

• src/work/alpar/f_ed_ka.h (modified) (1 diff)

src/work/alpar/f_ed_ka.h

@@ -76 +76 @@
 
     // Augmenting value computation
-    aug_val = visited.get(t)==2 ?
+    aug_val = visited.get(t)==1 ?
       c.get(tree.get(t))-f.get(tree.get(t)) : f.get(tree.get(t));
     //FIXME: I would need 'G.opposite(e,n)'
-    gn = visited.get(t)==2 ? G.from(tree.get(t)) : G.to(tree.get(t));
-    while(gn!=s) if(visited.get(gn)==2)
+    gn = visited.get(t)==1 ? G.tail(tree.get(t)) : G.head(tree.get(t));
+    while(gn!=s) if(visited.get(gn)==1)
       {
         //FIXME: nonstandars. gcc extension!
         aug_val <?= c.get(tree.get(gn))-f.get(tree.get(gn));
-        gn=G.from(tree.get(gn));
+        gn=G.tail(tree.get(gn));
       }
     else {
       //FIXME: nonstandars. gcc extension!
       aug_val <?= f.get(tree.get(gn));
-      gn=G.from(tree.get(gn));
+      gn=G.head(tree.get(gn));
     }
         
     // The augmentation itself
     gn = t;
-    while(gn!=s) if(visited.get(gn)==2)
+    while(gn!=s) if(visited.get(gn)==1)
       {
         f.set(tree.get(gn),f.get(tree.get(gn))+aug_val);
-        gn=G.from(tree.get(gn));
+        gn=G.tail(tree.get(gn));
       }
     else {
       f.set(tree.get(gn),f.get(tree.get(gn))-aug_val);
-      gn=G.from(tree.get(gn));
+      gn=G.head(tree.get(gn));
     }