COIN-OR::LEMON - Graph Library

Changeset 877:141f9c0db4a3 in lemon-1.2 for lemon/network_simplex.h


Ignore:
Timestamp:
03/06/10 15:35:12 (10 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
878:f802439d2b58, 880:38213abd2911, 909:f112c18bc304
Phase:
public
Message:

Unify the sources (#339)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/network_simplex.h

    r862 r877  
    33 * This file is a part of LEMON, a generic C++ optimization library.
    44 *
    5  * Copyright (C) 2003-2009
     5 * Copyright (C) 2003-2010
    66 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    77 * (Egervary Research Group on Combinatorial Optimization, EGRES).
     
    9898      UNBOUNDED
    9999    };
    100    
     100
    101101    /// \brief Constants for selecting the type of the supply constraints.
    102102    ///
     
    116116      LEQ
    117117    };
    118    
     118
    119119    /// \brief Constants for selecting the pivot rule.
    120120    ///
     
    159159      ALTERING_LIST
    160160    };
    161    
     161
    162162  private:
    163163
     
    228228    int stem, par_stem, new_stem;
    229229    Value delta;
    230    
     230
    231231    const Value MAX;
    232232
    233233  public:
    234  
     234
    235235    /// \brief Constant for infinite upper bounds (capacities).
    236236    ///
     
    499499        }
    500500        if (_curr_length == 0) return false;
    501      
    502       search_end:       
     501
     502      search_end:
    503503        _minor_count = 1;
    504504        _next_arc = e;
     
    609609        }
    610610        if (_curr_length == 0) return false;
    611        
     611
    612612      search_end:
    613613
     
    635635    /// \param graph The digraph the algorithm runs on.
    636636    /// \param arc_mixing Indicate if the arcs have to be stored in a
    637     /// mixed order in the internal data structure. 
     637    /// mixed order in the internal data structure.
    638638    /// In special cases, it could lead to better overall performance,
    639639    /// but it is usually slower. Therefore it is disabled by default.
     
    650650      LEMON_ASSERT(std::numeric_limits<Cost>::is_signed,
    651651        "The cost type of NetworkSimplex must be signed");
    652        
     652
    653653      // Reset data structures
    654654      reset();
     
    764764      return *this;
    765765    }
    766    
     766
    767767    /// \brief Set the type of the supply constraints.
    768768    ///
     
    790790    /// This function runs the algorithm.
    791791    /// The paramters can be specified using functions \ref lowerMap(),
    792     /// \ref upperMap(), \ref costMap(), \ref supplyMap(), \ref stSupply(), 
     792    /// \ref upperMap(), \ref costMap(), \ref supplyMap(), \ref stSupply(),
    793793    /// \ref supplyType().
    794794    /// For example,
     
    945945        }
    946946      }
    947      
     947
    948948      // Reset parameters
    949949      resetParams();
    950950      return *this;
    951951    }
    952    
     952
    953953    /// @}
    954954
     
    10901090        _state[i] = STATE_LOWER;
    10911091      }
    1092      
     1092
    10931093      // Set data for the artificial root node
    10941094      _root = _node_num;
     
    12641264      for (int u = second; u != join; u = _parent[u]) {
    12651265        e = _pred[u];
    1266         d = _forward[u] ? 
     1266        d = _forward[u] ?
    12671267          (_cap[e] >= MAX ? INF : _cap[e] - _flow[e]) : _flow[e];
    12681268        if (d <= delta) {
     
    15681568        }
    15691569      }
    1570      
     1570
    15711571      // Check feasibility
    15721572      for (int e = _search_arc_num; e != _all_arc_num; ++e) {
     
    15851585        }
    15861586      }
    1587      
     1587
    15881588      // Shift potentials to meet the requirements of the GEQ/LEQ type
    15891589      // optimality conditions
Note: See TracChangeset for help on using the changeset viewer.