[Lemon-commits] [lemon_svn] athos: r432 - hugo/trunk/src/work/athos

[Lemon SVN]

Author: athos
Date: Wed Apr  7 19:42:05 2004
New Revision: 432

Modified:
   hugo/trunk/src/work/athos/makefile
   hugo/trunk/src/work/athos/minlengthpaths.h
   hugo/trunk/src/work/athos/munkaido
   hugo/trunk/src/work/athos/suurballe.cc

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

Modified: hugo/trunk/src/work/athos/makefile
==============================================================================
--- hugo/trunk/src/work/athos/makefile	(original)
+++ hugo/trunk/src/work/athos/makefile	Wed Apr  7 19:42:05 2004
@@ -4,7 +4,7 @@
 CC=$(CXX)
 #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
 

Modified: hugo/trunk/src/work/athos/minlengthpaths.h
==============================================================================
--- hugo/trunk/src/work/athos/minlengthpaths.h	(original)
+++ hugo/trunk/src/work/athos/minlengthpaths.h	Wed Apr  7 19:42:05 2004
@@ -64,10 +64,11 @@
     const Graph& G;
     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 :
 
@@ -83,6 +84,7 @@
     int run(Node s, Node t, int k) {
       ConstMap const1map(1);
 
+      //We need a residual graph, in which some of the edges are reversed
       ResGraphType res_graph(G, reversed, const1map);
 
       //Initialize the copy of the Dijkstra potential to zero
@@ -94,8 +96,7 @@
       for (int i=0; i<k; ++i){
 	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;
 	};
 	

Modified: hugo/trunk/src/work/athos/munkaido
==============================================================================
--- hugo/trunk/src/work/athos/munkaido	(original)
+++ hugo/trunk/src/work/athos/munkaido	Wed Apr  7 19:42:05 2004
@@ -1,7 +1,12 @@
+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
 Csüt.: 	Suurballe 	2 óra
 	Wiki beszámoló	1 óra
-Eredmény: Félkész Suurballe
\ No newline at end of file
+Eredmény: Félkész Suurballe
+
+IV.2. - IV.9.
+pentek:	Megbeszélés	3 óra
+Hétfõ: 	Suurballe	4 óra

Modified: hugo/trunk/src/work/athos/suurballe.cc
==============================================================================
--- hugo/trunk/src/work/athos/suurballe.cc	(original)
+++ hugo/trunk/src/work/athos/suurballe.cc	Wed Apr  7 19:42:05 2004
@@ -123,5 +123,6 @@
     surb_test(graph, length);
   std::cout << surb_test.run(s,t,k) << std::endl;
 
+
   return 0;
 }