gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge
0 4 0
merge default
0 files changed with 25 insertions and 11 deletions:
↑ Collapse diff ↑
Show white space 6 line context
... ...
@@ -452,6 +452,7 @@
452 452

	
453
    /// \brief Sets the tolerance used by algorithm.
453
    /// \brief Sets the tolerance used by the algorithm.
454 454
    ///
455
    /// Sets the tolerance used by algorithm.
456
    Circulation& tolerance(const Tolerance& tolerance) const {
455
    /// Sets the tolerance object used by the algorithm.
456
    /// \return <tt>(*this)</tt>
457
    Circulation& tolerance(const Tolerance& tolerance) {
457 458
      _tol = tolerance;
... ...
@@ -462,5 +463,6 @@
462 463
    ///
463
    /// Returns a const reference to the tolerance.
464
    /// Returns a const reference to the tolerance object used by
465
    /// the algorithm.
464 466
    const Tolerance& tolerance() const {
465
      return tolerance;
467
      return _tol;
466 468
    }
Ignore white space 6 line context
... ...
@@ -99,3 +99,3 @@
99 99
  /// The preflow algorithms are the fastest known maximum
100
  /// flow algorithms. The current implementation use a mixture of the
100
  /// flow algorithms. The current implementation uses a mixture of the
101 101
  /// \e "highest label" and the \e "bound decrease" heuristics.
... ...
@@ -373,6 +373,7 @@
373 373

	
374
    /// \brief Sets the tolerance used by algorithm.
374
    /// \brief Sets the tolerance used by the algorithm.
375 375
    ///
376
    /// Sets the tolerance used by algorithm.
377
    Preflow& tolerance(const Tolerance& tolerance) const {
376
    /// Sets the tolerance object used by the algorithm.
377
    /// \return <tt>(*this)</tt>
378
    Preflow& tolerance(const Tolerance& tolerance) {
378 379
      _tolerance = tolerance;
... ...
@@ -383,5 +384,6 @@
383 384
    ///
384
    /// Returns a const reference to the tolerance.
385
    /// Returns a const reference to the tolerance object used by
386
    /// the algorithm.
385 387
    const Tolerance& tolerance() const {
386
      return tolerance;
388
      return _tolerance;
387 389
    }
Ignore white space 6 line context
... ...
@@ -89,2 +89,7 @@
89 89
    .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);
90 95

	
Ignore white space 6 line context
... ...
@@ -96,2 +96,7 @@
96 96
  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);
97 102

	
0 comments (0 inline)