Changeset 762:ece80147fb08 in lemon for lemon/circulation.h
- Timestamp:
- 09/25/09 09:06:32 (15 years ago)
- Branch:
- default
- Parents:
- 761:98a30824fe36 (diff), 759:6d5f547e5bfb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Phase:
- public
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/circulation.h
r736 r762 73 73 /// It must conform to the \ref concepts::ReadWriteMap "ReadWriteMap" 74 74 /// concept. 75 #ifdef DOXYGEN 76 typedef GR::ArcMap<Value> FlowMap; 77 #else 75 78 typedef typename Digraph::template ArcMap<Value> FlowMap; 79 #endif 76 80 77 81 /// \brief Instantiates a FlowMap. … … 88 92 /// The elevator type used by the algorithm. 89 93 /// 90 /// \sa Elevator 91 /// \sa LinkedElevator 94 /// \sa Elevator, LinkedElevator 95 #ifdef DOXYGEN 96 typedef lemon::Elevator<GR, GR::Node> Elevator; 97 #else 92 98 typedef lemon::Elevator<Digraph, typename Digraph::Node> Elevator; 99 #endif 93 100 94 101 /// \brief Instantiates an Elevator. … … 470 477 /// \name Execution Control 471 478 /// The simplest way to execute the algorithm is to call \ref run().\n 472 /// If you need morecontrol on the initial solution or the execution,473 /// first you have to call one of the \ref init() functions, then479 /// If you need better control on the initial solution or the execution, 480 /// you have to call one of the \ref init() functions first, then 474 481 /// the \ref start() function. 475 482 -
lemon/circulation.h
r760 r762 458 458 } 459 459 460 /// \brief Sets the tolerance used by algorithm. 461 /// 462 /// Sets the tolerance used by algorithm. 463 Circulation& tolerance(const Tolerance& tolerance) const { 460 /// \brief Sets the tolerance used by the algorithm. 461 /// 462 /// Sets the tolerance object used by the algorithm. 463 /// \return <tt>(*this)</tt> 464 Circulation& tolerance(const Tolerance& tolerance) { 464 465 _tol = tolerance; 465 466 return *this; … … 468 469 /// \brief Returns a const reference to the tolerance. 469 470 /// 470 /// Returns a const reference to the tolerance. 471 /// Returns a const reference to the tolerance object used by 472 /// the algorithm. 471 473 const Tolerance& tolerance() const { 472 return tolerance;474 return _tol; 473 475 } 474 476
Note: See TracChangeset
for help on using the changeset viewer.