[Lemon-commits] [lemon_svn] alpar: r103 - hugo/trunk/src/work/alpar

[Lemon SVN]

Author: alpar
Date: Mon Feb 16 17:27:49 2004
New Revision: 103

Modified:
   hugo/trunk/src/work/alpar/f_ed_ka.h

Log:
Several bugfixes


Modified: hugo/trunk/src/work/alpar/f_ed_ka.h
==============================================================================
--- hugo/trunk/src/work/alpar/f_ed_ka.h	(original)
+++ hugo/trunk/src/work/alpar/f_ed_ka.h	Mon Feb 16 17:27:49 2004
@@ -75,32 +75,32 @@
     if(!visited.get(t)) return flow_val;
 
     // 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));
     }
 
     flow_val+=aug_val;