COIN-OR::LEMON - Graph Library

Changeset 2533:aea952a1af99 in lemon-0.x for lemon


Ignore:
Timestamp:
12/05/07 02:43:02 (12 years ago)
Author:
Peter Kovacs
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3410
Message:

Bug fixes.

Location:
lemon
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • lemon/capacity_scaling.h

    r2509 r2533  
    6767  /// \author Peter Kovacs
    6868
    69 template < typename Graph,
    70            typename LowerMap = typename Graph::template EdgeMap<int>,
    71            typename CapacityMap = LowerMap,
    72            typename CostMap = typename Graph::template EdgeMap<int>,
    73            typename SupplyMap = typename Graph::template NodeMap
    74                                 <typename CapacityMap::Value> >
     69  template < typename Graph,
     70             typename LowerMap = typename Graph::template EdgeMap<int>,
     71             typename CapacityMap = LowerMap,
     72             typename CostMap = typename Graph::template EdgeMap<int>,
     73             typename SupplyMap = typename Graph::template NodeMap
     74                                  <typename CapacityMap::Value> >
    7575  class CapacityScaling
    7676  {
     
    639639      }
    640640#ifdef _DEBUG_ITER_
    641       std::cout << "Cost Scaling algorithm finished with running Dijkstra algorithm "
     641      std::cout << "Capacity Scaling algorithm finished with running Dijkstra algorithm "
    642642        << dijk_num << " times." << std::endl;
    643643#endif
  • lemon/circulation.h

    r2527 r2533  
    374374    }
    375375   
    376     /// \name Execution control The simplest way to execute the
    377     /// algorithm is to use one of the member functions called \c
    378     /// run(). 
     376    /// \name Execution control
     377    /// The simplest way to execute the algorithm is to use one of the
     378    /// member functions called \c run().
    379379    /// \n
    380380    /// If you need more control on initial solution or execution then
  • lemon/cycle_canceling.h

    r2526 r2533  
    8787  /// \author Peter Kovacs
    8888
    89 template < typename Graph,
    90            typename LowerMap = typename Graph::template EdgeMap<int>,
    91            typename CapacityMap = LowerMap,
    92            typename CostMap = typename Graph::template EdgeMap<int>,
    93            typename SupplyMap = typename Graph::template NodeMap
    94                                 <typename CapacityMap::Value> >
     89  template < typename Graph,
     90             typename LowerMap = typename Graph::template EdgeMap<int>,
     91             typename CapacityMap = LowerMap,
     92             typename CostMap = typename Graph::template EdgeMap<int>,
     93             typename SupplyMap = typename Graph::template NodeMap
     94                                  <typename CapacityMap::Value> >
    9595  class CycleCanceling
    9696  {
     
    324324
    325325      // Finding a feasible flow
    326       Circulation< Graph, Capacity, ConstMap<Edge, Capacity>,
    327         CapacityRefMap, SupplyMap >::DefFlowMap<FlowMap>::Create
    328         circulation( graph, constMap<Edge>((Capacity)0),
    329                      capacity, supply);
    330       circulation.flowMap(flowMap);
    331       return circulation.run();
     326      Circulation< Graph, ConstMap<Edge, Capacity>, CapacityRefMap,
     327                   SupplyMap >
     328        circulation( graph, constMap<Edge>((Capacity)0), capacity,
     329                     supply );
     330      circulation.flowMap(flow);
     331      return circulation.run() == -1;
    332332    }
    333333
  • lemon/min_cost_flow.h

    r2509 r2533  
    6464  /// \author Peter Kovacs
    6565
    66 template < typename Graph,
    67            typename LowerMap = typename Graph::template EdgeMap<int>,
    68            typename CapacityMap = LowerMap,
    69            typename CostMap = typename Graph::template EdgeMap<int>,
    70            typename SupplyMap = typename Graph::template NodeMap
    71                                 <typename CapacityMap::Value> >
     66  template < typename Graph,
     67             typename LowerMap = typename Graph::template EdgeMap<int>,
     68             typename CapacityMap = LowerMap,
     69             typename CostMap = typename Graph::template EdgeMap<int>,
     70             typename SupplyMap = typename Graph::template NodeMap
     71                                  <typename CapacityMap::Value> >
    7272  class MinCostFlow :
    7373    public NetworkSimplex< Graph,
  • lemon/min_cost_max_flow.h

    r2515 r2533  
    5858  /// \author Peter Kovacs
    5959
    60 template < typename Graph,
    61            typename CapacityMap = typename Graph::template EdgeMap<int>,
    62            typename CostMap = typename Graph::template EdgeMap<int> >
     60  template < typename Graph,
     61             typename CapacityMap = typename Graph::template EdgeMap<int>,
     62             typename CostMap = typename Graph::template EdgeMap<int> >
    6363  class MinCostMaxFlow
    6464  {
  • lemon/network_simplex.h

    r2509 r2533  
    9494  /// \author Peter Kovacs
    9595
    96 template < typename Graph,
    97            typename LowerMap = typename Graph::template EdgeMap<int>,
    98            typename CapacityMap = LowerMap,
    99            typename CostMap = typename Graph::template EdgeMap<int>,
    100            typename SupplyMap = typename Graph::template NodeMap
    101                                 <typename CapacityMap::Value> >
     96  template < typename Graph,
     97             typename LowerMap = typename Graph::template EdgeMap<int>,
     98             typename CapacityMap = LowerMap,
     99             typename CostMap = typename Graph::template EdgeMap<int>,
     100             typename SupplyMap = typename Graph::template NodeMap
     101                                  <typename CapacityMap::Value> >
    102102  class NetworkSimplex
    103103  {
Note: See TracChangeset for help on using the changeset viewer.