Changeset 314:eabbe162e32e in lemon-0.x

Timestamp:

04/07/04 19:42:05 (21 years ago)

Author:

athos

Branch:

default

Phase:

public

Convert:

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

Message:

minlengthpaths is ready, but the paths are not yet determined: needs to canonize a flow

Location:

src/work/athos

Files:

• makefile (modified) (1 diff)
• minlengthpaths.h (modified) (3 diffs)
• munkaido (modified) (2 diffs)
• suurballe.cc (modified) (1 diff)

src/work/athos/makefile

@@ -5 +5 @@
 #LEDAROOT ?= /ledasrc/LEDA-4.1
 #BOOSTROOT ?= /home/marci/boost
-INCLUDEDIRS ?= -I../../include -I.. -I../{marci,jacint,alpar,klao,akos,athos} #-I$(BOOSTROOT)
+INCLUDEDIRS ?= -I../../include -I.. -I../{marci,jacint,alpar,athos,akos,klao} #-I$(BOOSTROOT)
 #LEDAINCLUDE ?= -I$(LEDAROOT)/incl
 CXXFLAGS = -g -O -W -Wall $(INCLUDEDIRS) -ansi -pedantic

src/work/athos/minlengthpaths.h

@@ -65 +65 @@
     const LengthMap& length;
 
-    //auxiliary variable
-    //The value is 1 iff the edge is reversed
+    //auxiliry variable
+    //The value is 1 iff the edge is reversed. 
+    //If the algorithm has finished, the edges of the seeked paths are 
+    //exactly those that are reversed 
     EdgeIntMap reversed; 
-
     
   public :
@@ -84 +85 @@
       ConstMap const1map(1);
 
+      //We need a residual graph, in which some of the edges are reversed
       ResGraphType res_graph(G, reversed, const1map);
 
@@ -95 +97 @@
         dijkstra.run(s);
         if (!dijkstra.reached(t)){
-          //There is no k path from s to t
-          /// \TODO mit keresett itt ez a ++?
+          //There are no k paths from s to t
           return i;
         };

src/work/athos/munkaido

@@ +1 @@
+III. - IV.1.
 pentek: Megbeszélés     3 óra
-        megbeszeltuk Alpárral, hogy mûködjön a Suurballe        1 óra
+        megbeszeltuk Alpárral, hogy hogyan mûködjön a Suurballe         1 óra
 Hétfõ:  Suurballe       4 óra
 Kedd:   Suurballe       5 óra
@@ -6 +7 @@
         Wiki beszámoló  1 óra
 Eredmény: Félkész Suurballe
+
+IV.2. - IV.9.
+pentek: Megbeszélés     3 óra
+Hétfõ:  Suurballe       4 óra

src/work/athos/suurballe.cc

@@ -124 +124 @@
   std::cout << surb_test.run(s,t,k) << std::endl;
 
+
   return 0;
 }