COIN-OR::LEMON - Graph Library

Changes in / [690:5795e130402e:687:fb93895f84d9] in lemon-main


Ignore:
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • lemon/circulation.h

    r689 r641  
    451451    }
    452452
    453     /// \brief Sets the tolerance used by the algorithm.
    454     ///
    455     /// Sets the tolerance object used by the algorithm.
    456     /// \return <tt>(*this)</tt>
    457     Circulation& tolerance(const Tolerance& tolerance) {
     453    /// \brief Sets the tolerance used by algorithm.
     454    ///
     455    /// Sets the tolerance used by algorithm.
     456    Circulation& tolerance(const Tolerance& tolerance) const {
    458457      _tol = tolerance;
    459458      return *this;
     
    462461    /// \brief Returns a const reference to the tolerance.
    463462    ///
    464     /// Returns a const reference to the tolerance object used by
    465     /// the algorithm.
     463    /// Returns a const reference to the tolerance.
    466464    const Tolerance& tolerance() const {
    467       return _tol;
     465      return tolerance;
    468466    }
    469467
  • lemon/preflow.h

    r689 r641  
    9898  /// "flow of maximum value" in a digraph.
    9999  /// The preflow algorithms are the fastest known maximum
    100   /// flow algorithms. The current implementation uses a mixture of the
     100  /// flow algorithms. The current implementation use a mixture of the
    101101  /// \e "highest label" and the \e "bound decrease" heuristics.
    102102  /// The worst case time complexity of the algorithm is \f$O(n^2\sqrt{e})\f$.
     
    372372    }
    373373
    374     /// \brief Sets the tolerance used by the algorithm.
    375     ///
    376     /// Sets the tolerance object used by the algorithm.
    377     /// \return <tt>(*this)</tt>
    378     Preflow& tolerance(const Tolerance& tolerance) {
     374    /// \brief Sets the tolerance used by algorithm.
     375    ///
     376    /// Sets the tolerance used by algorithm.
     377    Preflow& tolerance(const Tolerance& tolerance) const {
    379378      _tolerance = tolerance;
    380379      return *this;
     
    383382    /// \brief Returns a const reference to the tolerance.
    384383    ///
    385     /// Returns a const reference to the tolerance object used by
    386     /// the algorithm.
     384    /// Returns a const reference to the tolerance.
    387385    const Tolerance& tolerance() const {
    388       return _tolerance;
     386      return tolerance;
    389387    }
    390388
  • test/circulation_test.cc

    r689 r611  
    8888    .supplyMap(supply)
    8989    .flowMap(flow);
    90  
    91   const CirculationType::Elevator& elev = const_circ_test.elevator();
    92   circ_test.elevator(const_cast<CirculationType::Elevator&>(elev));
    93   CirculationType::Tolerance tol = const_circ_test.tolerance();
    94   circ_test.tolerance(tol);
    9590
    9691  circ_test.init();
  • test/preflow_test.cc

    r689 r585  
    9595  PreflowType preflow_test(g, cap, n, n);
    9696  const PreflowType& const_preflow_test = preflow_test;
    97  
    98   const PreflowType::Elevator& elev = const_preflow_test.elevator();
    99   preflow_test.elevator(const_cast<PreflowType::Elevator&>(elev));
    100   PreflowType::Tolerance tol = const_preflow_test.tolerance();
    101   preflow_test.tolerance(tol);
    10297
    10398  preflow_test
Note: See TracChangeset for help on using the changeset viewer.