1.1 --- a/lemon/csp.h Tue Oct 02 12:34:43 2007 +0000
1.2 +++ b/lemon/csp.h Tue Oct 02 14:15:18 2007 +0000
1.3 @@ -23,8 +23,6 @@
1.4 ///\file
1.5 ///\brief Algorithm for the Resource Constrained Shortest Path problem.
1.6 ///
1.7 -///
1.8 -///\todo dijkstraZero() solution should be revised.
1.9
1.10 #include <lemon/list_graph.h>
1.11 #include <lemon/graph_utils.h>
1.12 @@ -37,9 +35,9 @@
1.13 namespace lemon {
1.14
1.15 ///\ingroup approx
1.16 -
1.17 - ///Algorithms for the Resource Constrained Shortest Path Problem
1.18 -
1.19 + ///
1.20 + ///\brief Algorithms for the Resource Constrained Shortest Path Problem
1.21 + ///
1.22 ///The Resource Constrained Shortest (Least Cost) Path problem is the
1.23 ///following. We are given a directed graph with two additive weightings
1.24 ///on the edges, referred as \e cost and \e delay. In addition,
1.25 @@ -91,9 +89,9 @@
1.26
1.27 public:
1.28
1.29 - ///\e
1.30 + /// \brief Constructor
1.31
1.32 - ///\e
1.33 + ///Constructor
1.34 ///
1.35 ConstrainedShortestPath(const Graph &g, const CM &ct, const DM &dl)
1.36 : _g(g), _cost(ct), _delay(dl),
1.37 @@ -123,11 +121,11 @@
1.38 ///a delay constrained least cost path.
1.39 ///\param s source node
1.40 ///\param t target node
1.41 + ///\param delta upper bound on the delta
1.42 ///\retval lo_bo a lower bound on the optimal solution
1.43 ///\return the found path or an empty
1.44 Path larac(Node s, Node t, double delta, double &lo_bo)
1.45 {
1.46 - NoCounter cnt("LARAC iterations: ");
1.47 double lambda=0;
1.48 double cp,cq,dp,dq,cr,dr;
1.49 Path p;